diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 7774339..aae3328 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -8,7 +8,8 @@ # modules that comprise the host specific configuration modules = with self.nixosModules; [ - # host-specific hardware options + # host-specific options + hades hadesHardware # user defined options @@ -18,7 +19,7 @@ serenity # extra modules to include on host - desktop + #desktop #terminal ]; diff --git a/modules/users/options.nix b/modules/users/options.nix index 131c5e5..460998a 100644 --- a/modules/users/options.nix +++ b/modules/users/options.nix @@ -37,7 +37,7 @@ example = "kanagawa"; }; - dots = lib.mkOption { + flakePath = lib.mkOption { type = lib.types.str; description = '' The absolute path to the dotfiles repository (flake root). @@ -46,15 +46,6 @@ example = "/home/user/.dotfiles"; }; - hostName = lib.mkOption { - type = lib.types.str; - description = '' - The hostname for this system. - This will be set as the system hostname and can be used for host-specific configuration. - ''; - example = "Desktop"; - }; - username = lib.mkOption { type = lib.types.str; description = '' diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index c43d31f..52258b2 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -9,7 +9,8 @@ let - username = config.userOptions.username; + # change this when making a new user + user = serenity; in @@ -18,8 +19,15 @@ # necessary for home manager function imports = [ inputs.home-manager.nixosModules.home-manager ]; + config.userOptions = { + username = "${user}"; + flakePath = "/home/${user}/SerenityOS"; + wallpaper = "attunement.png"; + colorScheme = "SerenityOS"; + }; + # user declaration - users.users.${username} = { + users.users.${user} = { # remember to change this initialPassword = "password";