refactor

9 files changed, 421 insertions, 17 deletions

diff --git a/modules/desktop/default.nix b/modules/desktops/default.nix
index cab72f8..37197c2 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktops/default.nix
@@ -6,29 +6,17 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf optionals;
-  cfg = config.desktop;
+  cfg = config.desktops;
 in {
   imports = [
-    ./waybar
-    ./wofi
-    ./astal.nix
-    ./hypridle.nix
-    ./hyprland.nix
-    ./hyprlock.nix
-    ./hyprpaper.nix
-    ./mako.nix
+    ./hyprland
+    ./wayland.nix
   ];
 
-  options.desktop = {
+  options.desktops = {
     enable = mkEnableOption "Enable baseline desktop utils and programs.";
-    astal = mkEnableOption "Enable the astal gtk shell.";
-    hypridle = mkEnableOption "Enable the hypridle daemon.";
+    wayland = mkEnableOption "Enable wayland desktop components.";
     hyprland = mkEnableOption "Install the Hyprland desktop.";
-    hyprlock = mkEnableOption "Enable the hyprlock lockscreen.";
-    hyprpaper = mkEnableOption "Enable the hyprpaper wallpaper daemon.";
-    mako = mkEnableOption "Enable the mako notification daemon.";
-    waybar = mkEnableOption "Enable the waybar bar.";
-    wofi = mkEnableOption "Enable the wofi launcher.";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/desktops/hyprland/binds.nix b/modules/desktops/hyprland/binds.nix
new file mode 100644
index 0000000..90447f0
--- /dev/null
+++ b/modules/desktops/hyprland/binds.nix
@@ -0,0 +1,132 @@
+{config, ...}: {
+  home-manager.users.${config.user} = {
+    wayland.windowManager.hyprland.settings = {
+      # Keybinds
+      "$mod" = "SUPER";
+      bind = [
+        # Launch programs
+
+        "$mod, W, exec, ${config.default.browser}"
+        "$mod, D, exec, ${config.default.appLauncher}"
+        "$mod, L, exec, ${config.default.lockScreen}"
+        "$mod, Return, exec, ${config.default.terminal}"
+        ", Print, exec, grimblast copy area"
+
+        # Misc
+
+        "$mod SHIFT, L, exit"
+        "$mod, tab, hyprexpo:expo, toggle"
+
+        # Window operations
+
+        "$mod SHIFT, Q, killactive"
+        "$mod SHIFT, SPACE, togglefloating"
+        "$mod, F, fullscreen"
+        "$mod, J, togglesplit"
+
+        # Move focus with mod + arrow keys
+
+        "$mod, left, movefocus, l"
+        "$mod, right, movefocus, r"
+        "$mod, up, movefocus, u"
+        "$mod, down, movefocus, d"
+
+        # Move window across workspace with mod + arrow keys
+
+        "$mod SHIFT, left, hy3:movewindow, l"
+        "$mod SHIFT, right, hy3:movewindow, r"
+        "$mod SHIFT, up, hy3:movewindow, u"
+        "$mod SHIFT, down, hy3:movewindow, d"
+
+        # Switch workspaces with mod + [0-9]
+
+        "$mod, 1, workspace, 1"
+        "$mod, 2, workspace, 2"
+        "$mod, 3, workspace, 3"
+        "$mod, 4, workspace, 4"
+        "$mod, 5, workspace, 5"
+        "$mod, 6, workspace, 6"
+        "$mod, 7, workspace, 7"
+        "$mod, 8, workspace, 8"
+        "$mod, 9, workspace, 9"
+
+        # Move active window to a workspace with mod + SHIFT + [0-9]
+
+        "$mod SHIFT, 1, movetoworkspacesilent, 1"
+        "$mod SHIFT, 2, movetoworkspacesilent, 2"
+        "$mod SHIFT, 3, movetoworkspacesilent, 3"
+        "$mod SHIFT, 4, movetoworkspacesilent, 4"
+        "$mod SHIFT, 5, movetoworkspacesilent, 5"
+        "$mod SHIFT, 6, movetoworkspacesilent, 6"
+        "$mod SHIFT, 7, movetoworkspacesilent, 7"
+        "$mod SHIFT, 8, movetoworkspacesilent, 8"
+        "$mod SHIFT, 9, movetoworkspacesilent, 9"
+        "$mod SHIFT, 0, movetoworkspacesilent, 10"
+
+        # Move to tab
+
+        "LALT, 1, hy3:focustab, index, 01"
+        "LALT, 2, hy3:focustab, index, 02"
+        "LALT, 3, hy3:focustab, index, 03"
+        "LALT, 4, hy3:focustab, index, 04"
+        "LALT, 5, hy3:focustab, index, 05"
+        "LALT, 6, hy3:focustab, index, 06"
+        "LALT, 7, hy3:focustab, index, 07"
+        "LALT, 8, hy3:focustab, index, 08"
+        "LALT, 9, hy3:focustab, index, 09"
+        "LALT, 0, hy3:focustab, index, 10"
+
+        "$mod SHIFT, B, hy3:makegroup, h"
+        "$mod SHIFT, V, hy3:makegroup, v"
+        "$mod SHIFT, C, hy3:changegroup, toggletab"
+
+        # Scroll through existing workspaces with mod + scroll
+
+        "$mod, mouse_down, workspace, e+1"
+        "$mod, mouse_up, workspace, e-1"
+      ];
+
+      bindn = [
+        # Focus windows with scroll wheel or middle click
+
+        ", mouse:272, hy3:focustab, mouse"
+        ", mouse_down, hy3:focustab, l, require_hovered"
+        ", mouse_up, hy3:focustab, r, require_hovered"
+      ];
+
+      bindm = [
+        # Move/resize windows with mod + LMB/RMB and dragging
+
+        "$mod, mouse:272, movewindow"
+        "$mod, mouse:273, resizewindow"
+      ];
+
+      binde = [
+        # Audio
+
+        # raise volume
+        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
+        # lower volume
+        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        # mute speaker
+        ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+        # mute mic
+        ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+
+        # Media
+
+        # play
+        ", XF86AudioPlay, exec, playerctl play-pause"
+        # next
+        ", XF86AudioNext, exec, playerctl next"
+        # prev
+        ", XF86AudioPrev, exec, playerctl previous"
+
+        # Backlight
+
+        ", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
+        ", XF86MonBrightnessUp, exec, brightnessctl set 5%+"
+      ];
+    };
+  };
+}
diff --git a/modules/desktops/hyprland/default.nix b/modules/desktops/hyprland/default.nix
new file mode 100644
index 0000000..cc1122c
--- /dev/null
+++ b/modules/desktops/hyprland/default.nix
@@ -0,0 +1,40 @@
+{
+  inputs,
+  config,
+  system,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkDefault;
+  cfg = config.desktops;
+in {
+  imports = [
+    ./binds.nix
+    ./env.nix
+    ./idle.nix
+    ./plugins.nix
+    ./settings.nix
+    ./wallpaper.nix
+  ];
+
+  config = mkIf cfg.hyprland {
+    desktops.wayland = true;
+    default.session = mkDefault "hyprland-session.target";
+
+    xdg.portal = {
+      extraPortals = [
+        inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland
+      ];
+    };
+
+    home-manager.users.${config.user} = {
+      wayland.windowManager.hyprland = {
+        enable = true;
+        package = inputs.hyprland.packages.${system}.hyprland;
+
+        xwayland.enable = true;
+        systemd.enable = true;
+      };
+    };
+  };
+}
diff --git a/modules/desktops/hyprland/env.nix b/modules/desktops/hyprland/env.nix
new file mode 100644
index 0000000..7ff3eb7
--- /dev/null
+++ b/modules/desktops/hyprland/env.nix
@@ -0,0 +1,12 @@
+{config,...}: {
+  home-manager.users.${config.user} = {
+    wayland.windowManager.hyprland.settings = {
+      env = [
+        "XDG_CURRENT_DESKTOP,Hyprland"
+        "XDG_SESSION_TYPE,wayland"
+        "XDG_SESSION_DESKTOP,Hyprland"
+        "MOZ_ENABLE_WAYLAND,1"
+      ];
+    };
+  };
+}
diff --git a/modules/desktops/hyprland/idle.nix b/modules/desktops/hyprland/idle.nix
new file mode 100644
index 0000000..53c447b
--- /dev/null
+++ b/modules/desktops/hyprland/idle.nix
@@ -0,0 +1,36 @@
+{config, ...}: {
+  home-manager.users.${config.user} = {
+    services.hypridle = {
+      enable = config.desktops.hyprland;
+
+      settings = {
+        general = {
+          lock_cmd = "pidof ${config.default.lockScreen} || ${config.default.lockScreen}";
+          before_sleep_cmd = "loginctl lock-session";
+          after_sleep_cmd = "hyprctl dispatch dpms on";
+          ignore_dbus_inhibit = false;
+        };
+
+        listener = [
+          # dim screen
+          {
+            timeout = 150;
+            on-timeout = "brightnessctl -s set 10";
+            on-resume = "brightnessctl -r";
+          }
+          # lock
+          {
+            timeout = 300;
+            on-timeout = "loginctl lock-session";
+          }
+          # turn off screen
+          {
+            timeout = 350;
+            on-timeout = "hyprctl dispatch dpms off";
+            on-resume = "hyprctl dispatch dpms on";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/desktops/hyprland/plugins.nix b/modules/desktops/hyprland/plugins.nix
new file mode 100644
index 0000000..b218e74
--- /dev/null
+++ b/modules/desktops/hyprland/plugins.nix
@@ -0,0 +1,45 @@
+{
+  inputs,
+  config,
+  system,
+  ...
+}: let
+  hyprland-plugins = inputs.hyprland-plugins.packages.${system};
+  hy3 = inputs.hy3.packages.${system};
+in {
+  home-manager.users.${config.user} = {
+    wayland.windowManager.hyprland = {
+      plugins = [
+        hyprland-plugins.hyprexpo
+        hy3.hy3
+      ];
+
+      settings.plugin = {
+        # hy3
+        hy3 = {
+          tabs = {
+            height = 24;
+            text_height = 9;
+            text_padding = 10;
+            padding = 2;
+            render_text = true;
+            text_font = "monospace";
+            radius = config.theme.outerRadius;
+            border_width = config.theme.borderWidth;
+
+            "col.active" = "rgb(${config.theme.colors.base})";
+            "col.active.border" = "rgb(${config.theme.colors.primary})";
+            "col.active.text" = "rgb(${config.theme.colors.text})";
+            "col.inactive" = "rgb(${config.theme.colors.base})";
+            "col.inactive.border" = "rgb(${config.theme.colors.surface})";
+            "col.inactive.text" = "rgb(${config.theme.colors.text})";
+          };
+
+          autotile = {
+            enable = true;
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/desktops/hyprland/settings.nix b/modules/desktops/hyprland/settings.nix
new file mode 100644
index 0000000..fdeeadc
--- /dev/null
+++ b/modules/desktops/hyprland/settings.nix
@@ -0,0 +1,117 @@
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  ...
+}: {
+  home-manager.users.${config.user} = {
+    wayland.windowManager.hyprland.settings = {
+      # Monitors
+      monitor =
+        map (
+          monitor: "${monitor.name}, highres, auto, ${toString monitor.scale}, bitdepth, ${toString monitor.bitdepth}"
+        )
+        config.monitors;
+
+      # Autostart
+      exec-once = config.autoRun;
+
+      # General
+      general = {
+        gaps_in = config.theme.innerGap;
+        gaps_out = config.theme.outerGap;
+        layout = "hy3";
+        resize_on_border = "yes";
+        extend_border_grab_area = 20;
+        border_size = config.theme.borderWidth;
+        "col.active_border" = "rgb(${config.theme.colors.primary})";
+        "col.inactive_border" = "rgb(${config.theme.colors.surface})";
+      };
+
+      # Gestures
+      gestures = {
+        workspace_swipe = true;
+        workspace_swipe_fingers = 3;
+        workspace_swipe_forever = true;
+        workspace_swipe_cancel_ratio = 0.15;
+      };
+
+      # Decoration
+      decoration = {
+        rounding = config.theme.outerRadius;
+        shadow.enabled = false;
+        blur = {
+          enabled = config.theme.blur;
+          size = 4;
+          passes = 2;
+          noise = 0.008;
+          contrast = 0.8916;
+          brightness = 0.8;
+        };
+      };
+
+      # Animations
+      animations = {
+        enabled = true;
+
+        bezier = [
+          "windowIn, 0.06, 0.71, 0.25, 1"
+          "windowResize, 0.04, 0.67, 0.38, 1"
+        ];
+
+        animation = [
+          "windowsIn, 1, 3, windowIn, slide #popin 20%"
+          "windowsOut, 1, 3, windowIn, slide #popin 70%"
+          "windowsMove, 1, 2.5, windowResize"
+          "border, 1, 10, default"
+          "borderangle, 1, 8, default"
+          "fade, 1, 3, default"
+          "workspaces, 1, 6, default"
+          "layers, 1, 5, windowIn, slide"
+        ];
+      };
+
+      # Input
+      input = {
+        kb_layout = "us";
+        kb_variant = "";
+        kb_model = "";
+        kb_options = "gtp:alt_shift_toggle, compose:ralt";
+        kb_rules = "";
+        follow_mouse = 1;
+        touchpad = {
+          natural_scroll = "yes";
+        };
+        sensitivity = 0;
+      };
+
+      # XWayland
+      xwayland = {
+        force_zero_scaling = "true";
+        use_nearest_neighbor = "false";
+      };
+
+      # Misc
+      misc = {
+        disable_hyprland_logo = true;
+        disable_splash_rendering = true;
+        key_press_enables_dpms = true;
+        mouse_move_enables_dpms = true;
+        enable_anr_dialog = false;
+        vrr = 1;
+      };
+
+      # Ecosystem
+      ecosystem = {
+        no_update_news = true;
+        no_donation_nag = true;
+      };
+
+      # Experimental
+      experimental = {
+        xx_color_management_v4 = true;
+      };
+    }; # end hyprland
+  }; # end home-manager
+}
diff --git a/modules/desktops/hyprland/wallpaper.nix b/modules/desktops/hyprland/wallpaper.nix
new file mode 100644
index 0000000..b877774
--- /dev/null
+++ b/modules/desktops/hyprland/wallpaper.nix
@@ -0,0 +1,13 @@
+{config, ...}: {
+  home-manager.users.${config.user} = {
+    services.hyprpaper = {
+      enable = config.desktops.hyprland;
+
+      settings = {
+        preload = config.theme.wallpaper;
+        wallpaper = ",${config.theme.wallpaper}";
+        splash = false;
+      };
+    };
+  };
+}
diff --git a/modules/desktops/wayland.nix b/modules/desktops/wayland.nix
new file mode 100644
index 0000000..ceef20a
--- /dev/null
+++ b/modules/desktops/wayland.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+  cfg = config.desktops;
+in {
+  config = mkIf cfg.wayland {
+    xdg.portal = {
+      enable = true;
+      wlr.enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-wlr
+      ];
+    };
+
+    programs.xwayland.enable = true;
+  };
+}