feat(jujutsu): add jj-cz options to jujutsu module

.envrc

@@ -1,7 +1,11 @@
 # -*- 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 "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
+  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
 fi

flake.lock

@@ -25,6 +25,39 @@
       }
     },
     "cachix": {
+      "inputs": {
+        "devenv": [
+          "devenv"
+        ],
+        "flake-compat": [
+          "devenv",
+          "flake-compat"
+        ],
+        "git-hooks": [
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1767714506,
+        "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=",
+        "owner": "cachix",
+        "repo": "cachix",
+        "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "latest",
+        "repo": "cachix",
+        "type": "github"
+      }
+    },
+    "cachix_2": {
       "inputs": {
         "devenv": [
           "jj-cz",
@@ -72,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772764582,
+        "lastModified": 1771987897,
-        "narHash": "sha256-hSwjmpXHFqzSXrndVekA0IheKrbC7wi0IbfZTYwlmXw=",
+        "narHash": "sha256-5pNQFGxG3fxS9pGnNBJjT76veotKIKq2XpAVFGAhCdI=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "4bcd42f482d038b98145b0b03388244b68b7d35d",
+        "rev": "b0d68f0a1c48fa138d6fde94dcbecea801a86a01",
         "type": "github"
       },
       "original": {
@@ -94,11 +127,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1775660122,
+        "lastModified": 1772330657,
-        "narHash": "sha256-qMKB06TE0MY1anDQKBrzZEpktNPyvMxQQzTEEwWAA6I=",
+        "narHash": "sha256-cWblprYsDUeAWA57xAqxIjNxXvDI/rqYn6TFp2OPi/k=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "aa2b08dd45963dc9558de94dbff5e1615e347d02",
+        "rev": "278fd4a4ed1bfb42c3fe197ff38b587539c012aa",
         "type": "github"
       },
       "original": {
@@ -115,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775334496,
+        "lastModified": 1772839279,
-        "narHash": "sha256-dUopEMj5KhH1vnv43o29kMsayp0Ki+9EfIn4UAE9sAU=",
+        "narHash": "sha256-pAI7T/9Gl6SUTKmNZhtxYjBGnYPNzBLMgfqILfYa1Us=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "ede692925edfc6fca7a52f483414d543e9303237",
+        "rev": "31b23843f2d51049da00c821f2418d0c44389cd7",
         "type": "github"
       },
       "original": {
@@ -136,6 +169,32 @@
         "git-hooks": "git-hooks",
         "nix": "nix",
         "nixd": "nixd",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772819008,
+        "narHash": "sha256-1DpF5F7zgOZ7QrRjz23315pUoF532dHnsU/V4UQithk=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "9e5c17caf0ead1bb29d430d4c0a26a77bc5d374b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "devenv_2": {
+      "inputs": {
+        "cachix": "cachix_2",
+        "flake-compat": "flake-compat_2",
+        "flake-parts": "flake-parts_2",
+        "git-hooks": "git-hooks_2",
+        "nix": "nix_2",
+        "nixd": "nixd_2",
         "nixpkgs": [
           "jj-cz",
           "nixpkgs"
@@ -179,6 +238,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1761588595,
@@ -195,6 +270,27 @@
       }
     },
     "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "devenv",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "jj-cz",
@@ -231,6 +327,21 @@
         "type": "github"
       }
     },
+    "flake-root_2": {
+      "locked": {
+        "lastModified": 1723604017,
+        "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -282,24 +393,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakeCompat": {
       "flake": false,
       "locked": {
@@ -319,11 +412,37 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": [
-          "jj-cz",
           "devenv",
           "flake-compat"
         ],
         "gitignore": "gitignore",
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772665116,
+        "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "git-hooks_2": {
+      "inputs": {
+        "flake-compat": [
+          "jj-cz",
+          "devenv",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore_2",
         "nixpkgs": [
           "jj-cz",
           "devenv",
@@ -345,6 +464,28 @@
       }
     },
     "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "devenv",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
       "inputs": {
         "nixpkgs": [
           "jj-cz",
@@ -374,11 +515,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775683737,
+        "lastModified": 1772807318,
-        "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=",
+        "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992",
+        "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
         "type": "github"
       },
       "original": {
@@ -390,19 +531,19 @@
     "jj-cz": {
       "inputs": {
         "alejandra": "alejandra",
-        "devenv": "devenv",
+        "devenv": "devenv_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1775400071,
+        "lastModified": 1774310517,
-        "narHash": "sha256-uFoqOUB1wbqqDKRdHNEYdgyRQECYWhJBq4Oxjm3Dx9M=",
+        "narHash": "sha256-0wvZ4TBJM0pigw2ix1TWFT9CIKpYZSVu7jQDyM4e1jA=",
         "ref": "refs/heads/develop",
-        "rev": "3da214ae4c14f57dc5f6ecd480330936f00e1a4f",
+        "rev": "dda4aae87caf35cf03d5b1ce0e172807fa987e5c",
-        "revCount": 35,
+        "revCount": 27,
         "type": "git",
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       },
@@ -411,23 +552,67 @@
         "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": [
+          "devenv",
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "devenv",
+          "flake-parts"
+        ],
+        "git-hooks-nix": [
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
+        "nixpkgs-23-11": [
+          "devenv"
+        ],
+        "nixpkgs-regression": [
+          "devenv"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772748357,
+        "narHash": "sha256-vtf03lfgQKNkPH9FdXdboBDS5DtFkXB8xRw5EBpuDas=",
+        "owner": "cachix",
+        "repo": "nix",
+        "rev": "41eee9d3b1f611b1b90d51caa858b6d83834c44a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "devenv-2.32",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772341813,
+        "narHash": "sha256-/PQ0ubBCMj/MVCWEI/XMStn55a8dIKsvztj4ZVLvUrQ=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "a2051ff239ce2e8a0148fa7a152903d9a78e854f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
+    "nix_2": {
       "inputs": {
         "flake-compat": [
           "jj-cz",
@@ -473,40 +658,47 @@
         "type": "github"
       }
     },
-    "nix-index-database": {
+    "nixd": {
       "inputs": {
+        "flake-parts": [
+          "devenv",
+          "flake-parts"
+        ],
+        "flake-root": "flake-root",
         "nixpkgs": [
+          "devenv",
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1775365369,
+        "lastModified": 1772441848,
-        "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=",
+        "narHash": "sha256-H3W5PSJQTh8Yp51PGU3GUoGCcrD+y7nCsxYHQr+Orvw=",
         "owner": "nix-community",
-        "repo": "nix-index-database",
+        "repo": "nixd",
-        "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3",
+        "rev": "c896f916addae5b133ee0f4f01f9cd93906f62ea",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "nix-index-database",
+        "repo": "nixd",
         "type": "github"
       }
     },
-    "nixd": {
+    "nixd_2": {
       "inputs": {
         "flake-parts": [
           "jj-cz",
           "devenv",
           "flake-parts"
         ],
-        "flake-root": "flake-root",
+        "flake-root": "flake-root_2",
         "nixpkgs": [
           "jj-cz",
           "devenv",
           "nixpkgs"
         ],
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1763964548,
@@ -524,11 +716,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1772624091,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
         "type": "github"
       },
       "original": {
@@ -538,30 +730,9 @@
         "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",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -589,11 +760,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772925576,
+        "lastModified": 1771926182,
-        "narHash": "sha256-mMoiXABDtkSJxCYDrkhJ/TrrJf5M46oUfIlJvv2gkZ0=",
+        "narHash": "sha256-QbXuSLhiSxOq6ydBL3+KGe1aiYWBW+e3J6qjJZaRMq0=",
         "ref": "refs/heads/master",
-        "rev": "15a84097653593dd15fad59a56befc2b7bdc270d",
+        "rev": "cddb4f061bab495f4473ca5f2c571b6c710efef7",
-        "revCount": 750,
+        "revCount": 744,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -606,13 +777,11 @@
       "inputs": {
         "caelestia-shell": "caelestia-shell",
         "copyparty": "copyparty",
-        "flake-utils": "flake-utils_2",
+        "devenv": "devenv",
         "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 +855,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775682595,
+        "lastModified": 1772495394,
-        "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=",
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
         "type": "github"
       },
       "original": {
@@ -704,14 +873,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1775421933,
+        "lastModified": 1772494187,
-        "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
+        "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
+        "rev": "915ab06b046d05613041780c575c62a32fe67cea",
         "type": "github"
       },
       "original": {
@@ -727,11 +896,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775701952,
+        "lastModified": 1772799438,
-        "narHash": "sha256-xj9u8fz2hTTTELMorqox0hPWrmAvGRnQUEnlj+vCjFo=",
+        "narHash": "sha256-81/Ow6L5azplWp9p8gtl/Q1m5s2gCX4iuKNF5ujwxBA=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "f56f1053ae9f878501d3a8ae1961c73d1d7abce3",
+        "rev": "e6ec80588a07aea2cdb67c2865759e02d85b94b2",
         "type": "github"
       },
       "original": {
@@ -785,22 +954,29 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "devenv",
+          "nixd",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1734704479,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
-        "owner": "nix-systems",
+        "owner": "numtide",
-        "repo": "default",
+        "repo": "treefmt-nix",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "owner": "numtide",
-        "repo": "default",
+        "repo": "treefmt-nix",
         "type": "github"
       }
     },
-    "treefmt-nix": {
+    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "jj-cz",
@@ -830,11 +1006,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775710180,
+        "lastModified": 1772685307,
-        "narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=",
+        "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a",
+        "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,7 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
+
+    devenv = {
+      url = "github:cachix/devenv";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -30,16 +34,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";
@@ -67,49 +61,49 @@
   };
 
   nixConfig = {
-    extra-trusted-public-keys = [
+    extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
-      "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
+    extra-substituters = "https://devenv.cachix.org";
-      "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://phundrak.cachix.org?priority=10"
-      "https://nix-community.cachix.org?priority=20"
-      "https://cache.nixos.org?priority=40"
-    ];
-    extra-experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    http-connections = 128;
   };
 
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
     home-manager,
-    mobile-nixos,
+    devenv,
     srvos,
     ...
-  } @ inputs:
+  } @ inputs: let
-    flake-utils.lib.eachDefaultSystem (
-      system: let
     inherit (self) outputs;
+    system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
   in {
-        formatter = pkgs.alejandra;
+    formatter.${system} = pkgs.alejandra;
-        devShells.default = pkgs.mkShell {
+
-          buildInputs = [
+    packages.${system} = {
-            pkgs.nh
+      devenv-up = self.devShells.${system}.default.config.procfileScript;
-            pkgs.jujutsu
+      devenv-test = self.devShells.${system}.default.config.test;
-            pkgs.git
+    };
+
+    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;
@@ -134,7 +128,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 +166,7 @@
       };
       marpa = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
-              modules = withSystemModules ./hosts/marpa;
+        modules = withSystemModules ./hosts/marpa/configuration.nix;
       };
       NaroMk3 = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
@@ -183,20 +177,10 @@
           ./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,14 +123,11 @@
     };
   };
 
-  sops.secrets = {
+  sops.secrets.extraHosts = {
-    "marpa/nix-cache-priv-key" = {};
-    extraHosts = {
     inherit (config.users.users.root) group;
     owner = config.users.users.phundrak.name;
     mode = "0440";
   };
-  };
 
   services.udev.extraHwdb = ''
     mouse:usb:047d:80a6:*

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";
-}

packages/handy.nix

@@ -6,10 +6,10 @@
 }: let
   name = "Handy";
   pname = lib.strings.toLower name;
-  version = "0.8.0";
+  version = "0.7.7";
   src = fetchurl {
     url = "https://github.com/cjpais/${name}/releases/download/v${version}/${name}_${version}_amd64.AppImage";
-    hash = "sha256-PLcssfd6iMx51mglAJ7D4+67HFazwfhJMImgU9WiNDk=";
+    hash = "sha256-76Hno39I3+46blnVW6XWwg944vF5n7IdMYXGMlYMNb0=";
   };
   appimageContent = appimageTools.extractType2 {inherit pname version src;};
 in

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,40 +30,16 @@ in {
       example = "fr-bepo";
       description = "Keymap to use in the TTY console";
     };
-    mobile = mkEnableOption "Enable if using Mobile NixOS";
   };
 
   config = {
     boot.tmp.cleanOnBoot = true;
     console.keyMap = cfg.keymap;
     time.timeZone = cfg.timezone;
-    environment.pathsToLink = [
+    environment.pathsToLink = ["/share/bash-completion" "/share/zsh"];
-      "/share/bash-completion"
-      "/share/zsh"
-    ];
     services = {
       orca.enable = false;
       envfs.enable = true;
     };
-
-    nix.settings = {
-      substituters = [
-        "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 = [
-        "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 = [
-        "nix-command"
-        "flakes"
-      ];
-    };
   };
 }

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 = {
+    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

@@ -9,7 +9,6 @@ in {
   imports = [
     ./caelestia.nix
     ./eww.nix
-    ./firefox.nix
     ./hyprland.nix
     ./kdeconnect.nix
     ./kitty.nix
@@ -19,7 +18,6 @@ in {
     ./swaync.nix
     ./theme.nix
     ./waybar.nix
-    ./wl-kbptr.nix
     ./wlr-which-key.nix
     ./wlsunset.nix
   ];
@@ -27,7 +25,6 @@ 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;

users/modules/desktop/firefox.nix

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

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/theme.nix

@@ -20,7 +20,6 @@ in {
         package = pkgs.nordic;
         name = "Nordic";
       };
-      gtk4.theme = config.gtk.theme;
     };
     home.pointerCursor = {
       enable = true;

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/claude.nix

@@ -6,23 +6,16 @@
 }:
 with lib; let
   cfg = config.home.dev.ai.claude;
-  jsonFormat = pkgs.formats.json {};
 in {
-  options.home.dev.ai.claude = {
+  options.home.dev.ai.claude.enable = mkEnableOption "Enables Claude-related packages";
-    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.' "$@"
+        ${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.' "$@"
       '';
-    in [claude-jj pkgs.sox];
+    in [claude-jj];
     programs.claude-code = {
-      inherit (cfg) enable mcpServers;
+      inherit (cfg) enable;
     };
   };
 }

users/modules/dev/ai/default.nix

@@ -2,42 +2,22 @@
   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 = {
+  options.home.dev.ai.enable = mkEnableOption "Enables AI features";
-    enable = mkEnableOption "Enables AI features";
+  config.home = mkIf cfg.enable {
-    mcpServers = mkOption {
-      inherit (jsonFormat) type;
-      default = {};
-    };
-  };
-  config = {
-    home = mkIf cfg.enable {
     dev.ai = {
-        claude = {
+      claude.enable = mkDefault cfg.enable;
-          enable = mkDefault cfg.enable;
-          mcpServers = mkDefault cfg.mcpServers;
-        };
       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;
-      servers = cfg.mcpServers;
-    };
   };
 }

users/modules/dev/vcs/git.nix

@@ -127,14 +127,6 @@ in {
 
         "dist/"
       ];
-      signing = {
-        format =
-          if cfg.publicKeyFile != null
-          then "ssh"
-          else "openpgp";
-        key = cfg.publicKeyFile;
-        signByDefault = true;
-      };
       settings = {
         user = {
           inherit (cfg) name email;
@@ -159,6 +151,8 @@ 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;
@@ -174,6 +168,7 @@ 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;

users/modules/shell/zellij.nix

@@ -7,6 +7,33 @@
 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 {
@@ -99,17 +126,15 @@ with lib; let
       keybinds = values;
     };
 in {
-  options.home.shell.zellij = let
+  options.home.shell.zellij = {
-    jsonFormat = pkgs.formats.yaml {};
-  in {
     enable = mkEnableOption "Enable Zellij";
     clearDefaultKeybinds = mkEnableOption "Clear default keybinds";
     settings = mkOption {
-      inherit (jsonFormat) type;
+      type = (pkgs.formats.yaml {}).type;
       default = {};
     };
     layouts = mkOption {
-      inherit (jsonFormat) type;
+      type = (pkgs.formats.yaml {}).type;
       default = {};
     };
     extraSettings = mkOption {

users/phundrak/home.nix

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

users/phundrak/packages.nix

@@ -9,6 +9,7 @@ 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; [
@@ -32,16 +33,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
@@ -50,6 +52,7 @@ in {
     scrcpy
     syncthing
     watchmate
+    zen
 
     # Games
     atlauncher

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

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   config.home.desktop.wlr-which-key.settings = {
@@ -28,8 +27,7 @@
       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";
         desc = "Apps";
@@ -240,11 +238,6 @@
           }
         ];
       }
-      ]
+    ];
-      ++ lib.lists.optional config.home.desktop.wl-kbptr.enable {
-        key = "m";
-        desc = "Mouse Warp";
-        cmd = "wl-kbptr";
-      };
   };
 }