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

feat(packages): add KiCad to phundrak packages
refactor(firefox): move phundrak firefox config to separate file
2026-05-06 23:50:55 +02:00 · 2026-05-06 23:50:19 +02:00 · 2026-05-06 23:49:40 +02:00 · 2026-05-06 23:49:23 +02:00 · 2026-05-06 23:49:23 +02:00 · 2026-05-03 15:37:16 +02:00
32 changed files with 2740 additions and 1314 deletions
--- a/.envrc
+++ b/.envrc
@@ -1,11 +1,7 @@
 # -*- mode: sh; -*-
-if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
-fi
-
 watch_file flake.nix
 watch_file flake.lock
 if ! use flake . --no-pure-eval
 then
-  echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
+  echo "dev shell could not be built. The environment was not loaded. Make the necessary changes to flake.nix and hit enter to try again." >&2
 fi
--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@@ -3,11 +3,7 @@

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-
-    devenv = {
-      url = "github:cachix/devenv";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    flake-utils.url = "github:numtide/flake-utils";

    home-manager = {
      url = "github:nix-community/home-manager";
@@ -30,7 +26,12 @@
    };

    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";
+    };
+
+    opencode = {
+      url = "github:anomalyco/opencode/v1.3.15";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@@ -62,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 = [
@@ -82,119 +84,105 @@
  outputs = {
    self,
    nixpkgs,
+    flake-utils,
    home-manager,
-    devenv,
    srvos,
    ...
-  } @ inputs: let
-    inherit (self) outputs;
-    system = "x86_64-linux";
-    pkgs = nixpkgs.legacyPackages.${system};
-  in {
-    formatter.${system} = pkgs.alejandra;
+  } @ inputs:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        inherit (self) outputs;
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+        formatter = pkgs.alejandra;
+        devShells.default = pkgs.mkShell {
+          buildInputs = [
+            pkgs.nh
+            pkgs.jujutsu
+            pkgs.git
+          ];
+        };

-    packages.${system} = {
-      devenv-up = self.devShells.${system}.default.config.procfileScript;
-      devenv-test = self.devShells.${system}.default.config.test;
-    };
-
-    devShells.${system}.default = devenv.lib.mkShell {
-      inherit inputs pkgs;
-      modules = [
-        (
-          {pkgs, ...}: {
-            packages = [pkgs.nh];
-            git-hooks.hooks = {
-              alejandra.enable = true;
-              commitizen.enable = true;
-              detect-private-keys.enable = true;
-              end-of-file-fixer.enable = true;
-              deadnix.enable = true;
-              ripsecrets.enable = true;
-              statix.enable = true;
+        packages = {
+          homeConfigurations = let
+            extraSpecialArgs = {inherit inputs outputs system;};
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+            defaultUserModules = [
+              inputs.sops-nix.homeManagerModules.sops
+              inputs.spicetify.homeManagerModules.default
+              inputs.caelestia-shell.homeManagerModules.default
+            ];
+            withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]);
+          in {
+            "phundrak@alys" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/alys.nix;
            };
-          }
-        )
-      ];
-    };
+            "creug@elcafe" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/creug/host/elcafe.nix;
+            };
+            "phundrak@elcafe" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/elcafe.nix;
+            };
+            "phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/gampo.nix;
+            };
+            "phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/marpa.nix;
+            };
+            "phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/naromk3.nix;
+            };
+            "phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
+              inherit extraSpecialArgs pkgs;
+              modules = withUserModules ./users/phundrak/host/tilo.nix;
+            };
+          };

-    homeConfigurations = let
-      extraSpecialArgs = {inherit inputs outputs system;};
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      defaultUserModules = [
-        inputs.sops-nix.homeManagerModules.sops
-        inputs.spicetify.homeManagerModules.default
-        inputs.caelestia-shell.homeManagerModules.default
-      ];
-      withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]);
-    in {
-      "phundrak@alys" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/alys.nix;
-      };
-      "creug@elcafe" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/creug/host/elcafe.nix;
-      };
-      "phundrak@elcafe" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/elcafe.nix;
-      };
-      "phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/marpa.nix;
-      };
-      "phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/marpa.nix;
-      };
-      "phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/naromk3.nix;
-      };
-      "phundrak@tilo" = home-manager.lib.homeManagerConfiguration {
-        inherit extraSpecialArgs pkgs;
-        modules = withUserModules ./users/phundrak/host/tilo.nix;
-      };
-    };
-
-    nixosConfigurations = let
-      specialArgs = {inherit inputs outputs;};
-      defaultSystemModules = [
-        inputs.sops-nix.nixosModules.sops
-        inputs.copyparty.nixosModules.default
-      ];
-      withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
-    in {
-      alys = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules ./hosts/alys/configuration.nix;
-      };
-      elcafe = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules ./hosts/elcafe/configuration.nix;
-      };
-      gampo = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules ./hosts/gampo/configuration.nix;
-      };
-      marpa = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules ./hosts/marpa/configuration.nix;
-      };
-      NaroMk3 = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules [
-          srvos.nixosModules.server
-          srvos.nixosModules.hardware-hetzner-cloud
-          srvos.nixosModules.mixins-terminfo
-          ./hosts/naromk3/configuration.nix
-        ];
-      };
-      tilo = nixpkgs.lib.nixosSystem {
-        inherit specialArgs;
-        modules = withSystemModules ./hosts/tilo/configuration.nix;
-      };
-    };
-  };
+          nixosConfigurations = let
+            specialArgs = {inherit inputs outputs;};
+            defaultSystemModules = [
+              inputs.sops-nix.nixosModules.sops
+              inputs.copyparty.nixosModules.default
+            ];
+            withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
+          in {
+            alys = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules ./hosts/alys/configuration.nix;
+            };
+            elcafe = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules ./hosts/elcafe/configuration.nix;
+            };
+            gampo = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules ./hosts/gampo/configuration.nix;
+            };
+            marpa = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules ./hosts/marpa;
+            };
+            NaroMk3 = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules [
+                srvos.nixosModules.server
+                srvos.nixosModules.hardware-hetzner-cloud
+                srvos.nixosModules.mixins-terminfo
+                ./hosts/naromk3/configuration.nix
+              ];
+            };
+            tilo = nixpkgs.lib.nixosSystem {
+              inherit specialArgs;
+              modules = withSystemModules ./hosts/tilo/configuration.nix;
+            };
+          };
+        };
+      }
+    );
 }
--- a/hosts/elcafe/configuration.nix
+++ b/hosts/elcafe/configuration.nix
@@ -12,14 +12,14 @@
  sops.secrets = {
    "elcafe/traefik/env".restartUnits = ["traefik.service"];
    "elcafe/traefik/dynamic".restartUnits = ["traefik.service"];
-    "elcafe/copyparty/passwords/creug" = {
-      restartUnits = ["copyparty.service"];
-      owner = "creug";
-    };
-    "elcafe/copyparty/passwords/phundrak" = {
-      restartUnits = ["copyparty.service"];
-      owner = "phundrak";
-    };
+    # "elcafe/copyparty/passwords/creug" = {
+    #   restartUnits = ["copyparty.service"];
+    #   owner = "creug";
+    # };
+    # "elcafe/copyparty/passwords/phundrak" = {
+    #   restartUnits = ["copyparty.service"];
+    #   owner = "phundrak";
+    # };
  };

  mySystem = {
@@ -73,12 +73,12 @@
    };
  };

-  services.copyparty = import ./copyparty.nix {
-    passwordFiles = {
-      creug = config.sops.secrets."elcafe/copyparty/passwords/creug".path;
-      phundrak = config.sops.secrets."elcafe/copyparty/passwords/phundrak".path;
-    };
-  };
+  # services.copyparty = import ./copyparty.nix {
+  #   passwordFiles = {
+  #     creug = config.sops.secrets."elcafe/copyparty/passwords/creug".path;
+  #     phundrak = config.sops.secrets."elcafe/copyparty/passwords/phundrak".path;
+  #   };
+  # };

  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
--- a/hosts/gampo/configuration.nix
+++ b/hosts/gampo/configuration.nix
@@ -41,6 +41,7 @@
      };
      sound.enable = true;
    };
+    i18n.input.enable = true;
    misc.keymap = "fr-bepo";
    networking = {
      hostname = "gampo";
--- a/hosts/marpa/configuration.nix
+++ b/hosts/marpa/configuration.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 = ''
--- a/secrets/secrets.yaml
+++ b/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:BKsjTfqpZhrocHOUfxjCNS61DVb1oSdPW99IrwmNjpFcs68WvyfD0+QZ9F362L88CQDTnDSXWAbc7mcBtxhqfhkjtsdxkhtLHMGG0WxlnYungTnROh9EDJRLNyjy/RCYWOIVOXIEUE5lLwnQkboZLEiruw1Ri+r27WYmGpD5DaR4XWDankb6BQPJA6f2ziPyynjNYZaRhMIQUDFLM3QRAXPYD00eaYIQtx253z8Uocz4LpOw2JReAQkI2zc+6Oe1O4fP/Cg8klF0owR6NkNUWoIUVwLqFmU7Yr45VO+T/f96Ev0hlDaMklxYJGNOS8kRbSqpaiuMCmL2mQ6rsZGFVfdMdImSL2j51lrPFJCsg/hNGXHAxQ0/OpHtcZz/cwn5nSHBXg6gX21kOpkWGY1+BRA15X0k5sUqXkZWjkP9wkSCV6pQTbr8a3GrX2VvGwguAC4EpTCkCobXw/d9a7bMfZFeJqFhwjpU/dfBi6OjF7bniOQ7k3+5RZRDqAxJiPaBk7NKVN1FzUCvFBjKifbfICOJaPJr1CmayNuBZtsSlj0MXBYx8D8oShzhsCo/+pyni4poMYyfNC9jQKWCBsjKEa6eWb1+TfOHv4W+lSlBFg3vGm4NDxCPnACKWlhKB4WoJGRHqnp809XF2fqP4lZN8S7+sB2rhNlr2CICk9oM80FNmW/8TTtIgbpfEeFeJwNTM+S95cFSqaIRg3kfcqB/bHG37BYthcL1SC85/lxhL2LJ/O0qXxbioyxVAaBIumAO8BB1qrdbOozHZZAU1IIKylDWMWUoJMyMdhMGnOxxxWcbV2jPUXUv03DYNp3G/5F2Hlr+h0bPIJEFZ2kb14wTK+25MsgfBgky26f8qjNwROqKA+bPeB2yUKSSCJb//PzzE4xyqu1mq2/1zTal0eSRTCEnAUCj0wDqCLBMO6GnL0PS4PtGJ9n/IbOjFXZeixWGJzUTcmxPAmsClH6FV8brEMVs5bfrjLieXQvcn0b8b9/1W2jV4dJGUE1TxUQ2B92VG7PrA39O/FO8tQJZrAMXO9iMv495w0Nxbt0HYN6wsFTUwlQ+3DCXxgmmVBqVSf1OtHuhxcznl1oR+sgPSgBRLVB22mv5677ErQGCWp1luyPSF6xvhIaKe9BDwxBwJ+RsqSn4w5t1qJM9uYqFunSJPY5439B4zWG+lUy1ZDNn1oHUaX3hZUhzc9tEm+0CWFNXxH2hiRFb2nYP6Pv/GNqjZCsflY0YYty0UJBqRELGpUO3Sd+zbyJmWtvDjto726/0jHB/jb0RVThUem0PzWmmIUth0ucKp0M7zqEWNyVPbvWOK6rWQW9eaW87bFeMhrD1PC+U0ilq9DKG1J3ldc0lEBrguc4fk72T3I62pw5KdGnsmB+FjAc8kdTFKhM52ylChsAnJGFu0LyBUgjGIzZ03XkO8RbYs/wzc9VQOvyikvB67wImXMu8PJDzMxXnu58y7C4U86kvLdUfYm5bz+MxZmXsDA1L7C4si6oLf7rOCfLLc4A1a/X/aMSk330SARW/UAZ/NaFDXhotYXZUSbr41Z6b0qRPZjjZfOkdeKxTp+r07+8oJpPOaIaaOIlNRkGyRCnbCGvJ4CuUfTQuywIefBHlawGzhsDvOKorWYTuim7MbJcd19bYMG6k8qqTQlNeHjZJaDLKJ/rnSAIGDSNYRP4uUUo0gqSp82E9bXUUn5VuFSPcJ55uvFXZD0f6tLZGIyUuG5tqw3xNQF2cA+4ZXzbxi6VIZQ+ahZELkoBR+dVXQ0yGkDJusNf61A1lfI2bd7JQnJ7YVhbF1gXNnDXdWO0F8zsnZyhSSJY3ZoXLdYn+v39+AxQvE3mpX7zNsk7+0WUHuqAh6JG6OBt7jF5OVwD3bfuQfDhPlfD7YOU5/C+rekDGXmfZOMXxadvQgWFcpHdgbV7NwKqdgj6pJDVoGO8/4HGtlb94/o6dtXzfheSLUhCUZ2Im81yduu8386fCYLHX/ZsP+CuuC2wlXQaSCgoODRXXDz7jsRcQNfW2ohmFT9iDn95NI5ylCgt49t2Cr06ft7Pd0tWjh69VQ8TjNlfqm3Sxlf/Gb9ihwOOytmbDv4bNKhpRIPC0jIZv3aaA7vgdLCbySVeMo1tfMx3Xvf6q8XqlsQ/HgwBxAMmjakIAukNwtU74oJ2AYpIO/Oc47081JR2sVtGWer6l7C8KMy9O0xYtABsofkc9kHQWtAvn82sSQTuI/UgD5ttfdfVZZaanHek3vgJyTYI3sPQDVJ6SXrC0a+fqMlTL7Jux/0B70gK1z46j5C54IBCChNa4CwXhvxofyoDgyF6DVC2qZxoKXGl1veQKJh68q9hCiDlYEpiwuRCs3j6uSUG4Rssc9TKfdY3AQltVrhykEORVEgZe1HWmlms=,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
--- a/system/boot/boot.nix
+++ b/system/boot/boot.nix
@@ -73,10 +73,7 @@ in {
    };
    supportedFilesystems = mkIf cfg.zfs.enable ["zfs"];
    zfs.extraPools = mkIf cfg.zfs.enable cfg.zfs.pools;
-    kernelPackages =
-      if cfg.kernel.hardened
-      then pkgs.linuxPackages_hardened
-      else cfg.kernel.package;
+    kernelPackages = cfg.kernel.package;
    kernelModules =
      cfg.kernel.modules
      ++ ["kvm-${cfg.kernel.cpuVendor}"]
--- a/system/default.nix
+++ b/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 = [
--- a/system/desktop/waydroid.nix
+++ b/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];
  };
 }
--- a/system/i18n/default.nix
+++ b/system/i18n/default.nix
@@ -1,5 +1,6 @@
 {
  imports = [
+    ./input.nix
    ./locale.nix
  ];
 }
--- a/system/i18n/input.nix
+++ b/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
+    ];
+  };
+}
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -3,6 +3,7 @@
    ./calibre.nix
    ./endlessh.nix
    ./fwupd.nix
+    ./harmonia.nix
    ./jellyfin.nix
    ./languagetool.nix
    ./plex.nix
--- a/system/services/harmonia.nix
+++ b/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}";
+      };
+    };
+  };
+}
--- a/users/creug/home.nix
+++ b/users/creug/home.nix
@@ -34,7 +34,16 @@ in {
      creug.sshKey.file = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";

      dev.vcs = {
-        jj.enable = false;
+        name = "Creug";
+        email = "gregory.foulachon@gmail.com";
+        editor = "${pkgs.nano}/bin/nano";
+        jj = {
+          enable = true;
+          cz = {
+            enable = true;
+            alias = true;
+          };
+        };
        git.enable = true;
        publicKey = cfg.sshKey;
      };
--- a/users/modules/desktop/caelestia.nix
+++ b/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";
            }
          ];
--- a/users/modules/desktop/default.nix
+++ b/users/modules/desktop/default.nix
@@ -9,6 +9,7 @@ in {
  imports = [
    ./caelestia.nix
    ./eww.nix
+    ./firefox.nix
    ./hyprland.nix
    ./kdeconnect.nix
    ./kitty.nix
@@ -18,6 +19,7 @@ in {
    ./swaync.nix
    ./theme.nix
    ./waybar.nix
+    ./wl-kbptr.nix
    ./wlr-which-key.nix
    ./wlsunset.nix
  ];
@@ -25,6 +27,7 @@ in {
  options.home.desktop.fullDesktop = mkEnableOption "Enable options for graphical environments";
  config.home.desktop = {
    eww.enable = mkDefault cfg.fullDesktop;
+    firefox.enable = mkDefault cfg.fullDesktop;
    hyprland.enable = mkDefault cfg.fullDesktop;
    kdeconnect.enable = mkDefault cfg.fullDesktop;
    kitty.enable = mkDefault cfg.fullDesktop;
--- a/users/modules/desktop/firefox.nix
+++ b/users/modules/desktop/firefox.nix
@@ -0,0 +1,70 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.home.desktop.firefox;
+  inherit (pkgs.stdenv.hostPlatform) system;
+  zen = inputs.zen-browser.packages.${system}.default;
+  settingsToLines = settings:
+    concatStringsSep "\n" (mapAttrsToList (name: value: "set ${name} ${toString value}") settings);
+in {
+  options.home.desktop.firefox = {
+    enable = mkEnableOption "enable Firefox";
+    useZen = mkEnableOption "use Zen instead of Firefox";
+    tridactyl = {
+      enable = mkEnableOption "enable Tridactyl";
+      preConfig = mkOption {
+        description = "Lines to add to the beginning of tridactylrc";
+        type = types.lines;
+        default = "";
+      };
+      config = mkOption {
+        type = with types;
+          attrsOf (oneOf [
+            int
+            str
+            bool
+          ]);
+        description = "Tridactyl settings (converted to 'set key value' lines)";
+        default = {};
+        example = {
+          smoothscroll = true;
+          history = 1000;
+        };
+      };
+      extraConfig = mkOption {
+        description = "Extra lines to add to tridactylrc (for bindings, autocmds, etc)";
+        type = types.lines;
+        default = "";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.firefox = {
+      inherit (cfg) enable;
+      package =
+        if cfg.useZen
+        then zen
+        else pkgs.firefox;
+      nativeMessagingHosts = lists.optional cfg.tridactyl.enable pkgs.tridactyl-native;
+    };
+    xdg.configFile."tridactyl/tridactylrc" = mkIf cfg.tridactyl.enable {
+      text = concatStringsSep "\n" (filter (s: s != "") [
+        cfg.tridactyl.preConfig
+        (settingsToLines (cfg.tridactyl.config
+          // {
+            browser =
+              if cfg.useZen
+              then "zen"
+              else "firefox";
+          }))
+        cfg.tridactyl.extraConfig
+      ]);
+    };
+  };
+}
--- a/users/modules/desktop/hyprland.nix
+++ b/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
      '';
    };
  };
--- a/users/modules/desktop/theme.nix
+++ b/users/modules/desktop/theme.nix
@@ -20,6 +20,7 @@ in {
        package = pkgs.nordic;
        name = "Nordic";
      };
+      gtk4.theme = config.gtk.theme;
    };
    home.pointerCursor = {
      enable = true;
--- a/users/modules/desktop/wl-kbptr.nix
+++ b/users/modules/desktop/wl-kbptr.nix
@@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  configDir = config.xdg.configHome;
+  cfg = config.home.desktop.wl-kbptr;
+  iniFormat = pkgs.formats.ini {};
+in {
+  options.home.desktop.wl-kbptr = {
+    enable = mkEnableOption "enable wl-kbptr";
+    config = mkOption {
+      inherit (iniFormat) type;
+      default = {};
+      description = ''
+        Options to add to the {file}`config` file. See
+        <https://github.com/moverest/wl-kbptr/blob/main/config.example>
+        for options.
+      '';
+      example = {
+        general = {
+          home_row_keys = "abcd";
+        };
+      };
+    };
+  };
+  config = mkIf cfg.enable {
+    home = {
+      packages = [pkgs.wl-kbptr];
+      file."${configDir}/wl-kbptr/config" = mkIf (cfg.config != {}) {
+        source = iniFormat.generate "wl-kbptr-config" cfg.config;
+      };
+    };
+  };
+}
--- a/users/modules/dev/ai/claude.nix
+++ b/users/modules/dev/ai/claude.nix
@@ -6,16 +6,23 @@
 }:
 with lib; let
  cfg = config.home.dev.ai.claude;
+  jsonFormat = pkgs.formats.json {};
 in {
-  options.home.dev.ai.claude.enable = mkEnableOption "Enables Claude-related packages";
+  options.home.dev.ai.claude = {
+    enable = mkEnableOption "Enables Claude-related packages";
+    mcpServers = mkOption {
+      inherit (jsonFormat) type;
+      default = {};
+    };
+  };
  config = mkIf cfg.enable {
    home.packages = let
      claude-jj = pkgs.writeShellScriptBin "claude-jj" ''
-        ${pkgs.claude-code}/bin/claude --append-system-prompt 'CRITICAL: This repository uses Jujutsu (jj), NOT git. Never use git commands. Use jj equivalents. See CLAUDE.md.' "$@"
+        ${pkgs.claude-code}/bin/claude --append-system-prompt 'CRITICAL: This repository uses Jujutsu (jj), NOT git. Never use git commands. Use jj equivalents.' "$@"
      '';
-    in [claude-jj];
+    in [claude-jj pkgs.sox];
    programs.claude-code = {
-      inherit (cfg) enable;
+      inherit (cfg) enable mcpServers;
    };
  };
 }
--- a/users/modules/dev/ai/default.nix
+++ b/users/modules/dev/ai/default.nix
@@ -2,22 +2,42 @@
  config,
  lib,
  pkgs,
+  inputs,
  ...
 }:
 with lib; let
  cfg = config.home.dev.ai;
+  jsonFormat = pkgs.formats.json {};
 in {
  imports = [
    ./claude.nix
    ./ollama.nix
  ];

-  options.home.dev.ai.enable = mkEnableOption "Enables AI features";
-  config.home = mkIf cfg.enable {
-    dev.ai = {
-      claude.enable = mkDefault cfg.enable;
-      ollama.enable = mkDefault cfg.enable;
+  options.home.dev.ai = {
+    enable = mkEnableOption "Enables AI features";
+    mcpServers = mkOption {
+      inherit (jsonFormat) type;
+      default = {};
+    };
+  };
+  config = {
+    home = mkIf cfg.enable {
+      dev.ai = {
+        claude = {
+          enable = mkDefault cfg.enable;
+          mcpServers = mkDefault cfg.mcpServers;
+        };
+        ollama.enable = mkDefault cfg.enable;
+      };
+      packages = let
+        inherit (pkgs.stdenv.hostPlatform) system;
+        inherit (inputs.opencode.packages.${system}) opencode;
+      in [pkgs.lmstudio opencode];
+    };
+    programs.mcp = mkIf (cfg.mcpServers != {}) {
+      enable = true;
+      servers = cfg.mcpServers;
    };
-    packages = [pkgs.lmstudio];
  };
 }
--- a/users/modules/dev/vcs/git.nix
+++ b/users/modules/dev/vcs/git.nix
@@ -127,6 +127,14 @@ in {

        "dist/"
      ];
+      signing = {
+        format =
+          if cfg.publicKeyFile != null
+          then "ssh"
+          else "openpgp";
+        key = cfg.publicKeyFile;
+        signByDefault = true;
+      };
      settings = {
        user = {
          inherit (cfg) name email;
@@ -151,8 +159,6 @@ in {
          renames = "copy";
          interHunkContext = 10;
        };
-        commit.gpgsign = cfg.publicKeyFile != null;
-        gpg.format = "ssh";
        gpg.ssh.allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
        init.defaultBranch = "main";
        pull.rebase = true;
@@ -168,7 +174,6 @@ in {
          updateRefs = true;
        };
        help.autocorrect = "prompt";
-        user.signingkey = mkIf (cfg.publicKeyFile != null) cfg.publicKeyFile;
        web.browser = mkIf (cfg.browser != null) cfg.browser;
        sendemail = mkIf cfg.sendmail.enable {
          smtpserver = cfg.sendmail.server;
--- a/users/modules/shell/tmux.nix
+++ b/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}
    '';
  };
 }
--- a/users/modules/shell/zellij.nix
+++ b/users/modules/shell/zellij.nix
@@ -7,33 +7,6 @@
 with lib; let
  cfg = config.home.shell.zellij;
  isEmpty = list: list == [];
-  plugin = {
-    options = {
-      name = mkOption {
-        type = types.str;
-        example = "filepicket";
-      };
-      location = mkOption {
-        type = types.nullOr types.str;
-        example = "zellij:strider";
-        description = ''
-          When null, defaults to zellij:`name`
-        '';
-      };
-      config = mkOption {
-        type = types.nullOr types.attrs;
-        default = null;
-      };
-    };
-  };
-  pluginToLines = plugin: let
-    location =
-      if plugin ? location
-      then plugin.location
-      else "location=\"${plugin.name}\"";
-  in ''
-    ${plugin.name} ${location}
-  '';
  keybind = {
    options = {
      bind = mkOption {
@@ -126,15 +99,17 @@ with lib; let
      keybinds = values;
    };
 in {
-  options.home.shell.zellij = {
+  options.home.shell.zellij = let
+    jsonFormat = pkgs.formats.yaml {};
+  in {
    enable = mkEnableOption "Enable Zellij";
    clearDefaultKeybinds = mkEnableOption "Clear default keybinds";
    settings = mkOption {
-      type = (pkgs.formats.yaml {}).type;
+      inherit (jsonFormat) type;
      default = {};
    };
    layouts = mkOption {
-      type = (pkgs.formats.yaml {}).type;
+      inherit (jsonFormat) type;
      default = {};
    };
    extraSettings = mkOption {
--- a/users/phundrak/XCompose
+++ b/users/phundrak/XCompose
--- a/users/phundrak/firefox.nix
+++ b/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}"`)
+      '';
+    };
+  };
+}
--- a/users/phundrak/home.nix
+++ b/users/phundrak/home.nix
@@ -8,6 +8,8 @@
    ./light-home.nix
    ./packages.nix
    ./email.nix
+    ./firefox.nix
+    ./tmux.nix
    ./wlr-which-key
    ../modules
  ];
@@ -69,6 +71,17 @@
          enable = true;
          spicetify.enable = true;
        };
+        wl-kbptr = {
+          enable = true;
+          config = {
+            general = {
+              # first eight chars to select areas, last three chars
+              # for left, right, middle click
+              home_row_keys = "auiectsrtsr";
+              modes = "tile,bisect";
+            };
+          };
+        };
      };
      dev = {
        ai.claude.enable = true;
@@ -76,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)
+          );
+        };
      };
    };

--- a/users/phundrak/packages.nix
+++ b/users/phundrak/packages.nix
@@ -9,7 +9,6 @@ with lib; let
  handy = pkgs.callPackage ../../packages/handy.nix {};
  inkdrop = pkgs.callPackage ../../packages/inkdrop.nix {};
  pumo-system-info = inputs.pumo-system-info.packages.${system}.default;
-  zen = inputs.zen-browser.packages.${system}.default;
 in {
  programs.bun.enable = true;
  home.packages = with pkgs; [
@@ -33,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
@@ -52,7 +50,6 @@ in {
    scrcpy
    syncthing
    watchmate
-    zen

    # Games
    atlauncher
--- a/users/phundrak/tmux.nix
+++ b/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";
+        }
+      ];
+    };
+  };
+}
--- a/users/phundrak/wlr-which-key/default.nix
+++ b/users/phundrak/wlr-which-key/default.nix
@@ -1,6 +1,7 @@
 {
  config,
  pkgs,
+  lib,
  ...
 }: {
  config.home.desktop.wlr-which-key.settings = {
@@ -27,217 +28,223 @@
      logout = import ./logout.nix {inherit pkgs;};
      ytplay = import ../../modules/cli/scripts/ytplay.nix {inherit pkgs;};
      plock = import ../../modules/cli/scripts/plock.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 = "h";
-            desc = "Handy";
-            cmd = "pkill -USR2 -n handy";
-          }
-          {
-            key = "n";
-            desc = "Nemo";
-            cmd = "${pkgs.nemo-with-extensions}/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 = "c";
-                desc = "calc";
-                cmd = "rofi -show calc";
-              }
-              {
-                key = "e";
-                desc = "Emoji";
-                cmd = "rofi -show emoji";
-              }
-              {
-                key = "r";
-                desc = "App Menu";
-                cmd = "rofi -show drun";
-              }
-              {
-                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 = "l";
-        desc = "Lock session";
-        cmd = "${plock}/bin/plock";
-      }
-      {
-        key = "p";
-        desc = "Power";
-        submenu = [
-          {
-            key = "l";
-            desc = "Logout";
-            cmd = "${logout}/bin/logout";
-          }
-          {
-            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";
-          }
-        ];
-      }
-    ];
+    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 = "h";
+              desc = "Handy";
+              cmd = "pkill -USR2 -n handy";
+            }
+            {
+              key = "n";
+              desc = "Nemo";
+              cmd = "${pkgs.nemo-with-extensions}/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 = "c";
+                  desc = "calc";
+                  cmd = "rofi -show calc";
+                }
+                {
+                  key = "e";
+                  desc = "Emoji";
+                  cmd = "rofi -show emoji";
+                }
+                {
+                  key = "r";
+                  desc = "App Menu";
+                  cmd = "rofi -show drun";
+                }
+                {
+                  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 = "l";
+          desc = "Lock session";
+          cmd = "${plock}/bin/plock";
+        }
+        {
+          key = "p";
+          desc = "Power";
+          submenu = [
+            {
+              key = "l";
+              desc = "Logout";
+              cmd = "${logout}/bin/logout";
+            }
+            {
+              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";
+            }
+          ];
+        }
+      ]
+      ++ lib.lists.optional config.home.desktop.wl-kbptr.enable {
+        key = "m";
+        desc = "Mouse Warp";
+        cmd = "wl-kbptr";
+      };
  };
 }
Author	SHA1	Message	Date
Lucien Cartier-Tilet	d27f63a0f7	feat(caelestia): increase timeout from 5m to 1h	2026-05-06 23:50:55 +02:00
Lucien Cartier-Tilet	90f6102481	feat(packages): add KiCad to phundrak packages	2026-05-06 23:50:19 +02:00
Lucien Cartier-Tilet	e44acd9b06	refactor(firefox): move phundrak firefox config to separate file For better readability	2026-05-06 23:49:40 +02:00
Lucien Cartier-Tilet	177ce475a9	refactor(tmux): declare keybinds with Nix syntax	2026-05-06 23:49:23 +02:00
Lucien Cartier-Tilet	1411f6c47e	feat(jj-cz): use develop branch for jj-cz	2026-05-06 23:49:23 +02:00
Lucien Cartier-Tilet	d1bee6c14d	fix(waydroid): use package that won’t error out	2026-05-03 15:37:16 +02:00
Lucien Cartier-Tilet	5514d347c7	feat(nix): add marpa as binary cache for Nix	2026-05-01 16:27:56 +02:00
Lucien Cartier-Tilet	06519d555b	feat(packages): add QGIS	2026-05-01 15:24:44 +02:00
Lucien Cartier-Tilet	ce94f09dd4	feat(i18n): proper multilingual input Use fcitx5 to switch between different inputs. Installed mozc-ut for Japanese input with the bepo layout, as well as fcitx5-chinese to load table-defined layouts for the IPA/X-SAMPA input method. Currently, mozc_server and fcitx5 need to be launched by the compositor (only Hyprland for now), auto-launching from module options needs to be implemented in the future.	2026-05-01 15:24:44 +02:00
Lucien Cartier-Tilet	171d635b72	fix(gampo): refer to proper home config	2026-04-28 10:47:38 +02:00
Lucien Cartier-Tilet	3bc4e3dd15	feat(vcs): jj config for Creug	2026-04-12 18:07:33 +02:00
Lucien Cartier-Tilet	4b7a64c8ac	fix(copyparty): disable copyparty for elcafe for now	2026-04-12 15:18:38 +02:00
Lucien Cartier-Tilet	9024d2c744	fix(kernel): remove reference to deprecated hardened kernel	2026-04-12 15:09:52 +02:00
Lucien Cartier-Tilet	d13d81c60a	feat(devshell): add jj and git to dev environment	2026-04-12 15:02:17 +02:00
Lucien Cartier-Tilet	88cf103332	chore(lockfile): update lockfile	2026-04-12 15:00:14 +02:00
Lucien Cartier-Tilet	9431a71539	feat(ai): add opencode to AI packages	2026-04-12 15:00:14 +02:00
Lucien Cartier-Tilet	6fa865644a	feat(wl-kbptr): package wl-kbptr for NixOS as home module	2026-04-12 14:58:02 +02:00
Lucien Cartier-Tilet	154d0e4ddb	chore(flake): update flake lock, remove devenv input	2026-04-12 14:58:02 +02:00
Lucien Cartier-Tilet	cae0357dbe	feat(claude-code): add sox for voice mode	2026-04-12 14:58:02 +02:00
Lucien Cartier-Tilet	477a0b7372	feat(firefox): dedicated module and tridactyl config	2026-04-12 14:57:58 +02:00
Lucien Cartier-Tilet	5b12250fd5	feat(handy): upgrade to handy 0.8.0	2026-03-28 22:32:47 +01:00
Lucien Cartier-Tilet	b8c88cae25	chore(flakes): update flakes	2026-03-28 22:32:47 +01:00
Lucien Cartier-Tilet	63bd1471d8	feat(system): add additional substituters	2026-03-26 11:24:49 +01:00
Lucien Cartier-Tilet	647432314d	feat(jujutsu): add jj-cz options to jujutsu module	2026-03-26 11:24:49 +01:00
Lucien Cartier-Tilet	bfaaee0f36	feat(zellij): add zellij configuration	2026-03-26 11:24:49 +01:00