From 8eed8cf9f13775f518326b3884ebe1d07a63c916 Mon Sep 17 00:00:00 2001 From: smayzy Date: Tue, 8 Jul 2025 23:37:54 +0200 Subject: [PATCH] mv hyprland to module --- hosts/desktop1/configuration.nix | 19 ++----------------- modules/nix/WM/default.nix | 6 ++++++ modules/nix/WM/hyprland.nix | 32 ++++++++++++++++++++++++++++++++ modules/nix/default.nix | 1 + 4 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 modules/nix/WM/default.nix create mode 100644 modules/nix/WM/hyprland.nix diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index 76ef0e7..3bffcc3 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -10,9 +10,10 @@ networking.hostName = "desktop1"; smayzy = { + desktop.enable = true; nvidia.enable = true; virt.enable = true; - desktop.enable = true; + hyprland.enable = true; }; home-manager = { @@ -38,23 +39,7 @@ services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - environment.systemPackages = with pkgs; [ - mako - wofi - wlogout - waybar - wl-clipboard - libnotify - hyprpaper - hyprpolkitagent webcord pavucontrol cliphist diff --git a/modules/nix/WM/default.nix b/modules/nix/WM/default.nix new file mode 100644 index 0000000..cb79b22 --- /dev/null +++ b/modules/nix/WM/default.nix @@ -0,0 +1,6 @@ +{ lib, config, pkgs, ... }: +{ + imports = [ + ./hyprland.nix + ]; +} diff --git a/modules/nix/WM/hyprland.nix b/modules/nix/WM/hyprland.nix new file mode 100644 index 0000000..b005752 --- /dev/null +++ b/modules/nix/WM/hyprland.nix @@ -0,0 +1,32 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.hyprland.enable = mkOption { + type = types.bool; + default = false; + description = "hyprland"; + }; + + config = mkIf config.smayzy.hyprland.enable { + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + + environment.systemPackages = with pkgs; [ + mako + wofi + wlogout + waybar + wl-clipboard + libnotify + hyprpaper + hyprpolkitagent + ]; + }; +} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index bb9594f..65978cb 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -10,6 +10,7 @@ ./shell ./rice ./groups + ./WM ]; # Timzone and locales (same for all machines so I put it here)