From cf79707e562c1d6cf3cfbcf936e6c4c56af7fc01 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 20:59:57 +1000 Subject: [PATCH] fixing import structure, :fingers_crossed: --- flake.nix | 10 +--------- hosts/proserpina/configuration.nix | 2 +- modules/core/user.nix | 4 +--- modules/home/default.nix | 9 +++++++++ 4 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 modules/home/default.nix diff --git a/flake.nix b/flake.nix index e682a84..dd1179c 100644 --- a/flake.nix +++ b/flake.nix @@ -39,15 +39,7 @@ ]; }; }; - homeConfigurations."serenity@proserpina" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - modules = [ - hyprland.homeManagerModules.default - {wayland.windowManager.hyprland.enable = true;} - # ... - ]; - }; - + }; } diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index c652a14..ce6f728 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -8,7 +8,7 @@ ./disko-config.nix ./network-configuration.nix - ./../../modules/core + ../../modules/core/ ]; diff --git a/modules/core/user.nix b/modules/core/user.nix index d2972ac..0002487 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -3,11 +3,9 @@ { imports = [ - # inputs.home-manager.nixosModules.home-manager + ../home ]; - users.defaultUserShell = pkgs.fish; - home-manager = { useUserPackages = true; useGlobalPkgs = true; diff --git a/modules/home/default.nix b/modules/home/default.nix new file mode 100644 index 0000000..bed8aa4 --- /dev/null +++ b/modules/home/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + + imports = [ + ./hyprland.nix + ] + +}