feat(caelestia): increase timeout from 5m to 1h

For better readability

flake.lock

@@ -398,15 +398,16 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1775400071,
-        "narHash": "sha256-uFoqOUB1wbqqDKRdHNEYdgyRQECYWhJBq4Oxjm3Dx9M=",
-        "ref": "refs/heads/develop",
-        "rev": "3da214ae4c14f57dc5f6ecd480330936f00e1a4f",
-        "revCount": 35,
+        "lastModified": 1776813492,
+        "narHash": "sha256-gydjnWdoZm++hK0B1vpXerwKJQdCeUcxrbBr9iEUTTA=",
+        "ref": "develop",
+        "rev": "9a6b94276b68263ad5b2ffebb64354b3bb4cc92a",
+        "revCount": 38,
         "type": "git",
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       },
       "original": {
+        "ref": "develop",
         "type": "git",
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       }

flake.nix

@@ -26,7 +26,7 @@
     };
 
     jj-cz = {
-      url = "git+https://labs.phundrak.com/phundrak/jj-cz";
+      url = "git+https://labs.phundrak.com/phundrak/jj-cz?ref=develop";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -63,14 +63,15 @@
 
   nixConfig = {
     extra-trusted-public-keys = [
-      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+      "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
       "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
     extra-substituters = [
-      "https://nix-community.cachix.org?priority=10"
-      "https://devenv.cachix.org?priority=20"
-      "https://phundrak.cachix.org?priority=30"
+      "http://marpa:5000?priority=5"
+      "https://phundrak.cachix.org?priority=10"
+      "https://nix-community.cachix.org?priority=20"
       "https://cache.nixos.org?priority=40"
     ];
     extra-experimental-features = [
@@ -127,7 +128,7 @@
             };
             "phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
               inherit extraSpecialArgs pkgs;
-              modules = withUserModules ./users/phundrak/host/marpa.nix;
+              modules = withUserModules ./users/phundrak/host/gampo.nix;
             };
             "phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
               inherit extraSpecialArgs pkgs;
@@ -165,7 +166,7 @@
             };
             marpa = nixpkgs.lib.nixosSystem {
               inherit specialArgs;
-              modules = withSystemModules ./hosts/marpa/configuration.nix;
+              modules = withSystemModules ./hosts/marpa;
             };
             NaroMk3 = nixpkgs.lib.nixosSystem {
               inherit specialArgs;

hosts/gampo/configuration.nix

@@ -41,6 +41,7 @@
       };
       sound.enable = true;
     };
+    i18n.input.enable = true;
     misc.keymap = "fr-bepo";
     networking = {
       hostname = "gampo";

hosts/marpa/default.nix

@@ -86,6 +86,7 @@
         scarlett.enable = true;
       };
     };
+    i18n.input.enable = true;
     misc.keymap = "fr-bepo";
     networking = {
       hostname = "marpa";
@@ -106,6 +107,10 @@
     programs.steam.enable = true;
     services = {
       fwupd.enable = true;
+      harmonia = {
+        enable = true;
+        signKeyPaths = [config.sops.secrets."marpa/nix-cache-priv-key".path];
+      };
       languagetool.enable = true;
       printing.enable = true;
       ssh.enable = true;
@@ -123,10 +128,13 @@
     };
   };
 
-  sops.secrets.extraHosts = {
-    inherit (config.users.users.root) group;
-    owner = config.users.users.phundrak.name;
-    mode = "0440";
+  sops.secrets = {
+    "marpa/nix-cache-priv-key" = {};
+    extraHosts = {
+      inherit (config.users.users.root) group;
+      owner = config.users.users.phundrak.name;
+      mode = "0440";
+    };
   };
 
   services.udev.extraHwdb = ''

secrets/secrets.yaml

@@ -6,6 +6,8 @@ elcafe:
     traefik:
         env: ENC[AES256_GCM,data:HUdWGYoEPp2v8dnDuVsl7YmPxuBfHmXzGrvKWeiqPlmAwMqVZrZ1j8on/7QKvYDJoTJ40XY2qNynSA==,iv:Vgc/fZERnNp7hSMeRd9EgB3IenKAFTAhwC0bk8CX4DE=,tag:SdfhOST/o29Lt1zRdXXRyQ==,type:str]
         dynamic: ENC[AES256_GCM,data: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,iv:3G3geSZRziwGiKcUMVNZ7j5s/4YA6Uk7wCSb4aFNSMo=,tag:FxARskR9+wdV7/xCKP8UdA==,type:str]
+marpa:
+    nix-cache-priv-key: ENC[AES256_GCM,data:H5VsN0nOogvgxWHXHF66BbzJe17zelZCG6mU4vmVJqBoi7a5cQxzU7WnV4k1EOpMJPDj6floVmrsG4DM86FthxcTwixCNDINmaemwAXQnUkgWXFKYY7Ovzten81UVKrtkN4n1S8=,iv:pxnHD5YqyTeNZnxyEJeXAUixZEz8Uq9b2HFZZBsMOzk=,tag:xI+4tFG+Q4Z5IVxlATayJA==,type:str]
 extraHosts: ENC[AES256_GCM,data:4lp7w0snYle7vGVLJq3zlTxoC8eVpaSreW3P8Aq+O6oRJoWo3IASpwi7zSx6nxmLo5LGPeupVXfy3xOkG9d5QFNU2uU6vXKvOnnm6wrpS+UcYp/4U/z+R3rFnFsI5PsCgmlL1bSUFCFkXlrLDIyoW50Q/DLXDS8QaUYAtto1DcRUXc9j8RnunYF38HFlAOD/Xa4DY048pvZu8TMsmLQjM5txZnZBq4+P8aBjY3SF+K9cqZ+SgQkU+gdGo0/S/N5OUZJ3ATJ6mglPl/Nplw/Dh9HvC7jEMJZKrVzWiYquTOn0/IytqOCS2SkhsmVMRqf06hpvhlz6sFXzkDfxKMIRTULEkjZDkZ7QioSbLeqmQePSg7xs28SvToiVKSpg0PxeH5LvJE73hgX3ATUXA2BmRvqQuqBwLaDU6TPm8xkYe7qbabaN5oFtXCI/XydZTao5Glqw/BZQRTise/qGgn3Bfl/ieMYQOqCMEdHzR0Beipur6spliGFC4YnwL3Nh4CO6qOB/j61a7rqY6nLyo54jWtjvHX42pTuGWhvhGH1z4NRZqcKks+KCMB4PcCXgul1hrb04wLXYVu7R/7QqOACp4SZBUFZCj+izcsnB1sKdKliL87VBUkwOSF+1JUCY,iv:5A3jCWLkooCkuOMiybbeQ9+TRA7CoiW3qbzmJLVarSc=,tag:qLsGhrFHs65Vesj4Ot4I/g==,type:str]
 mopidy:
     spotify: ENC[AES256_GCM,data:6i9BzQmlndnROuT1H2zgN/3I6hBiFf14BlcS+XL2PbTiiEQZe2yE3tnZo3KXU9S5CjS3MwxsVdytKOFMQt2s1bVjcibBhJzoKEQByaapdzn1mK3kQLdJfhPf4Hf9YZV9Dlc60ngS7ESLZakdFVlj4rlbV5XReLhK,iv:fYd78r4U0kTyq1TZjBVXkjdNiOQ29gLJ53kwTXsi8W0=,tag:oWaeOuzdHWS4joZAdeA2pg==,type:str]
@@ -105,7 +107,7 @@ sops:
             dUpXZis2N2VyN0ZFbjlPRXdwRFQ1aHMKm1Mk6MPKxFmwdATCYUANRSY5rHKgmQer
             LBlqqWKt1JiIUAYtazQeQ6KYxmjVlQPY7AZw2t+EhBEPrqbTL3vOiw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-07T17:19:05Z"
-    mac: ENC[AES256_GCM,data:hT4mPKLcIuAFmllJBYFXL5sGyMn95mYEv+eGVA+KQYm629YKSncgvn5g8elau/8HXR1O/bwQlkGmGr8VPeR/0KRb6TPCA4MrCwox38fy3ZLx2e0movVi/xIgKXIo5wYUq4Qm/pSo715limxGChxUxKtdEK/lmMkSnxyGmlkQtwM=,iv:XoOfhdK/CK6shUXhH4h14gtyqZqcqmTV6/R2jkynFr8=,tag:q3V0xcWQxjFi2drk5fLJoQ==,type:str]
+    lastmodified: "2026-05-01T13:20:34Z"
+    mac: ENC[AES256_GCM,data:OueL0eHYmFKWfSyCZxburRJ2FS1xkowx7ha/Zv7r++26D85GSHDeIL9HdfByI5a1OhH90rH3WLxZrJgT3FiwBw27HhhHtS7Fs6MBFvTuPmSA7ZtMeGMWBRVjwbGAWN17BZAhJzMlZHq2nPX0xXIKT0HuTLVRPLuVCSlvDzMXsTE=,iv:+JN4Vzs8o8PJAam/uKBbUXt3ArxC88D6xR7rMeeGglg=,tag:S+OtbxLhVKFnqBZtyKDGyA==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.11.0
+    version: 3.12.2

system/default.nix

@@ -47,16 +47,16 @@ in {
 
     nix.settings = {
       substituters = [
-        "https://nix-community.cachix.org?priority=10"
-        "https://devenv.cachix.org?priority=20"
-        "https://phundrak.cachix.org?priority=30"
+        "http://marpa:5000?priority=5"
+        "https://phundrak.cachix.org?priority=10"
+        "https://nix-community.cachix.org?priority=20"
         "https://cache.nixos.org?priority=40"
       ];
       trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+        "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
         "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       ];
       http-connections = 128;
       experimental-features = [

system/desktop/waydroid.nix

@@ -9,7 +9,10 @@ with lib; let
 in {
   options.mySystem.desktop.waydroid.enable = mkEnableOption "Enables Waydroid";
   config = mkIf cfg.enable {
-    virtualisation.waydroid.enable = cfg.enable;
+    virtualisation.waydroid = {
+      enable = cfg.enable;
+      package = pkgs.waydroid-nftables;
+    };
     environment.systemPackages = [pkgs.waydroid-helper];
   };
 }

system/i18n/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./input.nix
     ./locale.nix
   ];
 }

system/i18n/input.nix

@@ -0,0 +1,25 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.mySystem.i18n.input;
+in {
+  options.mySystem.i18n.input.enable = mkEnableOption "Enable i18n input with fcitx5";
+
+  config.i18n.inputMethod = mkIf cfg.enable {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-gtk
+      fcitx5-mozc-ut # Japanese input support
+      fcitx5-nord
+      fcitx5-table-other # X-SAMPA to IPA support
+      qt6Packages.fcitx5-chinese-addons # allow to load table addons
+      qt6Packages.fcitx5-configtool
+      qt6Packages.fcitx5-with-addons
+    ];
+  };
+}

system/services/default.nix

@@ -3,6 +3,7 @@
     ./calibre.nix
     ./endlessh.nix
     ./fwupd.nix
+    ./harmonia.nix
     ./jellyfin.nix
     ./languagetool.nix
     ./plex.nix

system/services/harmonia.nix

@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.mySystem.services.harmonia;
+in {
+  options.mySystem.services.harmonia = {
+    enable = mkEnableOption "Harmonia Nix binary cache server";
+    port = mkOption {
+      type = types.port;
+      default = 5000;
+      description = "Port to listen on";
+    };
+    priority = mkOption {
+      type = types.ints.between 0 100;
+      default = 50;
+      description = "Cache priority (lower = higher priority, 0-100)";
+    };
+    signKeyPaths = mkOption {
+      type = types.listOf types.path;
+      description = "Paths to the signing keys to use for signing the cache.";
+    };
+  };
+  config = mkIf cfg.enable {
+    services.harmonia.cache = {
+      enable = true;
+      inherit (cfg) signKeyPaths;
+      settings = {
+        inherit (cfg) priority;
+        bind = "[::]:${toString cfg.port}";
+      };
+    };
+  };
+}

users/modules/desktop/caelestia.nix

@@ -27,9 +27,10 @@ in {
           explorer = ["${pkgs.nemo-with-extensions}/bin/nemo"];
         };
         idle = {
+          inhibitWhenAudio = true;
           timeouts = [
             {
-              timeout = 300;
+              timeout = 3600;
               idleAction = "lock";
             }
           ];

users/modules/desktop/hyprland.nix

@@ -50,10 +50,13 @@ in {
       systemd.enable = false;
       importantPrefixes = ["$left" "$right" "$up" "$down" "$menu"];
       settings = {
+        env = [
+          "XMODIFIERS,@im=fcitx"
+          "XCURSOR_SIZE,12"
+        ];
         input = {
           kb_layout = "fr,us";
           kb_variant = "bepo_afnor,";
-          # kb_options = "caps:ctrl_modifier";
           numlock_by_default = true;
           follow_mouse = 1;
           touchpad.natural_scroll = false;
@@ -106,6 +109,8 @@ in {
             "pactl load-module module-switch-on-connect"
             "${pkgs.mpc}/bin/mpc stop"
             "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
+            "${pkgs.mozc}/lib/mozc/mozc_server"
+            "${pkgs.fcitx5}/bin/fcitx5 -d"
           ]
           ++ lib.lists.optional (! caelestiaEnabled) "${pkgs.networkmanagerapplet}/bin/nm-applet";
       };
@@ -170,8 +175,6 @@ in {
         bind = SUPER_SHIFT, minus, movetoworkspace, 8
         bind = SUPER_SHIFT, slash, movetoworkspace, 9
         bind = SUPER_SHIFT, asterisk, movetoworkspace, 10
-
-        env = XCURSOR_SIZE,12
       '';
     };
   };

users/modules/shell/tmux.nix

@@ -6,8 +6,42 @@
 }:
 with lib; let
   cfg = config.home.shell.tmux;
+  keyType = types.submodule {
+    options = {
+      key = mkOption {
+        type = types.str;
+        example = "C-b";
+      };
+      action = mkOption {
+        type = types.str;
+        example = "resize-pane -Z";
+      };
+    };
+  };
 in {
-  options.home.shell.tmux.enable = mkEnableOption "Enable tmux";
+  options.home.shell.tmux = with types; {
+    enable = mkEnableOption "Enable tmux";
+    bind = mkOption {
+      type = attrsOf (listOf keyType);
+      default = {};
+      example = {
+        "prefix" = [
+          {
+            key = "C-r";
+            action = "resize-pane -R";
+          }
+        ];
+      };
+    };
+    unbind = mkOption {
+      type = listOf (either str (attrsOf (listOf str)));
+      default = [];
+    };
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+    };
+  };
   config.programs.tmux = mkIf cfg.enable {
     inherit (cfg) enable;
     baseIndex = 1;
@@ -25,71 +59,23 @@ in {
       sensible
       yank
     ];
-    extraConfig = ''
-      set-option -sa terminal-overrides ",xterm*:Tc"
+    extraConfig = let
+      generateBinds = concatLines (
+        mapAttrsToList (table: keys: concatMapStrings (key: "bind -T ${table} ${key.key} ${key.action}\n") keys) cfg.bind
+      );
+      generateUnbind =
+        concatMapStrings (
+          entry:
+            if builtins.isString entry
+            then "unbind ${entry}\n"
+            else concatStrings (mapAttrsToList (table: keys: concatMapStrings (key: "unbind -T ${table} ${key}\n") keys) entry)
+        )
+        cfg.unbind;
+    in ''
+      ${cfg.extraConfig}
 
-      unbind C-b
-
-      bind-key -T prefix « select-window -p
-      bind-key -T prefix » select-window -n
-      bind-key -T prefix Tab switch-client -T windows
-      bind-key -T prefix w switch-client -T pane
-      bind-key -T prefix y switch-client -T copy-mode
-
-      bind-key -T pane / split-window -h -c "#{pane-current_path}"
-      bind-key -T pane - split-window -v -c "#{pane-current_path}"
-      bind-key -T pane c select-pane -L
-      bind-key -T pane t select-pane -D
-      bind-key -T pane s select-pane -U
-      bind-key -T pane r select-pane -R
-      bind-key -T pane f resize-pane -Z
-      bind-key -T pane . switch-client -T pane-resize
-
-      bind-key -T pane-resize c resize-pane -L 5\; switch-client -T pane-resize
-      bind-key -T pane-resize t resize-pane -D 5\; switch-client -T pane-resize
-      bind-key -T pane-resize s resize-pane -U 5\; switch-client -T pane-resize
-      bind-key -T pane-resize r resize-pane -R 5\; switch-client -T pane-resize
-      bind-key -T pane-resize C resize-pane -L\; switch-client -T pane-resize
-      bind-key -T pane-resize T resize-pane -D\; switch-client -T pane-resize
-      bind-key -T pane-resize S resize-pane -U\; switch-client -T pane-resize
-      bind-key -T pane-resize R resize-pane -R\; switch-client -T pane-resize
-
-      bind-key -T windows c new-window
-      bind-key -T windows n next-window
-      bind-key -T windows p previous-window
-
-      bind-key -T windows \" select-window -t :=1
-      bind-key -T windows « select-window -t :=2
-      bind-key -T windows » select-window -t :=3
-      bind-key -T windows ( select-window -t :=4
-      bind-key -T windows ) select-window -t :=5
-      bind-key -T windows @ select-window -t :=6
-      bind-key -T windows + select-window -t :=7
-      bind-key -T windows - select-window -t :=8
-      bind-key -T windows / select-window -t :=9
-      bind-key -T windows * select-window -t :=10
-
-      unbind -T copy-mode-vi H
-      unbind -T copy-mode-vi J
-      unbind -T copy-mode-vi K
-      unbind -T copy-mode-vi L
-      unbind -T copy-mode-vi h
-      unbind -T copy-mode-vi j
-      unbind -T copy-mode-vi k
-      unbind -T copy-mode-vi l
-
-      bind-key -T copy-mode-vi v send-keys -X begin-selection
-      bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
-      bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
-      bind-key -T copy-mode-vi C send-keys -X top-line
-      bind-key -T copy-mode-vi J send-keys -X jump-to-backward
-      bind-key -T copy-mode-vi S send-keys -X scroll-up
-      bind-key -T copy-mode-vi R send-keys -X bottom-line
-      bind-key -T copy-mode-vi T send-keys -X scroll-down
-      bind-key -T copy-mode-vi c send-keys -X cursor-left
-      bind-key -T copy-mode-vi t send-keys -X cursor-down
-      bind-key -T copy-mode-vi s send-keys -X cursor-up
-      bind-key -T copy-mode-vi r send-keys -X cursor-right
+      ${generateUnbind}
+      ${generateBinds}
     '';
   };
 }

users/phundrak/firefox.nix

@@ -0,0 +1,77 @@
+{
+  config.home.desktop.firefox = {
+    enable = true;
+    useZen = true;
+    tridactyl = {
+      enable = true;
+      preConfig = "sanitise tridactyllocal tridactylsync";
+      config = {
+        editorcmd = "emacsclient -c";
+        keyboardlayoutbase = "bepo";
+        keyboardlayoutforce = "true";
+        hintchars = "auiectsr";
+        smothscroll = "true";
+      };
+      extraConfig = ''
+        unbind h
+        unbind j
+        unbind k
+        unbind l
+        unbind c
+        unbind t
+        unbind s
+        unbind r
+        unbind H
+        unbind J
+        unbind K
+        unbind L
+        unbind C
+        unbind T
+        unbind S
+        unbind R
+
+        " === Bépo layout — scrolling (ctsr = hjkl) ===
+        bind c scrollpx -300 0
+        bind t scrollline 5
+        bind s scrollline -5
+        bind r scrollpx 300 0
+
+        " Half/full page scroll (replacing C-f/C-b/C-d/C-u)
+        bind <C-t> scrollpage 0.5
+        bind <C-s> scrollpage -0.5
+
+        " === History navigation (C/R = H/L) ===
+        bind C back
+        bind R forward
+
+        " === Tab navigation ===
+        bind T tabnext
+        bind S tabprev
+
+        " === Displaced commands ===
+        " reload was on r → move to h (bépo's 'replace' position)
+        bind h reload
+        bind H reloadhard
+
+        " tabopen was on t → move to j (bépo's 'find char to' position)
+        bind j fillcmdline tabopen
+
+        unbind ^http(s?)://youtube\.com f
+        unbind ^http(s?)://youtube\.com t
+        unbind ^http(s?)://youtube\.com l
+        unbind ^http(s?)://youtube\.com j
+        unbind ^http(s?)://twitch\.tv f
+
+        bind n findnext
+        bind N findnext -f
+        bind p findnext --reverse
+        bind P findnext -f --reverse
+
+        bind < urlincrement -1
+        bind > urlincrement 1
+        bind ypv js tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${document.location.href}"`)
+        bind ypm hint -JF e => tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${e.href}"`)
+      '';
+    };
+  };
+}

users/phundrak/home.nix

@@ -8,6 +8,8 @@
     ./light-home.nix
     ./packages.nix
     ./email.nix
+    ./firefox.nix
+    ./tmux.nix
     ./wlr-which-key
     ../modules
   ];
@@ -65,76 +67,6 @@
       };
       desktop = {
         caelestia.enable = true;
-        firefox = {
-          enable = true;
-          useZen = true;
-          tridactyl = {
-            enable = true;
-            preConfig = "sanitise tridactyllocal tridactylsync";
-            config = {
-              editorcmd = "emacsclient -c";
-              keyboardlayoutbase = "bepo";
-              keyboardlayoutforce = "true";
-              hintchars = "auiectsr";
-              smothscroll = "true";
-            };
-            extraConfig = ''
-              unbind h
-              unbind j
-              unbind k
-              unbind l
-              unbind c
-              unbind t
-              unbind s
-              unbind r
-              unbind H
-              unbind J
-              unbind K
-              unbind L
-              unbind C
-              unbind T
-              unbind S
-              unbind R
-
-              " === Bépo layout — scrolling (ctsr = hjkl) ===
-              bind c scrollpx -300 0
-              bind t scrollline 5
-              bind s scrollline -5
-              bind r scrollpx 300 0
-
-              " Half/full page scroll (replacing C-f/C-b/C-d/C-u)
-              bind <C-t> scrollpage 0.5
-              bind <C-s> scrollpage -0.5
-
-              " === History navigation (C/R = H/L) ===
-              bind C back
-              bind R forward
-
-              " === Tab navigation ===
-              bind T tabnext
-              bind S tabprev
-
-              " === Displaced commands ===
-              " reload was on r → move to h (bépo's 'replace' position)
-              bind h reload
-              bind H reloadhard
-
-              " tabopen was on t → move to j (bépo's 'find char to' position)
-              bind j fillcmdline tabopen
-
-              unbind ^http(s?)://youtube\.com f
-              unbind ^http(s?)://youtube\.com t
-              unbind ^http(s?)://youtube\.com l
-              unbind ^http(s?)://youtube\.com j
-              unbind ^http(s?)://twitch\.tv f
-
-              bind < urlincrement -1
-              bind > urlincrement 1
-              bind ypv js tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${document.location.href}"`)
-              bind ypm hint -JF e => tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${e.href}"`)
-            '';
-          };
-        };
         spotify = {
           enable = true;
           spicetify.enable = true;
@@ -157,16 +89,19 @@
         vcs.jj.signing.enable = true;
       };
       fullDesktop = 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)
-        );
+      file = {
+        ".XCompose".source = ./XCompose;
+        "${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)
+          );
+        };
       };
     };
 

users/phundrak/packages.nix

@@ -32,17 +32,16 @@ in {
     audacity
     plexamp
     plex-desktop
-    spicetify-cli
     pavucontrol # Volume control
 
     # Social
     vesktop # Discord alternative that works well with wayland
-    element-desktop
     signal-desktop
 
     # Misc
-    bitwarden-desktop
     # gplates
+    kicad-small
+    qgis
     handy
     libnotify
     nextcloud-client

users/phundrak/tmux.nix

@@ -0,0 +1,210 @@
+{
+  home.shell.tmux = {
+    enable = true;
+    extraConfig = "set-option -sa terminal-overrides \",xterm*:Tc\"";
+    unbind = [
+      "C-b"
+      {"copy-mode-vi" = ["H" "J" "K" "L" "h" "j" "k" "l"];}
+    ];
+    bind = {
+      prefix = [
+        {
+          key = "«";
+          action = "select-window -p";
+        }
+        {
+          key = "»";
+          action = "select-window -n";
+        }
+        {
+          key = "Tab";
+          action = "switch-client -T windows";
+        }
+        {
+          key = "w";
+          action = "switch-client -T pane";
+        }
+        {
+          key = "y";
+          action = "switch-client -T copy-mode";
+        }
+      ];
+      pane = [
+        {
+          key = "/";
+          action = "split-window -h -c \"#{pane-current_path}\"";
+        }
+        {
+          key = "-";
+          action = "split-window -v -c \"#{pane-current_path}\"";
+        }
+        {
+          key = "c";
+          action = "select-pane -L";
+        }
+        {
+          key = "t";
+          action = "select-pane -D";
+        }
+        {
+          key = "s";
+          action = "select-pane -U";
+        }
+        {
+          key = "r";
+          action = "select-pane -R";
+        }
+        {
+          key = "f";
+          action = "resize-pane -Z";
+        }
+        {
+          key = ".";
+          action = "switch-client -T pane-resize";
+        }
+      ];
+      "pane-resize" = [
+        {
+          key = "c";
+          action = "resize-pane -L 5\\; switch-client -T pane-resize";
+        }
+        {
+          key = "t";
+          action = "resize-pane -D 5\\; switch-client -T pane-resize";
+        }
+        {
+          key = "s";
+          action = "resize-pane -U 5\\; switch-client -T pane-resize";
+        }
+        {
+          key = "r";
+          action = "resize-pane -R 5\\; switch-client -T pane-resize";
+        }
+        {
+          key = "C";
+          action = "resize-pane -L\\; switch-client -T pane-resize";
+        }
+        {
+          key = "T";
+          action = "resize-pane -D\\; switch-client -T pane-resize";
+        }
+        {
+          key = "S";
+          action = "resize-pane -U\\; switch-client -T pane-resize";
+        }
+        {
+          key = "R";
+          action = "resize-pane -R\\; switch-client -T pane-resize";
+        }
+      ];
+      windows = [
+        {
+          key = "c";
+          action = "new-window";
+        }
+        {
+          key = "n";
+          action = "next-window";
+        }
+        {
+          key = "p";
+          action = "previous-window";
+        }
+        {
+          key = "r";
+          action = "command-prompt \"rename-window '%%'\"";
+        }
+        {
+          key = "\\\"";
+          action = "select-window -t :=1";
+        }
+        {
+          key = "«";
+          action = "select-window -t :=2";
+        }
+        {
+          key = "»";
+          action = "select-window -t :=3";
+        }
+        {
+          key = "(";
+          action = "select-window -t :=4";
+        }
+        {
+          key = ")";
+          action = "select-window -t :=5";
+        }
+        {
+          key = "@";
+          action = "select-window -t :=6";
+        }
+        {
+          key = "+";
+          action = "select-window -t :=7";
+        }
+        {
+          key = "-";
+          action = "select-window -t :=8";
+        }
+        {
+          key = "/";
+          action = "select-window -t :=9";
+        }
+        {
+          key = "*";
+          action = "select-window -t :=10";
+        }
+      ];
+      "copy-mode-vi" = [
+        {
+          key = "v";
+          action = "send-keys -X begin-selection";
+        }
+        {
+          key = "C-v";
+          action = "send-keys -X rectangle-toggle";
+        }
+        {
+          key = "y";
+          action = "send-keys -X copy-selection-and-cancel";
+        }
+        {
+          key = "C";
+          action = "send-keys -X top-line";
+        }
+        {
+          key = "J";
+          action = "send-keys -X jump-to-backward";
+        }
+        {
+          key = "S";
+          action = "send-keys -X scroll-up";
+        }
+        {
+          key = "R";
+          action = "send-keys -X bottom-line";
+        }
+        {
+          key = "T";
+          action = "send-keys -X scroll-down";
+        }
+        {
+          key = "c";
+          action = "send-keys -X cursor-left";
+        }
+        {
+          key = "t";
+          action = "send-keys -X cursor-down";
+        }
+        {
+          key = "s";
+          action = "send-keys -X cursor-up";
+        }
+        {
+          key = "r";
+          action = "send-keys -X cursor-right";
+        }
+      ];
+    };
+  };
+}