diff --git a/home/core/gui/default.nix b/home/core/gui/default.nix index 68e2f3f3..7ac80450 100644 --- a/home/core/gui/default.nix +++ b/home/core/gui/default.nix @@ -25,5 +25,18 @@ gnome.gnome-calculator ]; wayland.windowManager.hyprland = { + enable = true; + package = pkgs.hyprland; + xwayland.enable = true; + extraConfig = '' + ${builtins.readFile ./hyprland.conf} + ''; + systemd = { + enable = true; + extraCommands = [ + "systemctl --user stop graphical-session.target" + "systemctl --user start hyprland-session.target" + ]; + }; }; } diff --git a/hosts/core/default.nix b/hosts/core/default.nix index df861a72..f7555354 100644 --- a/hosts/core/default.nix +++ b/hosts/core/default.nix @@ -11,7 +11,6 @@ ./zsh.nix ./cnix-pkgs.nix ./fonts.nix - ./hyprland.nix ]; home-manager = { # useGlobalPkgs = true; diff --git a/hosts/core/hyprland.conf b/hosts/core/hyprland.conf deleted file mode 100644 index d63e0e49..00000000 --- a/hosts/core/hyprland.conf +++ /dev/null @@ -1,7 +0,0 @@ -# HYPRLAND CONFIGURATION - -source=./land/appearance.conf -source=./land/inputs.conf -source=./land/keybinds.conf -source=./land/rules.conf -source=./land/startup.conf diff --git a/hosts/core/hyprland.nix b/hosts/core/hyprland.nix index 2732c20d..e3696d90 100644 --- a/hosts/core/hyprland.nix +++ b/hosts/core/hyprland.nix @@ -3,9 +3,6 @@ enable = true; package = pkgs.hyprland; xwayland.enable = true; - extraConfig = '' - ${builtins.readFile ./hyprland.conf} - ''; systemd = { enable = true; extraCommands = [