diff --git a/flake.nix b/flake.nix index b1f6289..876f443 100644 --- a/flake.nix +++ b/flake.nix @@ -31,18 +31,18 @@ systemStateVersion = "23.11"; hostName = "fwbook"; home-manager = { - enable = false; + enable = true; version = homeMangerVersion; }; desktop = { - enable = false; + enable = true; user = user; enableKDE = true; enableHypr = true; enableX11 = true; }; os = { - enable = false; + enable = true; firewall = { enable = false; }; diff --git a/modules/desktop/main.nix b/modules/desktop/main.nix index 6aba1b5..9b51102 100644 --- a/modules/desktop/main.nix +++ b/modules/desktop/main.nix @@ -4,7 +4,7 @@ , enableKDE ? false , enableHypr ? false }: -{ ... }: +{ pkgs, ... }: { imports = [ ./wayland.nix diff --git a/modules/main.nix b/modules/main.nix index 5a7b661..d7c3b72 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -22,14 +22,14 @@ systemStateVersion = "23.11"; }) ] ++ (if desktop.enable then [ - (import ./modules/desktop/main.nix { + (import ./desktop/main.nix { user = user; enableKDE = desktop.enableKDE; enableHypr = desktop.enableHypr; enableX11 = desktop.enableX11; }) ] else [ ]) ++ (if os.enable then [ - (import ./modules/os/main.nix { + (import ./os/main.nix { user = user; hostName = hostName; firewall = os.firewall;