From afd6404d95fd2667a7a432fc4e7d4320b1224cd6 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 17 Sep 2026 22:03:58 +1000 Subject: [PATCH] fix: inputs moment --- modules/system/core.nix | 16 ---------------- modules/system/flake-parts.nix | 4 +++- modules/system/hm-flake.nix | 3 --- modules/users/serenity.nix | 13 +++++++++++++ 4 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 modules/system/hm-flake.nix diff --git a/modules/system/core.nix b/modules/system/core.nix index 42c7af0..7238699 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -17,9 +17,6 @@ # core packages to load self.nixosModules.core-packages - # home manager functionality - inputs.home-manager.nixosModules.home-manager - ]; # extra features @@ -48,19 +45,6 @@ # meanjin time time.timeZone = lib.mkDefault "Austrlia/Brisbane"; - # home manager settings - home-manager = { - verbose = true; - overwriteBackup = true; - backupFileExtension = ".bak"; - useGlobalPkgs = true; - useUserPackages = true; - users.serenity = { - home.stateversion = "24.11"; - nixpkgs.config.allowUnfree = true; - }; - }; - # don't touch this system.stateVersion = lib.mkDefault "24.11"; documentation.dev.enable = true; diff --git a/modules/system/flake-parts.nix b/modules/system/flake-parts.nix index cce0a31..972d74e 100644 --- a/modules/system/flake-parts.nix +++ b/modules/system/flake-parts.nix @@ -1,4 +1,6 @@ -{ +{ inputs, ... }: { + # needed for home manager functionality + imports = [ inputs.home-manager.flakeModules.home-manager ]; # misc flake-parts configuration config = { # uarchs to build for diff --git a/modules/system/hm-flake.nix b/modules/system/hm-flake.nix deleted file mode 100644 index e476fba..0000000 --- a/modules/system/hm-flake.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ inputs, ... }: { - imports = [ inputs.home-manager.flakeModules.home-manager ]; -} diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index 5d89c19..04b93e7 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -38,6 +38,19 @@ }; + # home manager settings + home-manager = { + verbose = true; + overwriteBackup = true; + backupFileExtension = ".bak"; + useGlobalPkgs = true; + useUserPackages = true; + users.serenity = { + home.stateversion = "24.11"; + nixpkgs.config.allowUnfree = true; + }; + }; + }; }