chore(flake): update flake lock, remove devenv input

flake.lock

@@ -94,11 +94,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1775660122,
+        "lastModified": 1774758352,
-        "narHash": "sha256-qMKB06TE0MY1anDQKBrzZEpktNPyvMxQQzTEEwWAA6I=",
+        "narHash": "sha256-zrv2EjkiGT5BYyg9kOXfo48V6bUf0nyTjis/40ca+7s=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "aa2b08dd45963dc9558de94dbff5e1615e347d02",
+        "rev": "5c59e4490a43eb38b39133d80c47490f0963f216",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775334496,
+        "lastModified": 1774411715,
-        "narHash": "sha256-dUopEMj5KhH1vnv43o29kMsayp0Ki+9EfIn4UAE9sAU=",
+        "narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "ede692925edfc6fca7a52f483414d543e9303237",
+        "rev": "26e663d111e39ca96c63702ad27a05b6736607cf",
         "type": "github"
       },
       "original": {
@@ -374,11 +374,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775683737,
+        "lastModified": 1774738535,
-        "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
+        "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
+        "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1775400071,
+        "lastModified": 1774451186,
-        "narHash": "sha256-uFoqOUB1wbqqDKRdHNEYdgyRQECYWhJBq4Oxjm3Dx9M=",
+        "narHash": "sha256-5IYhofBilDXbM6MWAZLTKxuThjtL3lGNTXdBGsbgRek=",
         "ref": "refs/heads/develop",
-        "rev": "3da214ae4c14f57dc5f6ecd480330936f00e1a4f",
+        "rev": "a5b2bc41aafd203203b4eba4f247a670dd9cb252",
-        "revCount": 35,
+        "revCount": 29,
         "type": "git",
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       },
@@ -411,22 +411,6 @@
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       }
     },
-    "mobile-nixos": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1772289954,
-        "narHash": "sha256-iDdtwk/dFb6AsXMtcOpZixxXl6C1HNUPe6cglxxHO7M=",
-        "owner": "mobile-nixos",
-        "repo": "mobile-nixos",
-        "rev": "1a9e0af79dc7b5e29ed772f1a8a76fcbd9d45fdf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mobile-nixos",
-        "repo": "mobile-nixos",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
         "flake-compat": [
@@ -480,11 +464,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775365369,
+        "lastModified": 1774762074,
-        "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=",
+        "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3",
+        "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70",
         "type": "github"
       },
       "original": {
@@ -524,11 +508,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1774386573,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -538,27 +522,6 @@
         "type": "github"
       }
     },
-    "opencode": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775336060,
-        "narHash": "sha256-KkjMN2xA8jGBnj96UtzffvOeYJJZM05/5T36nSdpZkE=",
-        "owner": "anomalyco",
-        "repo": "opencode",
-        "rev": "930e94a3ea098b9d56fcb6d08b545256d2546a82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "anomalyco",
-        "ref": "v1.3.15",
-        "repo": "opencode",
-        "type": "github"
-      }
-    },
     "pumo-system-info": {
       "inputs": {
         "flake-utils": "flake-utils_4",
@@ -609,10 +572,8 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
         "jj-cz": "jj-cz",
-        "mobile-nixos": "mobile-nixos",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
-        "opencode": "opencode",
         "pumo-system-info": "pumo-system-info",
         "sops-nix": "sops-nix",
         "spicetify": "spicetify",
@@ -686,11 +647,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775682595,
+        "lastModified": 1774760784,
-        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
+        "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
+        "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
         "type": "github"
       },
       "original": {
@@ -707,11 +668,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1775421933,
+        "lastModified": 1774157037,
-        "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
+        "narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
+        "rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa",
         "type": "github"
       },
       "original": {
@@ -727,11 +688,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775701952,
+        "lastModified": 1774517972,
-        "narHash": "sha256-xj9u8fz2hTTTELMorqox0hPWrmAvGRnQUEnlj+vCjFo=",
+        "narHash": "sha256-oPIVzGlMmfWuJlRbr87yU3cnV8NxtwTG92GqpQczlkw=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "f56f1053ae9f878501d3a8ae1961c73d1d7abce3",
+        "rev": "0ddba2fbd72bb60f8b35b7de1ad67590f454d402",
         "type": "github"
       },
       "original": {
@@ -830,11 +791,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775710180,
+        "lastModified": 1774759885,
-        "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=",
+        "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a",
+        "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6",
         "type": "github"
       },
       "original": {

flake.nix

@@ -30,16 +30,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    mobile-nixos = {
-      url = "github:mobile-nixos/mobile-nixos";
-      flake = false; # It is not as a flake
-    };
-
-    opencode = {
-      url = "github:anomalyco/opencode/v1.3.15";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     pumo-system-info = {
       url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -68,15 +58,14 @@
 
   nixConfig = {
     extra-trusted-public-keys = [
-      "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
+      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
     extra-substituters = [
-      "http://marpa:5000?priority=5"
+      "https://nix-community.cachix.org?priority=10"
-      "https://phundrak.cachix.org?priority=10"
+      "https://devenv.cachix.org?priority=20"
-      "https://nix-community.cachix.org?priority=20"
+      "https://phundrak.cachix.org?priority=30"
       "https://cache.nixos.org?priority=40"
     ];
     extra-experimental-features = [
@@ -91,7 +80,6 @@
     nixpkgs,
     flake-utils,
     home-manager,
-    mobile-nixos,
     srvos,
     ...
   } @ inputs:
@@ -102,11 +90,7 @@
       in {
         formatter = pkgs.alejandra;
         devShells.default = pkgs.mkShell {
-          buildInputs = [
+          buildInputs = [pkgs.nh];
-            pkgs.nh
-            pkgs.jujutsu
-            pkgs.git
-          ];
         };
 
         packages = {
@@ -134,7 +118,7 @@
             };
             "phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
               inherit extraSpecialArgs pkgs;
-              modules = withUserModules ./users/phundrak/host/gampo.nix;
+              modules = withUserModules ./users/phundrak/host/marpa.nix;
             };
             "phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
               inherit extraSpecialArgs pkgs;
@@ -172,7 +156,7 @@
             };
             marpa = nixpkgs.lib.nixosSystem {
               inherit specialArgs;
-              modules = withSystemModules ./hosts/marpa;
+              modules = withSystemModules ./hosts/marpa/configuration.nix;
             };
             NaroMk3 = nixpkgs.lib.nixosSystem {
               inherit specialArgs;
@@ -183,14 +167,6 @@
                 ./hosts/naromk3/configuration.nix
               ];
             };
-            pumo = nixpkgs.lib.nixosSystem {
-              system = "aarch64-linux";
-              inherit specialArgs;
-              modules = withSystemModules [
-                (import "${mobile-nixos}/lib/configuration.nix" {device = "oneplus-enchilada";})
-                ./hosts/pumo
-              ];
-            };
             tilo = nixpkgs.lib.nixosSystem {
               inherit specialArgs;
               modules = withSystemModules ./hosts/tilo/configuration.nix;

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" = {
+    "elcafe/copyparty/passwords/creug" = {
-    #   restartUnits = ["copyparty.service"];
+      restartUnits = ["copyparty.service"];
-    #   owner = "creug";
+      owner = "creug";
-    # };
+    };
-    # "elcafe/copyparty/passwords/phundrak" = {
+    "elcafe/copyparty/passwords/phundrak" = {
-    #   restartUnits = ["copyparty.service"];
+      restartUnits = ["copyparty.service"];
-    #   owner = "phundrak";
+      owner = "phundrak";
-    # };
+    };
   };
 
   mySystem = {
@@ -73,12 +73,12 @@
     };
   };
 
-  # services.copyparty = import ./copyparty.nix {
+  services.copyparty = import ./copyparty.nix {
-  #   passwordFiles = {
+    passwordFiles = {
-  #     creug = config.sops.secrets."elcafe/copyparty/passwords/creug".path;
+      creug = config.sops.secrets."elcafe/copyparty/passwords/creug".path;
-  #     phundrak = config.sops.secrets."elcafe/copyparty/passwords/phundrak".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

hosts/gampo/configuration.nix

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

hosts/marpa/configuration.nix

@@ -86,7 +86,6 @@
         scarlett.enable = true;
       };
     };
-    i18n.input.enable = true;
     misc.keymap = "fr-bepo";
     networking = {
       hostname = "marpa";
@@ -107,10 +106,6 @@
     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;
@@ -128,13 +123,10 @@
     };
   };
 
-  sops.secrets = {
+  sops.secrets.extraHosts = {
-    "marpa/nix-cache-priv-key" = {};
+    inherit (config.users.users.root) group;
-    extraHosts = {
+    owner = config.users.users.phundrak.name;
-      inherit (config.users.users.root) group;
+    mode = "0440";
-      owner = config.users.users.phundrak.name;
-      mode = "0440";
-    };
   };
 
   services.udev.extraHwdb = ''

hosts/pumo/default.nix

@@ -1,91 +0,0 @@
-# Minimal configuration for OnePlus 6 (enchilada) NixOS Mobile
-# Focus on essentials: SSH, wireless, and basic tools
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    inputs.sops-nix.nixosModules.sops
-    ../../system
-  ];
-
-  nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"];
-
-  mySystem = {
-    desktop = {
-      hyprland.enable = true;
-      niri.enable = true;
-      waydroid.enable = true;
-      xserver = {
-        enable = true;
-        de = "gnome";
-      };
-    };
-    dev.docker = {
-      enable = true;
-      podman.enable = true;
-      autoprune.enable = true;
-    };
-    hardware = {
-      bluetooth.enable = true;
-      sound = {
-        enable = true;
-        usePulseaudio = true;
-      };
-    };
-    i18n.input.enable = true;
-    misc = {
-      keymap = "fr-bepo";
-      mobile = true;
-    };
-    networking = {
-      hostname = "pumo";
-      id = "93595b88";
-    };
-    packages = {
-      appimage.enable = true;
-      flatpak.enable = true;
-      nix.nix-ld.enable = true;
-    };
-    services = {
-      languagetool.enable = true;
-      printing.enable = true;
-      ssh.enable = true;
-    };
-    users = {
-      root.disablePassword = true;
-      phundrak = {
-        enable = true;
-        trusted = true;
-        extraGroups = ["feedbackd"];
-      };
-    };
-  };
-
-  programs = {
-    dconf.enable = true;
-    calls.enable = true;
-    zsh.enable = true;
-  };
-
-
-  hardware.sensor.iio.enable = true;
-
-  # Minimal essential packages
-  environment.systemPackages = with pkgs; [
-    chatty # IM and SMS
-    epiphany
-    nixd
-    git
-    vim
-    emacs
-    wget
-    curl
-    jujutsu
-    firefox
-    kitty
-  ];
-
-  system.stateVersion = "25.11";
-}

secrets/secrets.yaml

@@ -6,8 +6,6 @@ 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]
@@ -107,7 +105,7 @@ sops:
             dUpXZis2N2VyN0ZFbjlPRXdwRFQ1aHMKm1Mk6MPKxFmwdATCYUANRSY5rHKgmQer
             LBlqqWKt1JiIUAYtazQeQ6KYxmjVlQPY7AZw2t+EhBEPrqbTL3vOiw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-05-01T13:20:34Z"
+    lastmodified: "2026-03-07T17:19:05Z"
-    mac: ENC[AES256_GCM,data:OueL0eHYmFKWfSyCZxburRJ2FS1xkowx7ha/Zv7r++26D85GSHDeIL9HdfByI5a1OhH90rH3WLxZrJgT3FiwBw27HhhHtS7Fs6MBFvTuPmSA7ZtMeGMWBRVjwbGAWN17BZAhJzMlZHq2nPX0xXIKT0HuTLVRPLuVCSlvDzMXsTE=,iv:+JN4Vzs8o8PJAam/uKBbUXt3ArxC88D6xR7rMeeGglg=,tag:S+OtbxLhVKFnqBZtyKDGyA==,type:str]
+    mac: ENC[AES256_GCM,data:hT4mPKLcIuAFmllJBYFXL5sGyMn95mYEv+eGVA+KQYm629YKSncgvn5g8elau/8HXR1O/bwQlkGmGr8VPeR/0KRb6TPCA4MrCwox38fy3ZLx2e0movVi/xIgKXIo5wYUq4Qm/pSo715limxGChxUxKtdEK/lmMkSnxyGmlkQtwM=,iv:XoOfhdK/CK6shUXhH4h14gtyqZqcqmTV6/R2jkynFr8=,tag:q3V0xcWQxjFi2drk5fLJoQ==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.12.2
+    version: 3.11.0

system/boot/boot.nix

@@ -54,7 +54,7 @@ in {
     };
   };
 
-  config.boot = mkIf (! config.mySystem.misc.mobile) {
+  config.boot = {
     initrd.kernelModules = lib.lists.singleton (
       if config.mySystem.hardware.amdgpu.enable
       then "amdgpu"
@@ -73,7 +73,10 @@ in {
     };
     supportedFilesystems = mkIf cfg.zfs.enable ["zfs"];
     zfs.extraPools = mkIf cfg.zfs.enable cfg.zfs.pools;
-    kernelPackages = cfg.kernel.package;
+    kernelPackages =
+      if cfg.kernel.hardened
+      then pkgs.linuxPackages_hardened
+      else cfg.kernel.package;
     kernelModules =
       cfg.kernel.modules
       ++ ["kvm-${cfg.kernel.cpuVendor}"]

system/default.nix

@@ -30,7 +30,6 @@ in {
       example = "fr-bepo";
       description = "Keymap to use in the TTY console";
     };
-    mobile = mkEnableOption "Enable if using Mobile NixOS";
   };
 
   config = {
@@ -48,16 +47,16 @@ in {
 
     nix.settings = {
       substituters = [
-        "http://marpa:5000?priority=5"
+        "https://nix-community.cachix.org?priority=10"
-        "https://phundrak.cachix.org?priority=10"
+        "https://devenv.cachix.org?priority=20"
-        "https://nix-community.cachix.org?priority=20"
+        "https://phundrak.cachix.org?priority=30"
         "https://cache.nixos.org?priority=40"
       ];
       trusted-public-keys = [
-        "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
-        "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+        "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
       ];
       http-connections = 128;
       experimental-features = [

system/desktop/xserver.nix

@@ -30,7 +30,6 @@ in {
       games.enable = false;
       gnome-remote-desktop.enable = true;
       gnome-online-accounts.enable = true;
-      gnome-keyring.enable = true;
       sushi.enable = true;
     };
 

system/hardware/sound.nix

@@ -8,8 +8,7 @@ with lib; let
   cfg = config.mySystem.hardware.sound;
 in {
   options.mySystem.hardware.sound = {
-    enable = mkEnableOption "Whether to enable sounds";
+    enable = mkEnableOption "Whether to enable sounds with Pipewire";
-    usePulseaudio = mkEnableOption "Activate sound support with pulseaudio";
     scarlett.enable = mkEnableOption "Activate support for Scarlett sound card";
     alsa = mkOption {
       type = types.bool;
@@ -33,14 +32,13 @@ in {
 
   config = {
     environment.systemPackages = mkIf cfg.scarlett.enable [pkgs.alsa-scarlett-gui];
-    services = {
+    services.pipewire = mkIf cfg.enable {
-      pipewire.enable = mkForce (cfg.enable && ! cfg.usePulseaudio);
+      enable = true;
-      pipewire.alsa = {
+      alsa = mkIf cfg.alsa {
         enable = mkDefault true;
         support32Bit = mkDefault true;
       };
-      pipewire.jack.enable = cfg.jack;
+      jack.enable = mkDefault cfg.jack;
-      pulseaudio.enable = cfg.usePulseaudio;
     };
     programs.noisetorch = mkIf cfg.enable {
       inherit (cfg) enable;

system/i18n/default.nix

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

system/i18n/input.nix

@@ -1,25 +0,0 @@
-{
-  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/packages/flatpak.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -10,7 +11,12 @@ in {
     enable = mkEnableOption "Enable Flatpak support";
     builder.enable = mkEnableOption "Enable Flatpak builder";
   };
-  config.services.flatpak = mkIf cfg.enable {
+  config = {
-    inherit (cfg) enable;
+    services.flatpak = mkIf cfg.enable {
+      inherit (cfg) enable;
+    };
+    environment.systemPackages = mkIf cfg.builder.enable [
+      pkgs.flatpak-buildR
+    ];
   };
 }

system/services/default.nix

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

system/services/harmonia.nix

@@ -1,36 +0,0 @@
-{
-  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}";
-      };
-    };
-  };
-}

system/users/phundrak.nix

@@ -10,18 +10,13 @@ in {
   options.mySystem.users.phundrak = {
     enable = mkEnableOption "Enables user phundrak";
     trusted = mkEnableOption "Mark the user as trusted by Nix";
-    extraGroups = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      example = ["feedbackd"];
-    };
   };
 
   config = {
     users.users.phundrak = mkIf cfg.enable {
       isNormalUser = true;
       description = "Lucien Cartier-Tilet";
-      extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"] ++ cfg.extraGroups;
+      extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"];
       shell = pkgs.zsh;
       openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/phundrak/keys;
     };

users/creug/home.nix

@@ -34,16 +34,7 @@ in {
       creug.sshKey.file = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
 
       dev.vcs = {
-        name = "Creug";
+        jj.enable = false;
-        email = "gregory.foulachon@gmail.com";
-        editor = "${pkgs.nano}/bin/nano";
-        jj = {
-          enable = true;
-          cz = {
-            enable = true;
-            alias = true;
-          };
-        };
         git.enable = true;
         publicKey = cfg.sshKey;
       };

users/modules/desktop/default.nix

@@ -19,7 +19,6 @@ in {
     ./swaync.nix
     ./theme.nix
     ./waybar.nix
-    ./wl-kbptr.nix
     ./wlr-which-key.nix
     ./wlsunset.nix
   ];

users/modules/desktop/hyprland.nix

@@ -50,13 +50,10 @@ 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;
@@ -109,8 +106,6 @@ 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";
       };
@@ -175,6 +170,8 @@ 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/desktop/wl-kbptr.nix

@@ -1,37 +0,0 @@
-{
-  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;
-      };
-    };
-  };
-}

users/modules/dev/ai/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  inputs,
   ...
 }:
 with lib; let
@@ -30,10 +29,7 @@ in {
         };
         ollama.enable = mkDefault cfg.enable;
       };
-      packages = let
+      packages = [pkgs.lmstudio];
-        inherit (pkgs.stdenv.hostPlatform) system;
-        inherit (inputs.opencode.packages.${system}) opencode;
-      in [pkgs.lmstudio opencode];
     };
     programs.mcp = mkIf (cfg.mcpServers != {}) {
       enable = true;

users/phundrak/home.nix

@@ -110,9 +110,9 @@
               bind C back
               bind R forward
 
-              " === Tab navigation ===
+              " === Tab navigation (T/S = J/K) ===
-              bind T tabnext
+              bind T tabprev
-              bind S tabprev
+              bind S tabnext
 
               " === Displaced commands ===
               " reload was on r → move to h (bépo's 'replace' position)
@@ -131,7 +131,6 @@
               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}"`)
             '';
           };
         };
@@ -139,17 +138,6 @@
           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;
@@ -157,19 +145,16 @@
         vcs.jj.signing.enable = true;
       };
       fullDesktop = true;
-      file = {
+      file."${config.home.homeDirectory}/.ssh/allowed_signers" = {
-        ".XCompose".source = ./XCompose;
+        enable = true;
-        "${config.home.homeDirectory}/.ssh/allowed_signers" = {
+        text = lib.strings.join "\n" (
-          enable = true;
+          map (file: let
-          text = lib.strings.join "\n" (
+            content = lib.strings.trim (builtins.readFile file);
-            map (file: let
+            parts = lib.strings.splitString " " content;
-              content = lib.strings.trim (builtins.readFile file);
+            email = lib.lists.last parts;
-              parts = lib.strings.splitString " " content;
+          in "${email} namespaces=\"git\" ${content}")
-              email = lib.lists.last parts;
+          (lib.filesystem.listFilesRecursive ./keys)
-            in "${email} namespaces=\"git\" ${content}")
+        );
-            (lib.filesystem.listFilesRecursive ./keys)
-          );
-        };
       };
     };
 

users/phundrak/packages.nix

@@ -32,16 +32,17 @@ 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
-    qgis
-    kicad
     handy
     libnotify
     nextcloud-client

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

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   config.home.desktop.wlr-which-key.settings = {
@@ -28,223 +27,217 @@
       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
+    in [
-      [
+      {
-        {
+        key = "a";
-          key = "a";
+        desc = "Apps";
-          desc = "Apps";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "b";
-              key = "b";
+            desc = "Browser";
-              desc = "Browser";
+            cmd = "zen";
-              cmd = "zen";
+          }
-            }
+          {
-            {
+            key = "B";
-              key = "B";
+            desc = "Qutebrowser";
-              desc = "Qutebrowser";
+            cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
-              cmd = "${pkgs.qutebrowser}/bin/qutebrowser";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Discord";
-              desc = "Discord";
+            cmd = "${pkgs.vesktop}/bin/vesktop";
-              cmd = "${pkgs.vesktop}/bin/vesktop";
+          }
-            }
+          {
-            {
+            key = "e";
-              key = "e";
+            desc = "Emacs";
-              desc = "Emacs";
+            cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
-              cmd = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -n";
+          }
-            }
+          {
-            {
+            key = "g";
-              key = "g";
+            desc = "Gimp";
-              desc = "Gimp";
+            cmd = "${pkgs.gimp}/bin/gimp";
-              cmd = "${pkgs.gimp}/bin/gimp";
+          }
-            }
+          {
-            {
+            key = "h";
-              key = "h";
+            desc = "Handy";
-              desc = "Handy";
+            cmd = "pkill -USR2 -n handy";
-              cmd = "pkill -USR2 -n handy";
+          }
-            }
+          {
-            {
+            key = "n";
-              key = "n";
+            desc = "Nemo";
-              desc = "Nemo";
+            cmd = "${pkgs.nemo-with-extensions}/bin/nemo";
-              cmd = "${pkgs.nemo-with-extensions}/bin/nemo";
+          }
-            }
+          {
-            {
+            key = "N";
-              key = "N";
+            desc = "Nextcloud";
-              desc = "Nextcloud";
+            cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
-              cmd = "${pkgs.nextcloud-client}/bin/nextcloud";
+          }
-            }
+          {
-            {
+            key = "r";
-              key = "r";
+            desc = "Rofi";
-              desc = "Rofi";
+            submenu = [
-              submenu = [
+              {
-                {
+                key = "b";
-                  key = "b";
+                desc = "Bluetooth";
-                  desc = "Bluetooth";
+                cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
-                  cmd = "${pkgs.rofi-bluetooth}/bin/rofi-bluetooth";
+              }
-                }
+              {
-                {
+                key = "c";
-                  key = "c";
+                desc = "calc";
-                  desc = "calc";
+                cmd = "rofi -show calc";
-                  cmd = "rofi -show calc";
+              }
-                }
+              {
-                {
+                key = "e";
-                  key = "e";
+                desc = "Emoji";
-                  desc = "Emoji";
+                cmd = "rofi -show emoji";
-                  cmd = "rofi -show emoji";
+              }
-                }
+              {
-                {
+                key = "r";
-                  key = "r";
+                desc = "App Menu";
-                  desc = "App Menu";
+                cmd = "rofi -show drun";
-                  cmd = "rofi -show drun";
+              }
-                }
+              {
-                {
+                key = "s";
-                  key = "s";
+                desc = "SSH";
-                  desc = "SSH";
+                cmd = "rofi -show ssh";
-                  cmd = "rofi -show ssh";
+              }
-                }
+              {
-                {
+                key = "y";
-                  key = "y";
+                desc = "YouTube";
-                  desc = "YouTube";
+                cmd = "${ytplay}/bin/ytplay";
-                  cmd = "${ytplay}/bin/ytplay";
+              }
-                }
+            ];
-              ];
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "b";
-          key = "b";
+        desc = "Buffers";
-          desc = "Buffers";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "c";
-              key = "c";
+            desc = "Center";
-              desc = "Center";
+            cmd = "${center-window}/bin/center-window";
-              cmd = "${center-window}/bin/center-window";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Close";
-              desc = "Close";
+            cmd = "${close-window}/bin/close-window";
-              cmd = "${close-window}/bin/close-window";
+          }
-            }
+          {
-            {
+            key = "f";
-              key = "f";
+            desc = "Fullscreen";
-              desc = "Fullscreen";
+            cmd = "${fullscreen}/bin/fullscreen";
-              cmd = "${fullscreen}/bin/fullscreen";
+          }
-            }
+          {
-            {
+            key = "F";
-              key = "F";
+            desc = "Float";
-              desc = "Float";
+            cmd = "${float-window}/bin/float-window";
-              cmd = "${float-window}/bin/float-window";
+          }
-            }
+          {
-            {
+            key = "u";
-              key = "u";
+            desc = "Urgent";
-              desc = "Urgent";
+            cmd = "${focus-urgent}/bin/focus-urgent";
-              cmd = "${focus-urgent}/bin/focus-urgent";
+          }
-            }
+          {
-            {
+            key = ".";
-              key = ".";
+            desc = "Resize";
-              desc = "Resize";
+            submenu = [
-              submenu = [
+              {
-                {
+                key = left;
-                  key = left;
+                desc = "Decrease Width";
-                  desc = "Decrease Width";
+                cmd = "echo decrease width";
-                  cmd = "echo decrease width";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = down;
-                  key = down;
+                desc = "Increase Height";
-                  desc = "Increase Height";
+                cmd = "echo decrease height";
-                  cmd = "echo decrease height";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = up;
-                  key = up;
+                desc = "Decrease Height";
-                  desc = "Decrease Height";
+                cmd = "echo decrease height";
-                  cmd = "echo decrease height";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+              {
-                {
+                key = right;
-                  key = right;
+                desc = "Increase Width";
-                  desc = "Increase Width";
+                cmd = "echo increase width";
-                  cmd = "echo increase width";
+                keep-open = true;
-                  keep-open = true;
+              }
-                }
+            ];
-              ];
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "l";
-          key = "l";
+        desc = "Lock session";
-          desc = "Lock session";
+        cmd = "${plock}/bin/plock";
-          cmd = "${plock}/bin/plock";
+      }
-        }
+      {
-        {
+        key = "p";
-          key = "p";
+        desc = "Power";
-          desc = "Power";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "l";
-              key = "l";
+            desc = "Logout";
-              desc = "Logout";
+            cmd = "${logout}/bin/logout";
-              cmd = "${logout}/bin/logout";
+          }
-            }
+          {
-            {
+            key = "s";
-              key = "s";
+            desc = "Suspend";
-              desc = "Suspend";
+            cmd = "systemctl suspend";
-              cmd = "systemctl suspend";
+          }
-            }
+          {
-            {
+            key = "r";
-              key = "r";
+            desc = "Reboot";
-              desc = "Reboot";
+            cmd = "systemctl reboot";
-              cmd = "systemctl reboot";
+          }
-            }
+          {
-            {
+            key = "o";
-              key = "o";
+            desc = "Poweroff";
-              desc = "Poweroff";
+            cmd = "systemctl poweroff";
-              cmd = "systemctl poweroff";
+          }
-            }
+        ];
-          ];
+      }
-        }
+      {
-        {
+        key = "s";
-          key = "s";
+        desc = "Screenshots";
-          desc = "Screenshots";
+        submenu = [
-          submenu = [
+          {
-            {
+            key = "Print";
-              key = "Print";
+            desc = "Screenshot";
-              desc = "Screenshot";
+            cmd = "screenshot";
-              cmd = "screenshot";
+          }
-            }
+          {
-            {
+            key = "d";
-              key = "d";
+            desc = "Delayed";
-              desc = "Delayed";
+            cmd = "screenshot -d 3";
-              cmd = "screenshot -d 3";
+          }
-            }
+          {
-            {
+            key = "D";
-              key = "D";
+            desc = "Select, Delay, Edit, and Copy";
-              desc = "Select, Delay, Edit, and Copy";
+            cmd = "screenshot -secd 3";
-              cmd = "screenshot -secd 3";
+          }
-            }
+          {
-            {
+            key = "e";
-              key = "e";
+            desc = "Select, Edit, and Copy";
-              desc = "Select, Edit, and Copy";
+            cmd = "screenshot -sec";
-              cmd = "screenshot -sec";
+          }
-            }
+          {
-            {
+            key = "g";
-              key = "g";
+            desc = "Select, Gimp, and Copy";
-              desc = "Select, Gimp, and Copy";
+            cmd = "screenshot -sgc";
-              cmd = "screenshot -sgc";
+          }
-            }
+          {
-            {
+            key = "s";
-              key = "s";
+            desc = "Select and Copy";
-              desc = "Select and Copy";
+            cmd = "screenshot -sc";
-              cmd = "screenshot -sc";
+          }
-            }
+        ];
-          ];
+      }
-        }
+    ];
-      ]
-      ++ lib.lists.optional config.home.desktop.wl-kbptr.enable {
-        key = "m";
-        desc = "Mouse Warp";
-        cmd = "wl-kbptr";
-      };
   };
 }