refactor(modules): organize module tree

modules/desktop/session/hyprland/default.nix

@@ -0,0 +1,191 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# The Hyprland compositor.
+let
+  cfg = config.modules.desktop.session.hyprland;
+  user = config.user.name;
+  cursor = config.stylix.cursor;
+
+  # Numbered-workspace switch and move for 1..9, the operator's i3 muscle memory.
+  workspaceBinds = lib.concatMap (n: [
+    "$mod, ${toString n}, workspace, ${toString n}"
+    "$mod SHIFT, ${toString n}, movetoworkspace, ${toString n}"
+  ]) (lib.range 1 9);
+
+  # Flip the tiling strategy between the two built-in layouts, since neither a
+  # dispatcher nor a keyword toggles it on its own.
+  toggleLayout = pkgs.writeShellScript "hypr-toggle-layout" ''
+    if [ "$(hyprctl getoption -j general:layout | ${pkgs.jq}/bin/jq -r .str)" = dwindle ]; then
+      hyprctl keyword general:layout master
+    else
+      hyprctl keyword general:layout dwindle
+    fi
+  '';
+in
+{
+  options.modules.desktop.session.hyprland = {
+    enable = lib.mkEnableOption "the Hyprland compositor";
+
+    blur = lib.mkEnableOption ''
+      window blur. Off by default as the single biggest battery cost on a
+      laptop, left on for a host with the headroom to spend it'';
+  };
+
+  config = lib.mkIf cfg.enable {
+    # This program integration owns the session, portals, and polkit, launched
+    # through the universal Wayland session manager.
+    programs.hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
+
+    home-manager.users.${user}.wayland.windowManager.hyprland = {
+      enable = true;
+
+      # One package drives the whole session, so there is never a version split.
+      # The program integration above installs it and the portal, leaving home-
+      # manager to write only the config.
+      package = null;
+      portalPackage = null;
+
+      # uwsm owns the systemd graphical-session targets.
+      systemd.enable = false;
+
+      # Write the native hyprlang hyprland.conf, whose variable and bind syntax
+      # the settings below are expressed in.
+      configType = "hyprlang";
+
+      settings = {
+        "$mod" = "SUPER";
+        "$terminal" = "alacritty";
+
+        # Session variables handed to the compositor directly.
+        # UWSM launches the session without the shell profile that would carry
+        # them, so a variable the compositor or its children must see is set
+        # here rather than through home-manager's sessionVariables.
+        env =
+          [
+            # Chromium and Electron apps read this to select native Wayland;
+            # nixpkgs wrappers (Obsidian's included) gate their Wayland flags on
+            # it, so without it they run under XWayland and blur at this DPI.
+            "NIXOS_OZONE_WL,1"
+          ]
+          # Bibata ships XCursor only.
+          # The hyprcursor variables name the same theme, which Hyprland
+          # resolves through its XCursor fallback.
+          ++ lib.optionals (cursor != null) [
+            "XCURSOR_THEME,${cursor.name}"
+            "XCURSOR_SIZE,${toString cursor.size}"
+            "HYPRCURSOR_THEME,${cursor.name}"
+            "HYPRCURSOR_SIZE,${toString cursor.size}"
+          ];
+
+        input = {
+          kb_layout = "us";
+          # Caps is a second Escape.
+          # Shift+Caps still toggles a real CapsLock.
+          kb_options = "caps:escape_shifted_capslock";
+          # Snappy key repeat.
+          repeat_delay = 250;
+          repeat_rate = 45;
+          accel_profile = "flat";
+          touchpad = {
+            natural_scroll = true;
+            tap-to-click = true;
+            disable_while_typing = true;
+          };
+        };
+
+        general = {
+          gaps_in = 4;
+          gaps_out = 8;
+          border_size = 2;
+          layout = "dwindle";
+        };
+
+        decoration = {
+          rounding = 6;
+          blur.enabled = cfg.blur;
+        };
+
+        # XWayland clients render at the panel's native resolution instead of
+        # being raster-scaled by the compositor at the fractional monitor scale.
+        xwayland.force_zero_scaling = true;
+
+        animations = {
+          enabled = true;
+          bezier = [ "ease, 0.25, 0.1, 0.25, 1.0" ];
+          # Durations are in centiseconds.
+          # Short values keep the motion subtle.
+          animation = [
+            "windows, 1, 3, ease"
+            "fade, 1, 3, ease"
+            # Layer surfaces like the launcher fade in a touch quicker than windows.
+            "layersIn, 1, 2, ease"
+            "fadeLayersIn, 1, 2, ease"
+            "workspaces, 1, 3, ease"
+            "border, 1, 3, ease"
+          ];
+        };
+
+        dwindle = {
+          preserve_split = true;
+        };
+
+        bind = [
+          "$mod, Return, exec, $terminal"
+
+          # Move focus.
+          "$mod, H, movefocus, l"
+          "$mod, J, movefocus, d"
+          "$mod, K, movefocus, u"
+          "$mod, L, movefocus, r"
+
+          # Move the window within the layout.
+          "$mod SHIFT, H, movewindow, l"
+          "$mod SHIFT, J, movewindow, d"
+          "$mod SHIFT, K, movewindow, u"
+          "$mod SHIFT, L, movewindow, r"
+
+          # Resize the active window.
+          "$mod ALT, H, resizeactive, -40 0"
+          "$mod ALT, J, resizeactive, 0 40"
+          "$mod ALT, K, resizeactive, 0 -40"
+          "$mod ALT, L, resizeactive, 40 0"
+
+          "$mod, Space, togglefloating,"
+          "$mod, F, fullscreen,"
+          # togglesplit is a dwindle layout message, reached through layoutmsg.
+          "$mod, T, layoutmsg, togglesplit"
+          "$mod SHIFT, T, exec, ${toggleLayout}"
+          "$mod SHIFT, Q, killactive,"
+          "$mod CTRL, Q, forcekillactive,"
+        ]
+        ++ workspaceBinds;
+
+        # Volume and brightness keys repeat while held, each raising a popup
+        # through the OSD client.
+        # Volume is capped at 100 percent.
+        # The client floors brightness so a full hold cannot black the screen out.
+        binde = [
+          ", XF86AudioRaiseVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume raise --max-volume 100"
+          ", XF86AudioLowerVolume, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume lower"
+          ", XF86MonBrightnessUp, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness raise"
+          ", XF86MonBrightnessDown, exec, ${pkgs.swayosd}/bin/swayosd-client --brightness lower"
+        ];
+
+        # Mute and media transport still fire while the session is locked.
+        bindl = [
+          ", XF86AudioMute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle"
+          ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+          ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
+          ", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
+        ];
+      };
+    };
+  };
+}

modules/desktop/session/hyprland/hypridle.nix

@@ -0,0 +1,68 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# hypridle: idle-triggered locking and display power management.
+let
+  cfg = config.modules.desktop.session.hyprland.hypridle;
+  user = config.user.name;
+
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
+  hyprlock = "${config.home-manager.users.${user}.programs.hyprlock.package}/bin/hyprlock";
+
+  # The guard drops the call when a locker is already up, so no idle trigger
+  # stacks a second hyprlock over the first.
+  lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}";
+in
+{
+  options.modules.desktop.session.hyprland.hypridle = {
+    enable = lib.mkEnableOption "hypridle idle management";
+
+    lockTimeout = lib.mkOption {
+      type = lib.types.ints.positive;
+      default = 300;
+      description = "Seconds of inactivity before the screen locks.";
+    };
+
+    screenOffTimeout = lib.mkOption {
+      type = lib.types.ints.positive;
+      default = 360;
+      description = "Seconds of inactivity before the displays are powered off.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    # Closing the lid suspends, and every suspend locks first through the
+    # before_sleep_cmd below, so the lid always lands at a locked screen.
+    services.logind.settings.Login.HandleLidSwitch = "suspend";
+
+    home-manager.users.${user}.services.hypridle = {
+      enable = true;
+
+      settings = {
+        general = {
+          lock_cmd = lockCmd;
+          before_sleep_cmd = "loginctl lock-session";
+          # Waking restores the displays the screen-off listener may have cut.
+          after_sleep_cmd = "${hyprctl} dispatch dpms on";
+        };
+
+        listener = [
+          # Lock on idle.
+          {
+            timeout = cfg.lockTimeout;
+            on-timeout = "loginctl lock-session";
+          }
+          # Power the displays off a little later, restoring them on any activity.
+          {
+            timeout = cfg.screenOffTimeout;
+            on-timeout = "${hyprctl} dispatch dpms off";
+            on-resume = "${hyprctl} dispatch dpms on";
+          }
+        ];
+      };
+    };
+  };
+}

modules/desktop/session/hyprland/hyprlock.nix

@@ -0,0 +1,94 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# The lock screen: a hyprlock session-lock surface the compositor owns.
+let
+  cfg = config.modules.desktop.session.hyprland.hyprlock;
+  user = config.user.name;
+
+  # The hyprlock this module installs, used by the lock keybind below.
+  hyprlock = "${config.home-manager.users.${user}.programs.hyprlock.package}/bin/hyprlock";
+
+  sleepIcon = builtins.fromJSON ''"\udb81\udcb2"'';
+  sleepOffIcon = builtins.fromJSON ''"\udb81\udcb3"'';
+
+  idleLockToggle = pkgs.writeShellScript "lockscreen-idle-inhibit-toggle" ''
+    unit=lockscreen-idle-inhibit.service
+
+    refresh_waybar() {
+      ${pkgs.procps}/bin/pkill -RTMIN+9 waybar >/dev/null 2>&1 || true
+    }
+
+    if ${pkgs.systemd}/bin/systemctl --user is-active --quiet "$unit"; then
+      ${pkgs.systemd}/bin/systemctl --user stop "$unit"
+      refresh_waybar
+      ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepIcon}"
+      exit 0
+    fi
+
+    if ${pkgs.systemd}/bin/systemd-run \
+      --user \
+      --collect \
+      --unit=lockscreen-idle-inhibit \
+      --description="Disable idle-triggered screen locking" \
+      ${pkgs.systemd}/bin/systemd-inhibit \
+      --what=idle \
+      --who=lockscreen-hotkey \
+      --why="lock screen disabled by hotkey" \
+      ${pkgs.coreutils}/bin/sleep infinity >/dev/null; then
+      refresh_waybar
+      ${pkgs.swayosd}/bin/swayosd-client --custom-message "${sleepOffIcon}"
+    fi
+  '';
+in
+{
+  options.modules.desktop.session.hyprland.hyprlock.enable = lib.mkEnableOption "the hyprlock lock screen";
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.${user} = {
+      # Colors and the lock-screen background come from Stylix's hyprlock target,
+      # so only geometry and behaviour are set here.
+      programs.hyprlock = {
+        enable = true;
+
+        settings = {
+          general = {
+            hide_cursor = true;
+            # No progress bar flashes before the field is ready to take input.
+            disable_loading_bar = true;
+          };
+
+          # A centered password field.
+          # Its colors come from the Stylix hyprlock target.
+          input-field = {
+            size = "260, 52";
+            rounding = 8;
+            position = "0, -100";
+            halign = "center";
+            valign = "center";
+          };
+
+          # The current time, above the field.
+          label = {
+            text = "$TIME";
+            font_size = 48;
+            position = "0, 120";
+            halign = "center";
+            valign = "center";
+          };
+        };
+      };
+
+      # Lock on Super+X.
+      # The guard drops the keypress when a locker is already up, so a second
+      # hyprlock never stacks over the first.
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, X, exec, ${pkgs.procps}/bin/pidof hyprlock || ${hyprlock}"
+        "$mod CTRL, X, exec, ${idleLockToggle}"
+      ];
+    };
+  };
+}

modules/desktop/session/login.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# Text login: greetd running the tuigreet greeter, which starts the session
+# through the universal Wayland session manager.
+let
+  cfg = config.modules.desktop.session.login;
+in
+{
+  options.modules.desktop.session.login.enable = lib.mkEnableOption "greetd with the tuigreet text greeter";
+
+  config = lib.mkIf cfg.enable {
+    services.greetd = {
+      enable = true;
+      settings.default_session.command =
+        "${lib.getExe pkgs.tuigreet} --time --remember "
+        + "--cmd 'uwsm start -e -D Hyprland hyprland.desktop'";
+    };
+  };
+}

modules/desktop/session/mako.nix

@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# mako as the notification daemon: toasts, a do-not-disturb mode, and history recall.
+let
+  cfg = config.modules.desktop.session.mako;
+  user = config.user.name;
+
+  makoctl = "${pkgs.mako}/bin/makoctl";
+in
+{
+  options.modules.desktop.session.mako.enable = lib.mkEnableOption "the mako notification daemon";
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.${user} = {
+      # Colors and the popup font come from Stylix's mako target, so only
+      # behaviour is set here.
+      services.mako = {
+        enable = true;
+
+        settings = {
+          # Toasts auto-dismiss into history rather than lingering.
+          # mako's own default of 0 leaves every notification on screen until acted on.
+          default-timeout = 5000;
+
+          # The do-not-disturb mode.
+          # Invisible hides the toasts but still records them to history.
+          # Missed notifications can therefore be recalled.
+          "mode=dnd".invisible = true;
+        };
+      };
+
+      # Recall the last notification from history, keyboard-only like the rest
+      # of the session.
+      # $mod is defined by the compositor config these binds share.
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, N, exec, ${makoctl} restore"
+      ];
+    };
+  };
+}

modules/desktop/session/portals.nix

@@ -0,0 +1,23 @@
+{ config, lib, ... }:
+# XDG desktop portal routing for in-app screen sharing and file dialogs.
+let
+  cfg = config.modules.desktop.session.portals;
+in
+{
+  options.modules.desktop.session.portals.enable =
+    lib.mkEnableOption "XDG desktop portals for in-app screen sharing and file dialogs";
+
+  config = lib.mkIf cfg.enable {
+    # The backend packages arrive with the compositor, so only the routing is set
+    # here.
+    # Screen sharing, screenshots, and global shortcuts need the compositor's
+    # own backend.
+    # Everything else uses GTK.
+    xdg.portal.config.common = {
+      default = [ "gtk" ];
+      "org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
+      "org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
+      "org.freedesktop.impl.portal.GlobalShortcuts" = [ "hyprland" ];
+    };
+  };
+}

modules/desktop/session/rofi.nix

@@ -0,0 +1,52 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# rofi as the desktop launcher and dmenu-style menu frontend.
+let
+  cfg = config.modules.desktop.session.rofi;
+  user = config.user.name;
+
+  # A session menu built on the same themed rofi, so the power actions look
+  # like every other menu the launcher drives.
+  powerMenu = pkgs.writeShellScript "rofi-power-menu" ''
+    chosen=$(printf '%s\n' Lock Suspend 'Log out' Reboot 'Shut down' \
+      | ${pkgs.rofi}/bin/rofi -dmenu -i -p Power)
+    case "$chosen" in
+      Lock) ${pkgs.systemd}/bin/loginctl lock-session ;;
+      Suspend) ${pkgs.systemd}/bin/systemctl suspend ;;
+      'Log out') ${pkgs.systemd}/bin/loginctl terminate-session "$XDG_SESSION_ID" ;;
+      Reboot) ${pkgs.systemd}/bin/systemctl reboot ;;
+      'Shut down') ${pkgs.systemd}/bin/systemctl poweroff ;;
+    esac
+  '';
+in
+{
+  options.modules.desktop.session.rofi.enable = lib.mkEnableOption "the rofi launcher";
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.${user} = {
+      # No theme is set here: Stylix's rofi target supplies the Nord one.
+      programs.rofi = {
+        enable = true;
+
+        # Application launch is the only mode, kept minimal so the prompt opens
+        # as fast as rofi can read the desktop entries.
+        # Icons are off: resolving one per entry is the bulk of drun's startup.
+        extraConfig = {
+          modi = "drun";
+          show-icons = false;
+        };
+      };
+
+      # The launcher and the session menu, kept next to the tool they drive.
+      # $mod is defined by the compositor config these binds share.
+      wayland.windowManager.hyprland.settings.bind = [
+        "$mod, R, exec, ${pkgs.rofi}/bin/rofi -show drun"
+        "$mod SHIFT, X, exec, ${powerMenu}"
+      ];
+    };
+  };
+}

modules/desktop/session/waybar.nix

@@ -0,0 +1,178 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# Waybar: a top status bar reading system state at a glance.
+let
+  cfg = config.modules.desktop.session.waybar;
+  user = config.user.name;
+
+  # A Nerd Font Private-Use-Area codepoint as a literal character, decoded
+  # through JSON so the glyph survives as bytes rather than an editor paste.
+  g = code: builtins.fromJSON ''"\u${code}"'';
+  sleepOffIcon = builtins.fromJSON ''"\udb81\udcb3"'';
+
+  # Renders and toggles mako's do-not-disturb mode.
+  # With no mako daemon answering, the status reads "notifications on", keeping
+  # the widget inert rather than broken.
+  dndStatus = pkgs.writeShellScript "waybar-dnd-status" ''
+    if ${pkgs.mako}/bin/makoctl mode 2>/dev/null | ${pkgs.gnugrep}/bin/grep -qx dnd; then
+      printf '{"text":"${g "f1f6"}","tooltip":"Do not disturb: on","class":"dnd"}\n'
+    else
+      printf '{"text":"${g "f0f3"}","tooltip":"Notifications on","class":"active"}\n'
+    fi
+  '';
+
+  dndToggle = pkgs.writeShellScript "waybar-dnd-toggle" ''
+    ${pkgs.mako}/bin/makoctl mode -t dnd >/dev/null 2>&1
+    ${pkgs.procps}/bin/pkill -RTMIN+8 waybar
+  '';
+
+  # Lit while a wf-recorder capture is running.
+  # Empty text collapses the widget when idle, so it shows nothing until then.
+  recStatus = pkgs.writeShellScript "waybar-recording-status" ''
+    if ${pkgs.procps}/bin/pgrep -x wf-recorder >/dev/null; then
+      printf '{"text":"${g "f03d"}","tooltip":"Recording","class":"recording"}\n'
+    else
+      printf '{"text":"","class":"idle"}\n'
+    fi
+  '';
+
+  idleLockStatus = pkgs.writeShellScript "waybar-idle-lock-status" ''
+    if ${pkgs.systemd}/bin/systemctl --user is-active --quiet lockscreen-idle-inhibit.service; then
+      printf '{"text":"${sleepOffIcon}","tooltip":"Idle locking inhibited","class":"inhibited"}\n'
+    else
+      printf '{"text":"","class":"idle"}\n'
+    fi
+  '';
+in
+{
+  options.modules.desktop.session.waybar.enable = lib.mkEnableOption "the Waybar status bar";
+
+  config = lib.mkIf cfg.enable {
+    # A symbols font backs the module glyphs, so pango falls back to it for the
+    # codepoints Stylix's monospace font does not carry.
+    fonts.packages = [ pkgs.nerd-fonts.symbols-only ];
+
+    home-manager.users.${user}.programs.waybar = {
+      enable = true;
+
+      # A user service bound to graphical-session.target, which uwsm activates,
+      # so the bar comes up with the session and no compositor exec-once.
+      systemd.enable = true;
+
+      settings.mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+
+        modules-left = [ "hyprland/workspaces" ];
+        modules-center = [ "clock" ];
+        modules-right = [
+          "custom/recording"
+          "custom/idle-lock"
+          "mpris"
+          "wireplumber"
+          "network"
+          "battery"
+          "custom/dnd"
+        ];
+
+        # Per-application icons for the windows on each workspace, mapped from
+        # window class with a neutral glyph for anything unlisted.
+        "hyprland/workspaces" = {
+          on-click = "activate";
+          format = "{id} {windows}";
+          format-window-separator = " ";
+          window-rewrite-default = g "f2d0";
+          window-rewrite = {
+            "class<Alacritty>" = g "f120";
+            "class<.*[Ff]irefox.*>" = g "f269";
+            "class<chromium.*>" = g "f268";
+            "class<[Cc]ode>" = g "f121";
+            "class<obsidian>" = g "f02d";
+            "class<[Ss]team>" = g "f1b6";
+          };
+        };
+
+        clock = {
+          format = "{:%a %d %b  %H:%M}";
+          tooltip-format = "<tt>{calendar}</tt>";
+          calendar = {
+            mode = "month";
+            # Underline the current day so it stands out in the grid.
+            format.today = "<b><u>{}</u></b>";
+          };
+        };
+
+        mpris = {
+          format = "${g "f001"} {title}";
+          format-paused = "${g "f04c"} {title}";
+          max-length = 40;
+          on-click = "play-pause";
+          on-scroll-up = "next";
+          on-scroll-down = "previous";
+        };
+
+        wireplumber = {
+          format = "{icon} {volume}%";
+          format-muted = "${g "f026"} muted";
+          format-icons = [
+            (g "f026")
+            (g "f027")
+            (g "f028")
+          ];
+          on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
+        };
+
+        network = {
+          format-wifi = "${g "f1eb"} {essid}";
+          format-ethernet = "${g "f796"} {ifname}";
+          format-disconnected = "${g "f127"} off";
+          tooltip-format = "{ipaddr} via {gwaddr}";
+        };
+
+        battery = {
+          format = "{icon} {capacity}%";
+          format-charging = "${g "f0e7"} {capacity}%";
+          format-icons = [
+            (g "f244")
+            (g "f243")
+            (g "f242")
+            (g "f241")
+            (g "f240")
+          ];
+          states = {
+            warning = 20;
+            critical = 10;
+          };
+        };
+
+        "custom/dnd" = {
+          return-type = "json";
+          exec = "${dndStatus}";
+          on-click = "${dndToggle}";
+          interval = "once";
+          signal = 8;
+        };
+
+        # Recording state has no event to hook, so the widget samples the
+        # wf-recorder process once a second.
+        "custom/recording" = {
+          return-type = "json";
+          exec = "${recStatus}";
+          interval = 1;
+        };
+
+        "custom/idle-lock" = {
+          return-type = "json";
+          exec = "${idleLockStatus}";
+          interval = "once";
+          signal = 9;
+        };
+      };
+    };
+  };
+}