From 8f79f5ee49d660cfe24558ba1c9499f322782ab3 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Tue, 30 Jul 2024 04:53:13 -0700
Subject: [PATCH] chore: remove extraneous zimfw references

---
 flake.lock | 71 +-----------------------------------------------------
 flake.nix  |  6 ++---
 home.nix   | 30 +++++++++++------------
 3 files changed, 19 insertions(+), 88 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1504960..8ec11cc 100755
--- a/flake.lock
+++ b/flake.lock
@@ -134,25 +134,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1678109311,
-        "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "04d6cad67557512452decbfe888c68fa11338a96",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -389,22 +370,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1677932085,
-        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -438,8 +403,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs_2",
-        "zimfw": "zimfw"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rust-overlay": {
@@ -497,21 +461,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
@@ -541,24 +490,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "zimfw": {
-      "inputs": {
-        "home-manager": "home-manager_2"
-      },
-      "locked": {
-        "lastModified": 1704039982,
-        "narHash": "sha256-JgMBZXW+33/b3nTcTaDc1r3vSn8DkCIlNuz7DcwWiiM=",
-        "owner": "joedevivo",
-        "repo": "zimfw.nix",
-        "rev": "1abc53e3d1c2711abf653ae05e91cb9668efa211",
-        "type": "github"
-      },
-      "original": {
-        "owner": "joedevivo",
-        "repo": "zimfw.nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index ff05a9e..284f1f0 100755
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     catppuccin.url = "github:catppuccin/nix";
-    zimfw.url = "github:joedevivo/zimfw.nix";
+    # zimfw.url = "github:joedevivo/zimfw.nix";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.1";
 
@@ -18,7 +18,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, catppuccin, zimfw, lanzaboote, ...
+  outputs = { self, nixpkgs, home-manager, catppuccin, lanzaboote, ...
     }@inputs: {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
       nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
@@ -53,7 +53,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
-            home-manager.sharedModules = [ zimfw.homeManagerModules.zimfw ];
+            # home-manager.sharedModules = [ zimfw.homeManagerModules.zimfw ];
             home-manager.users.youwen = {
               imports = [ ./home.nix catppuccin.homeManagerModules.catppuccin ];
             };
diff --git a/home.nix b/home.nix
index 057c476..258d2dd 100755
--- a/home.nix
+++ b/home.nix
@@ -194,21 +194,21 @@
     };
     defaultKeymap = "viins";
 
-    zimfw = {
-      enable = true;
-      disableVersionCheck = true;
-      degit = true;
-      zmodules = [
-        "environment"
-        "git"
-        "input"
-        "termtitle"
-        "utility"
-        "exa"
-        "fzf"
-        "magic-enter"
-      ];
-    };
+    # zimfw = {
+    #   enable = true;
+    #   disableVersionCheck = true;
+    #   degit = true;
+    #   zmodules = [
+    #     "environment"
+    #     "git"
+    #     "input"
+    #     "termtitle"
+    #     "utility"
+    #     "exa"
+    #     "fzf"
+    #     "magic-enter"
+    #   ];
+    # };
   };
 
   programs.fish = {