From 11962af1a0f23b6fdc8f4ae31eb1f5e5692cbde4 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sun, 5 Jul 2026 20:55:02 +1000 Subject: [PATCH] shrug --- modules/home/default.nix | 49 +++++++++++++------------- modules/hosts3/hades/configuration.nix | 2 +- modules/hosts3/hades/default.nix | 3 +- modules/system/core.nix | 1 + modules/system/default.nix | 24 ------------- modules/system/users.nix | 17 --------- modules/users/serenity.nix | 40 ++++++++++----------- 7 files changed, 46 insertions(+), 90 deletions(-) delete mode 100644 modules/system/default.nix delete mode 100644 modules/system/users.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 69d9cfd..558e853 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,28 +1,27 @@ -{ - self, - inputs, - ... -}: -{ - imports = [ - ./terminal - self.modules.theme - ]; +{ self, inputs, ... }: { - home = { - username = "serenity"; - homeDirectory = "/home/serenity"; - stateVersion = "24.11"; - #extraOutputsToInstall = [ ]; + flake.homeModules.baseHome = { config, pkgs, ... }: { + + imports = [ + ./terminal + self.modules.theme + ]; + + home = { + username = "serenity"; + homeDirectory = "/home/serenity"; + stateVersion = "26.05"; + #extraOutputsToInstall = [ ]; + }; + + # disable manuals as nmd fails to build often + manual = { + html.enable = false; + json.enable = false; + manpages.enable = false; + }; + + # let HM manage itself when in standalone mode + programs.home-manager.enable = true; }; - - # disable manuals as nmd fails to build often - manual = { - html.enable = false; - json.enable = false; - manpages.enable = false; - }; - - # let HM manage itself when in standalone mode - programs.home-manager.enable = true; } diff --git a/modules/hosts3/hades/configuration.nix b/modules/hosts3/hades/configuration.nix index 0438c54..1fd49c1 100644 --- a/modules/hosts3/hades/configuration.nix +++ b/modules/hosts3/hades/configuration.nix @@ -1,6 +1,6 @@ { self, ... }: { - flake.nixosModules.coreConfiguration = + flake.nixosModules.hadesConfig = { pkgs, ... diff --git a/modules/hosts3/hades/default.nix b/modules/hosts3/hades/default.nix index b2d9a24..828134b 100644 --- a/modules/hosts3/hades/default.nix +++ b/modules/hosts3/hades/default.nix @@ -3,7 +3,8 @@ flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { modules = [ self.nixosModules.hadesHardware - self.nixosModules.coreConfiguration + self.nixosModules.hadesConfig + self.nixosModules.coreConfig inputs.home-manager.nixosModules.home-manager { diff --git a/modules/system/core.nix b/modules/system/core.nix index c59b726..799fb64 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -5,6 +5,7 @@ imports = [ self.nixosModules.audioConfig self.nixosModules.nixConfig + self.nixosModules.corePackages ]; documentation.dev.enable = true; diff --git a/modules/system/default.nix b/modules/system/default.nix deleted file mode 100644 index fda5062..0000000 --- a/modules/system/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -let - desktop = [ - - ./security.nix - ./users.nix - - ./core.nix - #./core - ./nix - - ./network - ./hardware - ./programs - ./services - ]; - - laptop = desktop ++ [ - ./services/backlight.nix - ./services/power.nix - ]; -in -{ - inherit desktop laptop; -} diff --git a/modules/system/users.nix b/modules/system/users.nix deleted file mode 100644 index 3c096e4..0000000 --- a/modules/system/users.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: -{ - users.users.serenity = { - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "i2c" - "input" - "libvirtd" - "networkmanager" - "plugdev" - "transmission" - "video" - "wheel" - ]; - }; -} diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index fcf8ddf..2d00e5b 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -7,30 +7,26 @@ in flake.nixosModules.u-serenity = { pkgs, ... }: { - imports = [ - self.homeModules.baseHome + modules = [ + self.foo.bar + inputs.home-manager.nixosModules.home-manager + { + home-manager = { + verbose = true; + useUserPackages = true; + useGlobalPkgs = true; + backupFileExtension = "backup"; + overwriteBackup = true; + users.${name} = { + imports = [ + self.flake.homeModules.baseHome + ]; + }; + }; + } + ]; - home-manager = { - verbose = true; - useUserPackages = true; - useGlobalPkgs = true; - backupFileExtension = "backup"; - overwriteBackup = true; - - users.${name} = { - imports = with self.modules.homeManager; [ - { - home = { - username = name; - homeDirectory = home; - stateVersion = "26.05"; - }; - } - ]; - }; - }; - users.users.${name} = { isNormalUser = true; initialPassword = "password";