refactor: move home & secret files

.gitattributes

@@ -1 +1,2 @@
 flake.lock -diff
+home/secrets/* -diff

.gitignore

@@ -1,7 +1,7 @@
 # secrets
 .gitsecret/keys/random_seed
 !*.secret
-modules/secrets.nix
+home/secrets/default.nix
 
 # Generated by nix-pre-commit-hooks
 /.pre-commit-config.yaml

.gitsecret/paths/mapping.cfg

@@ -1 +1 @@
-modules/secrets.nix:bc21321a6d7bbbf00f8357ad0c1868361d7c4ad4379647f7e8807facd6093b80
+home/secrets/default.nix:0e6b6e9c57743af34dd280dbafc83d5c27ca599e60c267f9eb63201ab7510856

flake.nix

@@ -70,7 +70,7 @@
                     sops.homeManagerModules.sops
                     hyprland.homeManagerModules.default
                   ];
-                  users.winston.imports = [./home.nix];
+                  users.winston.imports = [./home];
                   extraSpecialArgs = {
                     flakePath = "/home/winston/.config/nixpkgs";
                     machine.personal = true;
@@ -102,7 +102,7 @@
                     # TODO: remove hyprland from darwin, I just need this to work right now
                     hyprland.homeManagerModules.default
                   ];
-                  users.winston.imports = [./home.nix];
+                  users.winston.imports = [./home];
                   extraSpecialArgs = {
                     flakePath = "/Users/winston/.config/nixpkgs";
                     machine.personal = true;

home/apps/neovim.nix

@@ -77,7 +77,7 @@
   };
 
   xdg.configFile."nvim" = {
-    source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/neovim";
+    source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/neovim";
     recursive = true;
   };
 }

home/apps/vscode.nix

@@ -21,11 +21,11 @@ in {
   home.file = {
     "${config.xdg.configHome}/Code/User/settings.json" = {
       enable = isLinux;
-      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/vscode/settings.json";
     };
     "Library/Application Support/Code/User/settings.json" = {
       enable = isDarwin;
-      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/vscode/settings.json";
+      source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/vscode/settings.json";
     };
   };
 }

home/apps/wezterm.nix

@@ -6,7 +6,7 @@
   home.sessionVariables = {TERMINAL = "wezterm";};
 
   xdg.configFile."wezterm" = {
-    source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/modules/wezterm";
+    source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/wezterm";
     recursive = true;
   };
 }

home/apps/zsh.nix

@@ -104,8 +104,8 @@ in {
   };
 
   xdg.configFile = {
-    "lsd" = symlink "modules/lsd" {recursive = true;};
-    "starship.toml" = symlink "modules/starship/config.toml" {};
-    "zsh/functions" = symlink "modules/zsh/functions" {recursive = true;};
+    "lsd" = symlink "home/apps/lsd" {recursive = true;};
+    "starship.toml" = symlink "home/apps/starship/config.toml" {};
+    "zsh/functions" = symlink "home/apps/zsh/functions" {recursive = true;};
   };
 }

home/default.nix

@@ -9,23 +9,23 @@
 in {
   imports =
     [
-      ./modules/firefox.nix
-      ./modules/git.nix
-      ./modules/gpg.nix
-      ./modules/i3.nix
-      ./modules/kubernetes.nix
-      ./modules/mail.nix
-      ./modules/music.nix
-      ./modules/neovim.nix
-      ./modules/newsboat.nix
-      ./modules/rice.nix
-      ./modules/sops.nix
-      ./modules/vscode.nix
-      ./modules/wayland.nix
-      ./modules/wezterm.nix
-      ./modules/zsh.nix
+      ./apps/firefox.nix
+      ./apps/git.nix
+      ./apps/gpg.nix
+      ./apps/i3.nix
+      ./apps/kubernetes.nix
+      ./apps/mail.nix
+      ./apps/music.nix
+      ./apps/neovim.nix
+      ./apps/newsboat.nix
+      ./apps/rice.nix
+      ./apps/vscode.nix
+      ./apps/wayland.nix
+      ./apps/wezterm.nix
+      ./apps/zsh.nix
+      ./secrets/sops.nix
     ]
-    ++ lib.optionals (builtins.pathExists ./modules/secrets.nix) [./modules/secrets.nix];
+    ++ lib.optionals (builtins.pathExists ./secrets/default.nix) [./secrets];
 
   home = {
     packages = with pkgs; ([

home/secrets/sops.nix

@@ -14,12 +14,12 @@
       then "${config.home.homeDirectory}/Library/Fonts/${fontname}.otf"
       else throw "Unsupported platform";
     format = "binary";
-    sopsFile = ../home/fonts/${fontname}.json;
+    sopsFile = ./fonts/${fontname}.json;
   };
 in {
   sops = {
     gnupg.home = "${config.xdg.configHome}/gnupg";
-    defaultSopsFile = ../secrets.yaml;
+    defaultSopsFile = ./main.yaml;
     secrets = {
       "kubernetes-work-prod".path = "${config.xdg.configHome}/kube/work-prod";
       "berkeley_regular" = fontMapping "berkeley_regular";

justfile

@@ -11,7 +11,7 @@ boot: secret-stage && secret-unstage
   sudo nixos-rebuild boot --flake .
 
 secret-stage:
-  git add -f modules/secrets.nix
+  git add -f home/secrets/default.nix
 
 secret-unstage:
-  git restore --staged modules/secrets.nix
+  git restore --staged home/secrets/default.nix