separated programs directory

modules/home-manager/home.nix

@@ -1,5 +0,0 @@
-{
-  flake.homeModules.home = {
-    # TODO: Port custom settings from the old top-level ./home.nix into here.
-  };
-}

modules/home-manager/profiles/base.nix

@@ -0,0 +1,13 @@
+{ inputs, pkgs, ... }:
+{
+  flake.homeModules.base = { pkgs, ... }:
+  {
+    imports = with inputs.self.homeModules; [
+      rebuild
+      ssh
+      sops
+      git
+      shell-tools
+    ];
+  };
+}

modules/home-manager/profiles/files.nix

@@ -8,6 +8,7 @@
 
     home.packages = with pkgs; [
       gdu
+      lf
       # TODO: find a CLI file editor that's not insane
     ];
   };

modules/home-manager/programs/sops.nix

@@ -15,8 +15,8 @@ in
   flake.homeModules.sops = { inputs, config, pkgs, lib, ... }:
   let
     sopsBin = lib.getExe pkgs.sops;
-    sopsConfigPath = ../../.sops.yaml;
-    sopsSecretsPath = ../../keys/secrets.yaml;
+    sopsConfigPath = ../../../.sops.yaml;
+    sopsSecretsPath = ../../../keys/secrets.yaml;
     ageKeyFile = "${config.xdg.configHome}/sops/age/keys.txt";
   in
   {

modules/home-manager/users/john.nix

@@ -10,12 +10,7 @@
     programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
 
     imports = with inputs.self.homeModules; [
-      rebuild
-      sops
-      git
-      ssh
-      shell-tools
-			home # placeholder
+      base
       docker
 			sublime
 			desktop

modules/users/john.nix

@@ -1,22 +0,0 @@
-{ inputs, ... }:
-let
-  userName = "john";
-in
-{
-  flake.modules.nixos.user = 
-    { pkgs, ... }:
-    {
-      users.users."${userName}" = {
-        name = "${userName}";
-        shell = pkgs.zsh;
-      };
-      programs.zsh.enable = true;
-
-      home-manager.users."${userName}" = {
-        imports = [
-          inputs.self.homeModules."${userName}"
-        ];
-      };
-    };
-  
-}

modules/users/sydney.nix

@@ -1,8 +0,0 @@
-{ inputs, self, ... }:
-let
-  userName = "sydney";
-in
-{
-  flake.homeModules."${userName}" = {
-  };
-}