diff --git a/configuration.nix b/configuration.nix index 79af9f1a..b61444e5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, stylix, ... }: +{ pkgs, ... }: { imports = [ @@ -24,6 +24,7 @@ ./modules/timezone ./modules/nix ./modules/npm + ./modules/home-manager ]; boot.loader.systemd-boot.enable = true; @@ -37,7 +38,6 @@ NODE_OPTIONS = "--max_old_space_size=16384"; }; - environment.systemPackages = with pkgs; [ pinentry-curses wget diff --git a/flake.nix b/flake.nix index cd501aa1..7909f128 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ specialArgs = attrs; modules = [ ./configuration.nix - ./home.nix ./home-manager hyprland.nixosModules.default stylix.nixosModules.stylix diff --git a/home.nix b/home.nix deleted file mode 100644 index f7f1a231..00000000 --- a/home.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ home-manager, ... }: { - imports = [ home-manager.nixosModule ]; - home-manager.useGlobalPkgs = true; - home-manager.sharedModules = [{ - home.stateVersion = "22.11"; - }]; -} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 00000000..6a010a27 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,9 @@ +{ + home-manager = { + useGlobalPkgs = true; + + sharedModules = [{ + home.stateVersion = "22.11"; + }]; + }; +}