Make the shell options a bit easier to configure

arunoruto · Nov 2, 2024 · 87d244b · 87d244b
1 parent 807eba6
commit 87d244b
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix
@@ -8,6 +8,9 @@
   image,
   ...
 }:
+let
+  shell = config.home-manager.users.${username}.shell;
+in
 {
   sops.secrets."passwords/${username}".neededForUsers = true;
 
@@ -17,10 +20,7 @@
       isNormalUser = true;
       # hashedPasswordFile = config.sops.secrets."passwords/${username}".path;
       # shell = pkgs.${config.home-manager.users.${username}.shell};
-      shell =
-        config.home-manager.users.${username}.programs.${
-          config.home-manager.users.${username}.shell
-        }.package;
+      shell = config.home-manager.users.${username}.programs.${shell}.package;
       description = "Mirza";
       extraGroups = [
         "dialout"
@@ -41,5 +41,10 @@
 
   programs.zsh.enable = true;
 
-  environment.sessionVariables.FLAKE = "/home/${username}/.config/flake";
+  environment = {
+    sessionVariables.FLAKE = "/home/${username}/.config/flake";
+    shells = [
+      config.users.users.${username}.shell
+    ];
+  };
 }