From 2f45329300bbdedcd0ebfacaa9279b90e8a20c90 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sun, 27 Sep 2026 20:03:38 +1000 Subject: [PATCH] tweak: trying out let-bound user declarations --- modules/users/serenity.nix | 63 +++++++++++++++----------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index 5de0093..19c8372 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -21,7 +21,7 @@ inputs.home-manager.nixosModules.home-manager # necessary for multi-user functionality - #self.nixosModules.user-options + self.nixosModules.user-options # select user theme self.nixosModules.theme-autogen @@ -36,56 +36,43 @@ }; # nixos user declaration - users.users.${username} = + users.users.${username} = { - { config, ... }: + # remember to change this + initialPassword = "password"; - { + # permissions management + isNormalUser = true; + extraGroups = [ + "wheel" + "networkmanager" + ]; - # remember to change this - initialPassword = "password"; + # dont hardcode this ? + # catgirl shell + shell = pkgs.fish; - # permissions management - isNormalUser = true; - extraGroups = [ - "wheel" - "networkmanager" - ]; - - # dont hardcode this ? - # catgirl shell - shell = pkgs.fish; - - }; + }; # needed or nix yells at me programs.fish.enable = true; # home manager settings - home-manager = + home-manager = { - { config, ... }: - - let - - username = config.user-options.username; - in - - { - - verbose = true; - overwriteBackup = true; - backupFileExtension = ".bak"; - useUserPackages = true; - - # home manager user declaration - users.${username} = { - home.stateVersion = "24.11"; - nixpkgs.config.allowUnfree = true; - }; + verbose = true; + overwriteBackup = true; + backupFileExtension = ".bak"; + useUserPackages = true; + # home manager user declaration + users.${username} = { + home.stateVersion = "24.11"; + nixpkgs.config.allowUnfree = true; }; + }; + }; }