diff --git a/flake.nix b/flake.nix index 2915206..73a353c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,12 +52,12 @@ (import ./modules/user.nix { user = user; }) - (import ./modules/optional/hyprland.nix { + (import ./modules/desktop/main.nix { user = user; + enableKDE = true; + enableHypr = true; + enableX11 = true; }) - ./modules/optional/x11.nix # still needed for things like lightdm - ./modules/optional/wayland.nix - ./modules/optional/kde.nix ./modules/optional/ollama.nix (import ./modules/optional/home-manager-config.nix { user = user; diff --git a/modules/desktop/main.nix b/modules/desktop/main.nix index 7bbee9f..a4246b9 100644 --- a/modules/desktop/main.nix +++ b/modules/desktop/main.nix @@ -15,6 +15,8 @@ ] else [ ]) ++ (if enableKDE then [ ./kde.nix ] else [ ]) ++ (if enableHypr then [ - ./hyprland.nix + (import ./hyprland.nix { + user = user; + }) ] else [ ]); }