fix: sign again with jujutsu

secrets/secrets.yaml

@@ -4,7 +4,7 @@ mopidy:
     bandcamp: ENC[AES256_GCM,data:diEx2fbkOR1oUav81jU5bNt/KNmbOaVzLV+G3zBUVXE7nEQpZNqVom0rgNrEVDGzH3u/IaA5eqG5ce9lE0BomeY8Z4MWI1xujhX5KsXdv21aw4UwsNgyLPuWhkN2POUMfCJlvekc/TFfFvJHyysx8aKxeI4dsg==,iv:cxx0cVkjOPG+hMD8JctJHdcICJt7ozpfRBVSCDBo6Ro=,tag:JRjwwvieGaGZJ+k56HWFaw==,type:str]
 emailPassword: ENC[AES256_GCM,data:LALAvyuNN9bfa8D6ZK1YiFXRfxLOBi9kXA0N0Kr7h18eAI4hWQ==,iv:WtidILFfWCMKylax52JP+X57GfZyYlxJtiwrC6SADik=,tag:NvOrsL3fbmxQZp06GZhUZA==,type:str]
 ssh:
-    hosts: ENC[AES256_GCM,data:j7+Ua5G8dePL5GO+Tf8+hnoJsSfKo2z4I0OcVfSyJ3dc6yyYZVho8iG9bqPAqVR5d7SJr391zCLMJp/jRDpDFLkzQB54udVKI8ob0C2w2xBznPZJsC7qZMptQ+n4IHO1ZROSi/vBadCUfEWKNO9e8gsroBYmliy/31M5IlA85Vx6q4Zx0qIFylfIhBDto3jD2DRcbjWP8NvjJcY7YLrN2sv8RR7QqX1q+0ZxpgFhg+W+a5Dz8JBVsPEdjNJqFAKAmUGKXf4bpEIS5lLUxxZweizEiWgo4nYJgA0kqVYEOiErOPgtpnBKiJlR+fLGuVwdGxVOUMvttZtyIgHc4CWgOJ0h67h4eVii+zeLn0GPJl3i2g5bjOArHKLfkKGduqii4n/1p9VvVTAOn5dj0/NtD2JNJF9kUDr1nMyMa1xA35gzv1vp/U55L6ZU/BRpBPzka6i8nGnCkDVdoUG0DKhN9ooXRpUS9L+W1iz480fzb6i/tfmlhx7Ms1T9VybYFkGLNkxnsrt5Oc24o0XD5/A1j8bJgNWo6aWSA748ZWtN0mXDzB5sH4TVtaZAGlyU9r/x5oCuWPN2qhZ8d2i7g5rceZW5ang/uyXNt8Le5cKvLw3Rhf4BTFhQ6+VJ4/SpdfnLZ17djjbwZO1DT5Nb0RUObcilcwbmUwqvmLbcrdmsfQMOcetRwFpIdoX6MjkRiC1WZ4cz8bMU7ArnK/n15dsIdaiiUfuOJAiBYut1PaJBoZDe8pXzOE6U1s57sejUf1T7NHp2epyevCAYuVG71dAFLn1oLM+FWXuBm6ogFLujoFh7XCVVqdf6j348/ekzBxDIemzS4G1+zflG3AteLWcslGVTNmx0rb3GlSHGNVNZoeHvYAHIIEyWpY4Yd01R8RhjrFXQo9comnpoQXSlFDvuUGTxuUpsariAof4wKLdpqj8Dc4ZaDvd1pAGVh7RBqR4rn4kClbWUVcSFy7QWs9T5Sw0fU/bLL76N6x9Y44P5NQLAJvZ0z8rhIPl0u8OwIhhEwkhWdFLSulk/N7+DVqrRpj7bB5hB8jZWspsl44IdiZWY3UPs7zs=,iv:3q4FYxDWPGyMqeKoSTRxSPvqZXzwg/NeHZh70d38HYM=,tag:jA8/5yi74/mOuu/b83WEeg==,type:str]
+    hosts: ENC[AES256_GCM,data:Z+ODSCeKqt2ipgR9ZMV13kHZSZrwr7pY+kXM2Ej2Mc7WrBXoN25T+OWPJ6uf70yBGMID1faaWtbMUCjsp6gjqIVR7UH59yVfuKGDQIw5FSy3bdyvADITjASJMFIfO1xsu8iY0h18PdUBqNNYnt27c+3Bxn5SP0r6OCUC48SkSeCVhxtFIIMR4ZiVHZwQ2pD1GwLjmdUPPSpEJg5vpjFhFKB6Ab8z+qN5GaYMov2NKivMNVTBQUHpgmf58D6MI/AnjUbVsLuOmp0V3lhy8/qX33tgogpVv/RA6gAITVlAf9rGwaF+axZ0iy0T/gF7VJEGX6RUHbVUJoX1j8szDq/P4oqczFubrZdmRIbutG4tEcnYXltMu2NELFP+bl/G4y1gIV2b+s0k+UQJXn4KaiyXbtQXvOJ91+s7iMyTDi4QQd07l7nFqGGgzoKTYVfQK0e5ilEofRQrXwAb+p6Pwkvth8ktONFgD0sQHL75a8lS//8Mzvqopy5Vp0FQJ+OSW89Eeu2wrw9yNP2yuMDX9tvgDuZV4hgvDa9tTxvfGoMDXWARhSBt/F/a4ZkrNV9unjgEXbkrewezn1Jk+XWtAlussbTEXkKG87v2Q0V8zBa8gsB/5g514dIP6+UJdc3GEJzMLkQNcHYn9r3Ou8n+YgXD8zu5OnZXtNZ/x+J6NxH7tudiO5O0XctRwJQibidS2ONUhdkQGBt1JrAysGbNTuXC8Sn391rc11lsH+wIGpZg4zR+rdP4FWs68v/o9WtCJDCejnlyQ1DQ+avLc0aT4xxJZh8uM2iSsfi/TzRr9w0wVe2y3xAxsQMCfvhFcl9agfmAgGZcfVPCU9nc4dIfdGW1kTN7s3Izvy4mYaqd9mv0xxYARf7roJDGWie0VNxXQVt2o1tIQCqAhZ/bbgPG5VDyD15LGDI8BZCFaAOKlXn+beVMt6E1JJPlHa0vOwnbMVVKcUS/d5jA9nnb20Pwz4F3b532/ERmSkVlcZmCKqQOxo0YADb7Cm1fFBj6Eum0+F+jspg9QQmMjPPsb+NbMqnFd5DNDY+e95hr7tUEy4/yxiXiM0cu1w==,iv:I4TtUJdQFOVik5L26XHukxix0FCm/JNi6nVZg5qRMqs=,tag:vnO6DlUW5XnougyiJzwNdg==,type:str]
 sops:
     age:
         - recipient: age1ajemtm502nn2n4q7v4j8meyd5mxtcqngkkedxq2pqzuwu78zp93qnw8q48
@@ -61,7 +61,7 @@ sops:
             QmJKNDJUY0RSakhwNWlkOVpib0trc1kK0tQxD9I82pjfs54eruu+IjzVUmcVBCPw
             9mp1xKiYRRMXt3YQn6MPiyuuX3l3UB5MH0RJMNtRq0D961rs+iiS5A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-08-07T09:16:46Z"
+    lastmodified: "2025-11-02T16:19:20Z"
-    mac: ENC[AES256_GCM,data:3PIJps2hoavPJ6ig+943FE73lBhCfxv8vuzmgTtooH386V12/PQN+Opt/ZoIbXU9w21XelZ/C5xPr8rcuw5ADx9K/KjdMm8jyLCO6/+iBf6SjnbC3E0DyiDit50UtWxKc32ryiJ8m5hYfX6O2H8WIGFa+6wp5KISV9pkc09CNZA=,iv:xzwEhhBJQOlde8Ib+tZpv+2CHfR83dFevdwERkYTsTE=,tag:SzdcZH19kSTnNs16754IMw==,type:str]
+    mac: ENC[AES256_GCM,data:2UFvzqhsR9OecqRX/n2O5wJ1fcdhetNE37Vj56rL6tRxT42uU8SKy7hxROS0LcrwKs59Km7P1oO/mYW6eyuLAZ7R5MAm18R5UYIYpKV8oevNUYMl0bsJkMnzl+nxz2i0ceg38rsioS9frK9a29hbJiV6Vr9yubHNdtZF4YqRmH0=,iv:Cx2nN4Gm0L+aWi6jbLuSuzhhzD8W5PzCLmJajyb/oEo=,tag:6wM1m8LB+7Rd/F9h62C4gg==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.11.0

users/modules/cli/scripts/askpass.nix

@@ -1,3 +1,3 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "askpass" ''
-  ${pkgs.wofi}/bin/wofi -d -P -L 1 -p "$(printf $1 | sed s/://)"''
+  ${pkgs.rofi}/bin/rofi -dmenu -password -no-fixed-num-lines -p $(printf \"$*\" | sed 's/://')''

users/modules/cli/scripts/rofi-emoji.nix

@@ -1,18 +0,0 @@
-{pkgs, ...}:
-pkgs.writeShellScriptBin "rofi-emoji" ''
-  SELECTED_EMOJI=$(grep -v "#" ~/.config/emoji | ${pkgs.wofi}/bin/wofi --dmenu -p "Select emoji" -i | awk '{print $1}' | tr -d '\n')
-  if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
-    printf "%s" "$SELECTED_EMOJI" | ${pkgs.wl-clipboard-rs}/bin/wl-copy
-  else
-    printf "%s" "$SELECTED_EMOJI" | ${pkgs.xclip}/bin/xclip -sel clip
-  fi
-
-  if [ "$XDG_SESSION_TYPE" = "wayland" ]
-  then EMOJI=$(${pkgs.wl-clipboard-rs}/bin/wl-paste)
-  else EMOJI=$(${pkgs.xclip}/bin/xclip -o)
-  fi
-
-  test -z "$EMOJI" && notify-send "No emoji copied" -u low && exit
-  EMOJI="$EMOJI copied to clipboard"
-  ${pkgs.libnotify}/bin/notify-send -u low "$EMOJI"
-''

users/modules/cli/scripts/ytplay.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "ytplay" ''
-  URL=$(${pkgs.wofi}/bin/wofi --dmenu -i -p "Video URL")
+  URL=$(rofi -dmenu -i -p "Video URL")
   if [ -z "$URL" ]; then
       echo "You need to provide a URL"
       exit 1
@@ -9,7 +9,7 @@ pkgs.writeShellScriptBin "ytplay" ''
                           grep -E "webm.*[0-9]+x[0-9]" | \
                           awk '{print $3 " " $1}' | \
                           sort -gu | \
-                          ${pkgs.wofi}/bin/wofi --dmenu -i -p "Resolution")
+                          rofi -dmenu -i -p "Resolution")
   mapfile -t RESOLUTION <<< "$RESOLUTION_CHOICE"
   RESOLUTION_CODE=''${RESOLUTION[0]}
   ${pkgs.mpv}/bin/mpv --ytdl-format="''${RESOLUTION_CODE}+bestaudio/best" "$URL"

users/modules/desktop/default.nix

@@ -7,17 +7,17 @@ with lib; let
   cfg = config.home.desktop;
 in {
   imports = [
-    ./emoji.nix
     ./eww.nix
     ./hyprland.nix
     ./kdeconnect.nix
     ./kitty.nix
     ./obs.nix
     ./qt.nix
+    ./rofi
     ./swaync.nix
     ./waybar.nix
+    ./wlr-which-key.nix
     ./wlsunset.nix
-    ./wofi.nix
   ];
 
   options.home.desktop.fullDesktop = mkEnableOption "Enable options for graphical environments";
@@ -28,5 +28,7 @@ in {
     kitty.enable = mkDefault cfg.fullDesktop;
     obs.enable = mkDefault cfg.fullDesktop;
     qt.enable = mkDefault cfg.fullDesktop;
+    rofi.enable = mkDefault cfg.fullDesktop;
+    wlr-which-key.enable = mkDefault cfg.fullDesktop;
   };
 }

users/modules/desktop/hyprland.nix

@@ -6,13 +6,13 @@
 }:
 with lib; let
   cfg = config.home.desktop.hyprland;
-  rofi-emoji = import ../cli/scripts/rofi-emoji.nix {inherit pkgs;};
   laptops = ["gampo"];
 in {
   imports = [
     ./swaync.nix
     ./waybar.nix
     ./wlsunset.nix
+    ./hyprpaper.nix
   ];
 
   options.home.desktop.hyprland = {
@@ -34,14 +34,16 @@ in {
 
   config = mkIf cfg.enable {
     home.desktop = {
+      hyprpaper.enable = true;
+      rofi.enable = mkDefault true;
       swaync.enable = mkDefault true;
       waybar = {
         enable = mkDefault true;
         battery = mkDefault (builtins.elem cfg.host laptops);
       };
       wlsunset.enable = mkDefault true;
-      wofi.enable = mkDefault true;
     };
+    services.blueman-applet.enable = true;
     wayland.windowManager.hyprland = {
       enable = true;
       xwayland.enable = true;
@@ -112,11 +114,11 @@ in {
         $right = r
         $up = s
         $down = t
-        $menu = ${pkgs.wofi}/bin/wofi --show drun
+        $menu = rofi -combi-modi drun,calc -show combi
 
         bind = SUPER, Return, exec, ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux
-        bind = SUPER, Space, submap, leader
+        bind = SUPER, Space,  exec, ${pkgs.wlr-which-key}/bin/wlr-which-key
-        bind = , Print, submap, screenshot
+        bind =      , Print,  exec, ${pkgs.wlr-which-key}/bin/wlr-which-key -k s
 
         submap = leader
         bind = , l, exec, plock
@@ -145,11 +147,13 @@ in {
         bind = , u, submap, reset
         bind = , escape, submap, reset
         bind = CTRL, g, submap, reset
+
         submap = buffers
         bind = , d, killactive,
         bind = , d, submap, reset
         bind = , escape, submap, reset
         bind = CTRL, g, submap, reset
+
         submap = resize
         binde = , $left, resizeactive, -10 0
         binde = , $right, resizeactive, 10 0
@@ -158,15 +162,21 @@ in {
         bind = , q, submap, reset
         bind = , escape, submap, reset
         bind = CTRL, g, submap, reset
+
         submap = rofi
-        bind = , e, exec, ${rofi-emoji}/bin/rofi-emoji
+        bind = , b, exec, rofi-bluetooth
+        bind = , b, submap, reset
+        bind = , e, exec, rofi -show emoji
         bind = , e, submap, reset
         bind = , r, exec, $menu
         bind = , r, submap, reset
+        bind = , s, exec, rofi -show ssh
+        bind = , r, submap, reset
         bind = , y, exec, ytplay
         bind = , y, submap, reset
         bind = , escape, submap, reset
         bind = CTRL, g, submap, reset
+
         submap = screenshot
         bind = , Print, exec, screenshot
         bind = , Print, submap, reset
@@ -182,6 +192,7 @@ in {
         bind = Shift, s, submap, reset
         bind = , escape, submap, reset
         bind = CTRL, g, submap, reset
+
         submap = windows
         bind = , period, submap, resize
         bind = , $left, movefocus, l
@@ -271,17 +282,5 @@ in {
         bind = SUPER_SHIFT, asterisk, movetoworkspace, 10
       '';
     };
-    services = {
-      blueman-applet.enable = true;
-      hyprpaper = {
-        enable = true;
-        settings = {
-          ipc = "on";
-          splash = false;
-          preload = "/home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
-          wallpaper = ", /home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
-        };
-      };
-    };
   };
 }

users/modules/desktop/hyprpaper.nix

@@ -0,0 +1,87 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.home.desktop.hyprpaper;
+in {
+  options.home.desktop.hyprpaper = {
+    enable = mkEnableOption "Enables Hyprpaper";
+    default = mkOption {
+      type = types.str;
+      default = "/home/phundrak/Pictures/Wallpapers/nord/Nordic6.jpg";
+      example = "/home/user/image.jpg";
+    };
+    wallpapers-dir = mkOption {
+      type = types.str;
+      default = "/home/phundrak/Pictures/Wallpapers/nord/";
+      example = "/home/user/Pictures/";
+    };
+    rotation-interval = mkOption {
+      type = types.str;
+      default = "5m";
+      example = "10m";
+      description = "Interval between wallpaper rotations";
+    };
+  };
+  config = mkIf cfg.enable {
+    services.hyprpaper = {
+      inherit (cfg) enable;
+      settings = {
+        ipc = "on";
+        splash = false;
+        preload = cfg.default;
+        wallpaper = ", ${cfg.default}";
+      };
+    };
+    systemd.user = {
+      services.hyprpaper-rotation = {
+        Unit = {
+          Description = "Rotate Hyprpaper wallpaper";
+          After = "graphical-session.target";
+        };
+        Service = {
+          Type = "oneshot";
+          ExecCondition = "pidof Hyprland";
+          ExecStart = "${config.home.homeDirectory}/.config/hypr/hyprpaper-rotate.sh";
+        };
+      };
+
+      timers.hyprpaper-rotation = {
+        Unit = {
+          Description = "Timer for rotating Hyprpaper wallpaper";
+        };
+        Timer = {
+          OnBootSec = cfg.rotation-interval;
+          OnUnitActiveSec = cfg.rotation-interval;
+        };
+        Install = {
+          WantedBy = ["timers.target"];
+        };
+      };
+    };
+    home.file.".config/hypr/hyprpaper-rotate.sh" = {
+      text = ''
+        #!/usr/bin/env bash
+        set -euo pipefail
+
+        WALLPAPER_DIR="${cfg.wallpapers-dir}"
+
+        # Find a random wallpaper
+        WP=$(find "$WALLPAPER_DIR" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) | shuf -n 1)
+
+        if [ -z "$WP" ]; then
+          echo "No wallpapers found in $WALLPAPER_DIR"
+          exit 1
+        fi
+
+        echo "Setting wallpaper to: $WP"
+
+        # Load and set the wallpaper
+        hyprctl hyprpaper preload "$WP" && hyprctl hyprpaper wallpaper ",$WP"
+      '';
+      executable = true;
+    };
+  };
+}

users/modules/desktop/rofi/default.nix

@@ -0,0 +1,107 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.home.desktop.rofi;
+  inherit (config.lib.formats.rasi) mkLiteral;
+in {
+  options.home.desktop.rofi = {
+    enable = mkEnableOption "Enable Rofi";
+  };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [rofi-bluetooth];
+    programs.rofi = {
+      enable = true;
+      plugins = with pkgs; [
+        rofi-calc
+        rofi-emoji
+      ];
+      terminal = "${pkgs.kitty}/bin/kitty";
+      location = "center";
+      modes = ["drun" "emoji" "calc" "combi"];
+      extraConfig.show-icons = true;
+      theme = {
+        "*" = {
+          font = "Cascadia Code 14";
+          blur = true;
+          padding = mkLiteral "10px";
+          background-color = mkLiteral "transparent";
+          border-radius = mkLiteral "0px";
+        };
+        window = {
+          width = mkLiteral "1050px";
+          height = mkLiteral "625px";
+          location = mkLiteral "center";
+          blur = true;
+          border = mkLiteral "2px";
+          border-radius = mkLiteral "3px";
+          border-color = mkLiteral "#61afef";
+          background-color = mkLiteral "transparent";
+          padding = mkLiteral "0px";
+          margin = mkLiteral "30px 50px";
+        };
+        mainbox = {
+          orientation = mkLiteral "horizontal";
+          children = map mkLiteral ["borderbox"];
+          spacing = mkLiteral "0px";
+          padding = mkLiteral "0px";
+        };
+        borderbox = {
+          orientation = mkLiteral "horizontal";
+          children = map mkLiteral ["imagebox" "contentbox"];
+          padding = mkLiteral "0px";
+          spacing = mkLiteral "0px";
+          border-radius = mkLiteral "3px";
+        };
+        contentbox = {
+          orientation = mkLiteral "vertical";
+          children = map mkLiteral ["entry" "listview"];
+          spacing = mkLiteral "0px";
+          padding = mkLiteral "0px";
+          expand = true;
+        };
+        imagebox = {
+          background-image = mkLiteral "url(\"${./image.jpg}\")";
+          background-repeat = false;
+          size = mkLiteral "200px 625px";
+        };
+        element = {
+          border-radius = mkLiteral "0px";
+        };
+        "element-text, element-icon" = {
+          padding = mkLiteral "6px 8px";
+          spacing = mkLiteral "2px";
+          text-color = mkLiteral "#fab387";
+        };
+        "element selected" = {
+          background-color = mkLiteral "#191919";
+          text-color = mkLiteral "#e5c07b";
+          border-radius = mkLiteral "3px";
+        };
+        prompt = {
+          enabled = false;
+          background-color = mkLiteral "transparent";
+          text-color = mkLiteral "#61afef";
+          padding = mkLiteral "5px 10px";
+        };
+        entry = {
+          padding = mkLiteral "8px";
+          expand = false;
+          font = "Cascadia Code 14";
+          text-color = mkLiteral "#fab387";
+          border-radius = mkLiteral "0px 3px 0px 0px";
+          background-color = mkLiteral "#292e36";
+        };
+        listview = {
+          lines = mkLiteral "1";
+          background-color = mkLiteral "rgba(46, 52, 64, 0.8)";
+          border-radius = mkLiteral "0px 0px 3px 0px";
+          padding = mkLiteral "5px";
+        };
+      };
+    };
+  };
+}

users/modules/desktop/wlr-which-key.nix

@@ -0,0 +1,189 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit
+    (lib)
+    literalExpression
+    mkIf
+    mkOption
+    mkEnableOption
+    types
+    ;
+  cfg = config.home.desktop.wlr-which-key;
+  yamlFormat = pkgs.formats.yaml {};
+
+  # Convert kebab-case to snake_case
+  toSnakeCase = str: builtins.replaceStrings ["-"] ["_"] str;
+
+  # Recursively filter out null values and convert kebab-case keys to snake_case
+  filterNulls = value:
+    if lib.isAttrs value
+    then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (n: v: v != null) value)
+    else if lib.isList value
+    then map filterNulls value
+    else value;
+  menuEntryType = types.submodule {
+    freeformType = yamlFormat.type;
+    options = with types; {
+      key = mkOption {
+        type = str;
+        example = "p";
+      };
+      desc = mkOption {
+        type = str;
+        example = "Power";
+      };
+      cmd = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "echo example";
+      };
+      keep-open = mkOption {
+        type = nullOr bool;
+        default = null;
+        example = true;
+      };
+      submenu = mkOption {
+        type = nullOr (listOf menuEntryType);
+        default = null;
+        example = literalExpression ''
+          [
+            { key = "s"; desc = "Suspend"; cmd = "systemctl suspend"; }
+            { key = "r"; desc = "Reboot"; cmd = "systemctl reboot"; }
+            { key = "o"; desc = "Poweroff"; cmd = "systemctl poweroff"; }
+          ]
+        '';
+      };
+    };
+  };
+  settingsType = types.submodule {
+    freeformType = yamlFormat.type;
+    options = with types; {
+      background = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "#282828FF";
+      };
+      color = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "#FBF1C7FF";
+      };
+      border = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "#8EC07CFF";
+      };
+      anchor = mkOption {
+        type = nullOr (enum ["center" "top" "bottom" "left" "right" "top-left" "top-right" "bottom-left" "bottom-right"]);
+        default = null;
+        example = "top-left";
+      };
+      margin-top = mkOption {
+        type = nullOr int;
+        default = null;
+        example = "0";
+      };
+      margin-right = mkOption {
+        type = nullOr int;
+        default = null;
+        example = "0";
+      };
+      margin-bottom = mkOption {
+        type = nullOr int;
+        default = null;
+        example = "0";
+      };
+      margin-left = mkOption {
+        type = nullOr int;
+        default = null;
+        example = "0";
+      };
+      font = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "monospace 10";
+      };
+      separator = mkOption {
+        type = nullOr str;
+        default = null;
+        example = " ➜ ";
+      };
+      border-width = mkOption {
+        type = nullOr (either float int);
+        default = null;
+        example = 4.0;
+      };
+      corder-r = mkOption {
+        type = nullOr (either float int);
+        default = null;
+        example = 20.0;
+      };
+      padding = mkOption {
+        type = nullOr (either float int);
+        default = null;
+        example = 15.0;
+      };
+      rows-per-column = mkOption {
+        type = nullOr int;
+        default = null;
+        example = 5;
+      };
+      column-padding = mkOption {
+        type = nullOr (either float int);
+        default = null;
+        example = 25.0;
+      };
+      inhibit-compositor-keyboard-shortcuts = mkOption {
+        type = bool;
+        default = true;
+        example = false;
+      };
+      auto_kbd_layout = mkOption {
+        type = bool;
+        default = true;
+        example = false;
+      };
+      namespace = mkOption {
+        type = nullOr str;
+        default = null;
+        example = "wlr_which_key";
+      };
+      menu = mkOption {
+        type = listOf menuEntryType;
+        default = [];
+        example = literalExpression ''
+          [
+            {
+              key = "p";
+              desc = "Power";
+              submenu = [
+                { key = "s"; desc = "Suspend"; cmd = "systemctl suspend"; }
+                { key = "r"; desc = "Reboot"; cmd = "systemctl reboot"; }
+                { key = "o"; desc = "Poweroff"; cmd = "systemctl poweroff"; }
+              ];
+            }
+          ]
+        '';
+      };
+    };
+  };
+in {
+  options.home.desktop.wlr-which-key = {
+    enable = mkEnableOption "Enables wlr-which-key";
+    package = lib.mkPackageOption pkgs "wlr-which-key" {};
+    settings = mkOption {
+      type = settingsType;
+      default = {};
+      description = "Configuration written to {file}`$XDG_CONFIG_HOME/wlr-which-key/config.yaml`.";
+    };
+  };
+  config = mkIf cfg.enable {
+    xdg.configFile = {
+      "wlr-which-key/config.yaml".source = yamlFormat.generate "wlr-which-key-config.yml" (filterNulls cfg.settings);
+    };
+  };
+}

users/modules/desktop/wofi.nix

@@ -1,76 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.home.desktop.wofi;
-in {
-  options.home.desktop.wofi.enable = mkEnableOption "Enable wofi support";
-  config.programs.wofi = mkIf cfg.enable {
-    inherit (cfg) enable;
-    settings = {
-      modi = "ssh,drun,combi";
-      sidebar-mode = false;
-      width = 50;
-      line-margin = 10;
-      lines = 6;
-      columns = 2;
-      display-ssh = "";
-      display-run = "";
-      display-drun = "";
-      display-window = "";
-      display-combi = "";
-      show-icons = true;
-    };
-    # from https://github.com/alxndr13/wofi-nord-theme
-    style = ''
-      * {
-        font-family: "Hack", monospace;
-      }
-
-      window {
-        background-color: #3B4252;
-      }
-
-      #input {
-        margin: 5px;
-        border-radius: 0px;
-        border: none;
-        background-color: #3B4252;
-        color: white;
-      }
-
-      #inner-box {
-        background-color: #383C4A;
-      }
-
-      #outer-box {
-        margin: 2px;
-        padding: 10px;
-        background-color: #383C4A;
-      }
-
-      #scroll {
-        margin: 5px;
-      }
-
-      #text {
-        padding: 4px;
-        color: white;
-      }
-
-      #entry:nth-child(even){
-        background-color: #404552;
-      }
-
-      #entry:selected {
-        background-color: #4C566A;
-      }
-
-      #text:selected {
-        background: transparent;
-      }
-    '';
-  };
-}

users/modules/dev/editors/emacs.nix

@@ -6,10 +6,11 @@
 }:
 with lib; let
   emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
-    epkgs: [
+    epkgs:
-      epkgs.mu4e
+      with epkgs; [
-      epkgs.pdf-tools
+        mu4e
-    ]
+        pdf-tools
+      ]
   ));
   cfg = config.home.dev.editors.emacs;
 in {
@@ -25,7 +26,10 @@ in {
   };
 
   config = {
-    home.packages = [pkgs.emacs-all-the-icons-fonts];
+    home.packages = with pkgs; [
+      emacs-all-the-icons-fonts
+      emacs-lsp-booster
+    ];
     programs.emacs = mkIf cfg.enable {
       enable = true;
       inherit (cfg) package;

users/modules/dev/vcs/jujutsu.nix

@@ -28,9 +28,9 @@ in {
       enable = mkEnableOption "enables signing jj commits";
       sshKey = mkOption {
         type = with types; nullOr (either path str);
-        example = "~/.ssh/id_ed25519.pub";
+        example = "~/.ssh/id_ed25519";
-        default = "~/.ssh/id_ed25519.pub";
+        default = "~/.ssh/id_ed25519";
-        description = "Path to the public SSH key or its content.";
+        description = "Path to the private SSH key for signing.";
       };
     };
   };
@@ -54,8 +54,8 @@ in {
         behavior = "own";
         backend = "ssh";
         key = cfg.signing.sshKey;
-        backends."ssh.allowed-signers" = "~/.ssh/allowed_signers";
+        backends.ssh.allowed-signers = "${config.home.homeDirectory}/.ssh/allowed_signers";
-        backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen";
+        backends.ssh.program = "${pkgs.openssh}/bin/ssh-keygen";
       };
       aliases = {
         blame = ["file" "annotate"];

users/phundrak/email.nix

@@ -6,8 +6,8 @@
 
     Sent from GNU/Emacs
 
-    *** Sauvez un arbre, mangez un castor ***
+    @@@ Sauvez un arbre, mangez un castor @@@
-    ***     Save a tree, eat a beaver     ***
+    @@@     Save a tree, eat a beaver     @@@
   '';
 in {
   home.file.".signature" = {

users/phundrak/home.nix

@@ -1,21 +1,49 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }: {
   imports = [
     ./light-home.nix
     ./packages.nix
     ./email.nix
+    ./wlr-which-key
     ../modules
   ];
 
   config = let
-    emacsPkg = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
+    emacsPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
-      epkgs: [
+      epkgs:
-        epkgs.mu4e
+        with epkgs; [
-        epkgs.pdf-tools
+          mu4e
-      ]
+          pdf-tools
+          tree-sitter
+          tree-sitter-langs
+          (treesit-grammars.with-grammars (grammar:
+            with grammar; [
+              tree-sitter-bash
+              tree-sitter-c
+              tree-sitter-cpp
+              tree-sitter-css
+              tree-sitter-dockerfile
+              tree-sitter-http
+              tree-sitter-javascript
+              tree-sitter-jsdoc
+              tree-sitter-json
+              tree-sitter-just
+              tree-sitter-markdown
+              tree-sitter-markdown-inline
+              tree-sitter-nix
+              tree-sitter-rust
+              tree-sitter-sql
+              tree-sitter-toml
+              tree-sitter-typescript
+              tree-sitter-typst
+              tree-sitter-vue
+              tree-sitter-yaml
+            ]))
+        ]
     ));
     askpass = import ../modules/cli/scripts/askpass.nix {inherit pkgs;};
     launchWithEmacsclient = import ../modules/cli/scripts/launch-with-emacsclient.nix {
@@ -30,18 +58,34 @@
 
     home = {
       sessionVariables = {
-        EDITOR = "${emacsPkg}/bin/emacsclient -c -a ${emacsPkg}/bin/emacs";
+        EDITOR = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -a ${config.home.dev.editors.emacs.package}/bin/emacs";
         LAUNCH_EDITOR = "${launchWithEmacsclient}/bin/launch-with-emacsclient";
         SUDO_ASKPASS = "${askpass}/bin/askpass";
         LSP_USE_PLISTS = "true";
       };
-
       desktop.waybar.style = ./config/waybar/style.css;
-      dev.ai.claude.enable = true;
+      dev = {
+        ai.claude.enable = true;
+        editors.emacs.package = emacsPackage;
+        vcs.jj.signing.enable = true;
+      };
       fullDesktop = true;
-      shell.fish.enable = true;
+      file."${config.home.homeDirectory}/.ssh/allowed_signers" = {
+        enable = true;
+        text = lib.strings.join "\n" (
+          map (file: let
+            content = lib.strings.trim (builtins.readFile file);
+            parts = lib.strings.splitString " " content;
+            email = lib.lists.last parts;
+          in "${email} namespaces=\"git\" ${content}")
+          (lib.filesystem.listFilesRecursive ../../keys)
+        );
+      };
     };
 
-    manual.html.enable = true;
+    manual = {
+      html.enable = true;
+      manpages.enable = true;
+    };
   };
 }

users/phundrak/wlr-which-key/center-window.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}:
+pkgs.writeShellScriptBin "center-window" ''
+  pidof -x Hyprland && hyprctl dispatch centerwindow
+''

users/phundrak/wlr-which-key/close-window.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}:
+pkgs.writeShellScriptBin "close-window" ''
+  pidof -x Hyprland && hyprctl dispatch killactive
+''

users/phundrak/wlr-which-key/default.nix

@@ -0,0 +1,221 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  config.home.desktop.wlr-which-key.settings = {
+    font = "Cascadia Code 12";
+    background = "#3b4252d0";
+    color = "#eceff4";
+    border = "#2e3440";
+    border_width = 2;
+    corner_r = 10;
+    rows_per_column = 5;
+    column_padding = 25;
+    inhibit_compositor_keyboard_shortcuts = true;
+    auto_kbd_layout = true;
+    menu = let
+      left = "c";
+      down = "t";
+      up = "s";
+      right = "r";
+      center-window = import ./center-window.nix {inherit pkgs;};
+      close-window = import ./close-window.nix {inherit pkgs;};
+      float-window = import ./float-window.nix {inherit pkgs;};
+      focus-urgent = import ./focus-urgent.nix {inherit pkgs;};
+      fullscreen = import ./fullscreen.nix {inherit pkgs;};
+      ytplay = import ../../modules/cli/scripts/ytplay.nix {inherit pkgs;};
+    in [
+      {
+        key = "a";
+        desc = "Apps";
+        submenu = [
+          {
+            key = "b";
+            desc = "Browser";
+            cmd = "zen";
+          }
+          {
+            key = "B";
+            desc = "Qutebrowser";
+            cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
+          }
+          {
+            key = "d";
+            desc = "Discord";
+            cmd = "${pkgs.vesktop}/bin/vesktop";
+          }
+          {
+            key = "e";
+            desc = "Emacs";
+            cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
+          }
+          {
+            key = "g";
+            desc = "Gimp";
+            cmd = "${pkgs.gimp}/bin/gimp";
+          }
+          {
+            key = "n";
+            desc = "Nemo";
+            cmd = "${pkgs.nemo}/bin/nemo";
+          }
+          {
+            key = "N";
+            desc = "Nextcloud";
+            cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
+          }
+          {
+            key = "r";
+            desc = "Rofi";
+            submenu = [
+              {
+                key = "b";
+                desc = "Bluetooth";
+                cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
+              }
+              {
+                key = "e";
+                desc = "Emoji";
+                cmd = "rofi -show emoji";
+              }
+              {
+                key = "r";
+                desc = "App Menu";
+                cmd = "rofi -combi-modi drun,calc -show combi";
+              }
+              {
+                key = "s";
+                desc = "SSH";
+                cmd = "rofi -show ssh";
+              }
+              {
+                key = "y";
+                desc = "YouTube";
+                cmd = "${ytplay}/bin/ytplay";
+              }
+            ];
+          }
+        ];
+      }
+      {
+        key = "b";
+        desc = "Buffers";
+        submenu = [
+          {
+            key = "c";
+            desc = "Center";
+            cmd = "${center-window}/bin/center-window";
+          }
+          {
+            key = "d";
+            desc = "Close";
+            cmd = "${close-window}/bin/close-window";
+          }
+          {
+            key = "f";
+            desc = "Fullscreen";
+            cmd = "${fullscreen}/bin/fullscreen";
+          }
+          {
+            key = "F";
+            desc = "Float";
+            cmd = "${float-window}/bin/float-window";
+          }
+          {
+            key = "u";
+            desc = "Urgent";
+            cmd = "${focus-urgent}/bin/focus-urgent";
+          }
+          {
+            key = ".";
+            desc = "Resize";
+            submenu = [
+              {
+                key = left;
+                desc = "Decrease Width";
+                cmd = "echo decrease width";
+                keep-open = true;
+              }
+              {
+                key = down;
+                desc = "Increase Height";
+                cmd = "echo decrease height";
+                keep-open = true;
+              }
+              {
+                key = up;
+                desc = "Decrease Height";
+                cmd = "echo decrease height";
+                keep-open = true;
+              }
+              {
+                key = right;
+                desc = "Increase Width";
+                cmd = "echo increase width";
+                keep-open = true;
+              }
+            ];
+          }
+        ];
+      }
+      {
+        key = "p";
+        desc = "Power";
+        submenu = [
+          {
+            key = "s";
+            desc = "Suspend";
+            cmd = "systemctl suspend";
+          }
+          {
+            key = "r";
+            desc = "Reboot";
+            cmd = "systemctl reboot";
+          }
+          {
+            key = "o";
+            desc = "Poweroff";
+            cmd = "systemctl poweroff";
+          }
+        ];
+      }
+      {
+        key = "s";
+        desc = "Screenshots";
+        submenu = [
+          {
+            key = "Print";
+            desc = "Screenshot";
+            cmd = "screenshot";
+          }
+          {
+            key = "d";
+            desc = "Delayed";
+            cmd = "screenshot -d 3";
+          }
+          {
+            key = "D";
+            desc = "Select, Delay, Edit, and Copy";
+            cmd = "screenshot -secd 3";
+          }
+          {
+            key = "e";
+            desc = "Select, Edit, and Copy";
+            cmd = "screenshot -sec";
+          }
+          {
+            key = "g";
+            desc = "Select, Gimp, and Copy";
+            cmd = "screenshot -sgc";
+          }
+          {
+            key = "s";
+            desc = "Select and Copy";
+            cmd = "screenshot -sc";
+          }
+        ];
+      }
+    ];
+  };
+}

users/phundrak/wlr-which-key/float-window.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}:
+pkgs.writeShellScriptBin "float" ''
+  pidof -x Hyprland && hyprctl dispatch togglefloating
+  echo test
+''

users/phundrak/wlr-which-key/focus-urgent.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}:
+pkgs.writeShellScriptBin "focus-urgent" ''
+  pidof -x Hyprland && hyprctl dispatch focusurgentorlast
+''

users/phundrak/wlr-which-key/fullscreen.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}:
+pkgs.writeShellScriptBin "fullscreen" ''
+  pidof -x Hyprland && hyprctl dispatch fullscreen
+''