home/modules/neovim.nix

@@ -28,11 +28,6 @@ in
       };
     in
     lib.mkIf cfg.enable {
-      snowhawk.repo-clone.enable = true;
-      repo-clone.repos = {
-        "${config.home.homeDirectory}/.config/nvim".url = lib.zgitRepo "nvim";
-      };
-
       # Set nvim as manpager and default editor
       home.sessionVariables = {
         EDITOR = "nvim";

home/modules/repo-clone.nix

@@ -17,8 +17,14 @@ in
 
     repo-clone = {
       enable = true;
-      repos = {
-        "${config.home.homeDirectory}/Pictures/backgrounds".url = lib.zgitRepo "backgrounds";
+      repos =
+        let
+          home = config.home.homeDirectory;
+          zgitRepo = name: "https://git.zynh.me/Zynh0722/${name}.git";
+        in
+        {
+          "${home}/.config/nvim".url = zgitRepo "nvim";
+          "${home}/Pictures/backgrounds".url = zgitRepo "backgrounds";
         };
     };
   };

home/modules/rust.nix

@@ -9,8 +9,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    snowhawk.direnv.enable = true;
-
     home.packages = with pkgs; [
       rustup
     ];

hosts/snowhawk/home.nix

@@ -5,38 +5,34 @@
     ../../home/modules
   ];
 
+  snowhawk.neovim = {
+    enable = true;
+    # package = neovim-package;
+  };
   snowhawk = {
-    # Desktop
-    dunst.enable = true;
-    theme.enable = true;
-    redshift.enable = true;
-    flameshot.enable = true;
-    playerctl.enable = true;
+    direnv.enable = true;
     alacritty.enable = true;
-    defaultPrograms.enable = true;
-
-    # Games
-    xivlauncher.enable = true;
-
-    # Term Tools
-    neovim.enable = true;
-    tldr.enable = true;
-
-    # Dev
-    rust.enable = true;
+    theme.enable = true;
     projects.enable = true;
-    sources.enable = true;
-
-    # Security
+    dunst.enable = true;
     sops.enable = true;
     rbw.enable = true;
+    defaultPrograms.enable = true;
+    playerctl.enable = true;
+    redshift.enable = true;
+    xivlauncher.enable = true;
+    flameshot.enable = true;
+    tldr.enable = true;
+    sources.enable = true;
+    rust.enable = true;
   };
-
   snowhawk.ssh = {
     enable = true;
     homeNetwork = true;
   };
 
+  snowhawk.repo-clone.enable = true;
+
   snowhawk.flameshot.config = {
     General = {
       contrastOpacity = 188;

lib/default.nix

@@ -20,6 +20,4 @@ rec {
     (mkIf predicate yes)
     (mkIf (!predicate) no)
   ];
-
-  zgitRepo = name: "https://git.zynh.me/Zynh0722/${name}.git";
 }