feat(nix): move hyprland to hm

sbulav · Feb 21, 2024 · ba3d1e2 · ba3d1e2
1 parent c496a2f
commit ba3d1e2
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 46 deletions.
diff --git a/nix/homes/x86_64-linux/sab@nz/default.nix b/nix/homes/x86_64-linux/sab@nz/default.nix
@@ -14,8 +14,8 @@ with lib.custom; {
     };
 
     desktop = {
+      hyprland = enabled;
       addons = {
-        # gtk = enabled;
         hyprpaper = enabled;
         mako = enabled;
         rofi = enabled;

diff --git a/nix/modules/home/desktop/addons/hypridle/default.nix b/nix/modules/home/desktop/addons/hypridle/default.nix
@@ -0,0 +1,41 @@
+{
+  inputs,
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.custom.desktop.addons.hypridle;
+  inherit (inputs) hypridle;
+in {
+  imports = [hypridle.homeManagerModules.default];
+
+  options.custom.desktop.addons.hypridle = with types; {
+    enable = mkBoolOpt false "Whether to enable the hypridle";
+  };
+
+  config = mkIf cfg.enable {
+    services.hypridle = {
+      enable = true;
+      package = pkgs.hypridle;
+
+      lockCmd = "${getExe config.programs.hypridle.package}";
+      afterSleepCmd = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+
+      listeners = [
+        {
+          timeout = 900;
+          onTimeout = "${getExe config.programs.hypridle.package}";
+        }
+        {
+          timeout = 1200;
+          onTimeout = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms off";
+          onResume = "${getExe' config.wayland.windowManager.hyprland.package "hyprctl"} dispatch dpms on";
+        }
+      ];
+    };
+  };
+}
diff --git a/nix/modules/home/desktop/hyprland/default.nix b/nix/modules/home/desktop/hyprland/default.nix
@@ -0,0 +1,26 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.custom.desktop.hyprland;
+in {
+  options.custom.desktop.hyprland = with types; {
+    enable = mkBoolOpt false "Whether or not to install Hyprland and dependencies.";
+  };
+
+  config = mkIf cfg.enable {
+    wayland.windowManager.hyprland = {
+      enable = true;
+      extraConfig =
+        builtins.readFile ./hyprland.conf;
+
+      systemd.enable = true;
+      xwayland.enable = true;
+    };
+  };
+}
diff --git a/...ules/nixos/desktop/hyprland/hyprland.conf → ...dules/home/desktop/hyprland/hyprland.conf b/...ules/nixos/desktop/hyprland/hyprland.conf → ...dules/home/desktop/hyprland/hyprland.conf
diff --git a/...odules/nixos/desktop/hyprland/default.nix → ...desktop/addons/hyprland-utils/default.nix b/...odules/nixos/desktop/hyprland/default.nix → ...desktop/addons/hyprland-utils/default.nix
@@ -7,33 +7,19 @@
 }:
 with lib;
 with lib.custom; let
-  cfg = config.custom.desktop.hyprland;
+  cfg = config.custom.desktop.addons.hyprland-utils;
 in {
-  options.custom.desktop.hyprland = with types; {
-    enable = mkBoolOpt false "Whether or not to install Hyprland and dependencies.";
+  options.custom.desktop.addons.hyprland-utils = with types; {
+    enable = mkBoolOpt false "Whether or not to add support for hyprland.";
   };
 
   config = mkIf cfg.enable {
-    custom.desktop.addons = {
-      keyring = enabled;
-      # nautilus = enabled;
-      # thunar = enabled;
-      gtk = enabled;
-      # hyprpaper = enabled;
-      # kitty = enabled;
-      # mako = enabled;
-      regreet = enabled;
-      # rofi = enabled;
-      # swayidle = enabled;
-      # swaylock = enabled;
-      # waybar = enabled;
-      # wezterm = enabled;
-      # wlogout = enabled;
-      xdg-portal = enabled;
+    # Required as deps
+    programs.hyprland = {
+      enable = true;
+      xwayland.enable = true;
     };
 
-    # home.configFile."hypr/hyprland.conf".source = ./hyprland.conf;
-
     environment.systemPackages = with pkgs; [
       # hyprland
       # hyprland-protocols
@@ -66,22 +52,6 @@ in {
       XDG_SESSION_DESKTOP = "Hyprland";
       XDG_SCREENSHOTS_DIR = "~/Pictures/Screenshots";
     };
-
-    # Required as deps
-    programs.hyprland = {
-      enable = true;
-      xwayland.enable = true;
-    };
-
-    home.wayland.windowManager.hyprland = {
-      enable = true;
-      extraConfig =
-        builtins.readFile ./hyprland.conf;
-
-      systemd.enable = true;
-      xwayland.enable = true;
-    };
-
     services.xserver = {
       enable = true;
       displayManager = {

diff --git a/nix/modules/nixos/home/default.nix b/nix/modules/nixos/home/default.nix
@@ -19,8 +19,6 @@ with lib.custom; {
       mkOpt attrs {}
       "A set of files to be managed by home-manager's <option>xdg.configFile</option>.";
     programs = mkOpt attrs {} "Programs to be managed by home-manager.";
-    services = mkOpt attrs {} "Services to be managed by home-manager.";
-    wayland = mkOpt attrs {} "Wayland to be managed by home-manager.";
     extraOptions = mkOpt attrs {} "Options to pass directly to home-manager.";
   };
 
@@ -29,10 +27,6 @@ with lib.custom; {
       home.file = mkAliasDefinitions options.home.file;
       home.stateVersion = config.system.stateVersion;
       programs = mkAliasDefinitions options.home.programs;
-      services = mkAliasDefinitions options.home.services;
-      wayland = mkAliasDefinitions options.home.wayland;
-      xdg.configFile = mkAliasDefinitions options.home.configFile;
-      xdg.enable = true;
     };
 
     home-manager = {

diff --git a/nix/modules/nixos/suites/desktop/default.nix b/nix/modules/nixos/suites/desktop/default.nix
@@ -16,8 +16,12 @@ in {
   config = mkIf cfg.enable {
     system.security.rbw.enable = true;
     custom = {
-      desktop = {
-        hyprland = enabled;
+      desktop.addons = {
+        keyring = enabled;
+        gtk = enabled;
+        regreet = enabled;
+        xdg-portal = enabled;
+        hyprland-utils = enabled;
       };
       apps = {
         firefox = enabled;