diff options
| -rw-r--r-- | modules/nixos/sils/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/sils/hyprland.nix | 15 | ||||
| -rw-r--r-- | modules/nixos/sils/roles.nix | 3 | ||||
| -rw-r--r-- | sys/default.nix | 1 | ||||
| -rw-r--r-- | sys/desktop/hyprland/default.nix | 6 |
5 files changed, 18 insertions, 8 deletions
diff --git a/modules/nixos/sils/default.nix b/modules/nixos/sils/default.nix index 9a0c533..c335979 100644 --- a/modules/nixos/sils/default.nix +++ b/modules/nixos/sils/default.nix @@ -2,6 +2,7 @@ imports = [ ./basesystem.nix ./bluetooth.nix + ./hyprland.nix ./meta.nix ./networking.nix ./nix.nix diff --git a/modules/nixos/sils/hyprland.nix b/modules/nixos/sils/hyprland.nix new file mode 100644 index 0000000..73ba9c2 --- /dev/null +++ b/modules/nixos/sils/hyprland.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + ... +}: let + cfg = config.sils.hyprland; +in { + options.sils.hyprland.enable = lib.mkEnableOption "hyprland"; + config = lib.mkIf cfg.enable { + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + }; +} diff --git a/modules/nixos/sils/roles.nix b/modules/nixos/sils/roles.nix index 3b88e99..678d2ed 100644 --- a/modules/nixos/sils/roles.nix +++ b/modules/nixos/sils/roles.nix @@ -4,8 +4,9 @@ in { config.sils = if roleCmp "laptop" then { - bluetooth.enable = true; basesystem.enable = true; + bluetooth.enable = true; + hyprland.enable = true; networking.enable = true; nix-config.enable = true; plymouth.enable = true; diff --git a/sys/default.nix b/sys/default.nix index c5711cd..e92f83e 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ - ./desktop/hyprland ./desktop/sway ./environment ./font diff --git a/sys/desktop/hyprland/default.nix b/sys/desktop/hyprland/default.nix deleted file mode 100644 index 08fd0c0..0000000 --- a/sys/desktop/hyprland/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{system, ...}: { - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; -} |