feat(copyparty): create copyparty service for elcafe

This commit also adds the wlr-which-key shortcut for plock.

.sops.yaml

@@ -1,4 +1,6 @@
 keys:
+  - &elcafe age1tkywsvddjj6r6ukuqgz9aql92jfx85rz57dhmkkndysh6yx6p5rs0zj0qr
+  - &elcafe-host age17p69ktg7yfzgdsk00f32mupe4n4fevdpw2wsv7ft30yvpeseau6s7t0zdg
   - &gampo age1ajemtm502nn2n4q7v4j8meyd5mxtcqngkkedxq2pqzuwu78zp93qnw8q48
   - &gampo-host age197lfdanym647wdaz9uy8hrfqjwj9fs8rm7vs3fsrctceu8mr9gms2jedhz
   - &marpa age17pn6suvz2f7zmrm9zxj5hr0putvcvdamqxqt7ewhncgg6ccgmp2qr00xm2
@@ -19,3 +21,5 @@ creation_rules:
       - *tilo-host
       - *NaroMk3
       - *NaroMk3-host
+      - *elcafe
+      - *elcafe-host

README.md

@@ -20,7 +20,6 @@
 - **hosts/**: Contains the host-specific NixOS configurations.
 - **system/**: Holds system-wide configuration modules that can be shared across different hosts. This includes things like boot settings, desktop environments, hardware configurations, networking, packages, security, and system services.
 - **users/**: Manages user-specific configurations. It's split into `modules` for reusable home-manager configurations and `phundrak` for my personal configuration.
-- **keys/**: Public keys for various machines.
 - **secrets/**: Encrypted secrets managed with `sops-nix`.
 
 ## Usage

flake.lock

@@ -19,11 +19,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760971495,
+        "lastModified": 1767714506,
-        "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
+        "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=",
         "owner": "cachix",
         "repo": "cachix",
-        "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
+        "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768655473,
+        "lastModified": 1771987897,
-        "narHash": "sha256-iWnILPS2mP9ubbjRAhNv6Fqg1J/upxmD9OQTZQR4O2w=",
+        "narHash": "sha256-5pNQFGxG3fxS9pGnNBJjT76veotKIKq2XpAVFGAhCdI=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "7de6c6063119a7cef27c6bd4c88f2c5ac4cbc064",
+        "rev": "b0d68f0a1c48fa138d6fde94dcbecea801a86a01",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1769226446,
+        "lastModified": 1772330657,
-        "narHash": "sha256-YasBiXBgCkJ5oE6r9UtWXShD3OGtdRlioFErX5A1Z1Q=",
+        "narHash": "sha256-cWblprYsDUeAWA57xAqxIjNxXvDI/rqYn6TFp2OPi/k=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "8430fa572500382e187a49f1ac677bfdeb7edca2",
+        "rev": "278fd4a4ed1bfb42c3fe197ff38b587539c012aa",
         "type": "github"
       },
       "original": {
@@ -79,6 +79,27 @@
         "type": "github"
       }
     },
+    "copyparty": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772839279,
+        "narHash": "sha256-pAI7T/9Gl6SUTKmNZhtxYjBGnYPNzBLMgfqILfYa1Us=",
+        "owner": "9001",
+        "repo": "copyparty",
+        "rev": "31b23843f2d51049da00c821f2418d0c44389cd7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "9001",
+        "repo": "copyparty",
+        "type": "github"
+      }
+    },
     "devenv": {
       "inputs": {
         "cachix": "cachix",
@@ -92,11 +113,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769201893,
+        "lastModified": 1772819008,
-        "narHash": "sha256-x6VW1lQikNZAVm59gb3tzpDU5QCHT8U1e4dU11F2evY=",
+        "narHash": "sha256-1DpF5F7zgOZ7QrRjz23315pUoF532dHnsU/V4UQithk=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "685a86068d3a7f9b04e18340187e288413cb5887",
+        "rev": "9e5c17caf0ead1bb29d430d4c0a26a77bc5d374b",
         "type": "github"
       },
       "original": {
@@ -108,11 +129,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
+        "lastModified": 1767039857,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -129,11 +150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1772408722,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
         "type": "github"
       },
       "original": {
@@ -158,6 +179,21 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -188,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
+        "lastModified": 1772665116,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "narHash": "sha256-XmjUDG/J8Z8lY5DVNVUf5aoZGc400FxcjsNCqHKiKtc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "39f53203a8458c330f61cc0759fe243f0ac0d198",
         "type": "github"
       },
       "original": {
@@ -230,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769187349,
+        "lastModified": 1772807318,
-        "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=",
+        "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb",
+        "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
         "type": "github"
       },
       "original": {
@@ -269,11 +305,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769197468,
+        "lastModified": 1772748357,
-        "narHash": "sha256-EhbVSjqhjykjIzF1FetpEwxjSMXg4ubHpkuEnE0y23A=",
+        "narHash": "sha256-vtf03lfgQKNkPH9FdXdboBDS5DtFkXB8xRw5EBpuDas=",
         "owner": "cachix",
         "repo": "nix",
-        "rev": "6174571301a92afce9b7296d5babdc56972695b7",
+        "rev": "41eee9d3b1f611b1b90d51caa858b6d83834c44a",
         "type": "github"
       },
       "original": {
@@ -290,11 +326,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765267181,
+        "lastModified": 1772341813,
-        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "narHash": "sha256-/PQ0ubBCMj/MVCWEI/XMStn55a8dIKsvztj4ZVLvUrQ=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
+        "rev": "a2051ff239ce2e8a0148fa7a152903d9a78e854f",
         "type": "github"
       },
       "original": {
@@ -317,11 +353,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1763964548,
+        "lastModified": 1772441848,
-        "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=",
+        "narHash": "sha256-H3W5PSJQTh8Yp51PGU3GUoGCcrD+y7nCsxYHQr+Orvw=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e",
+        "rev": "c896f916addae5b133ee0f4f01f9cd93906f62ea",
         "type": "github"
       },
       "original": {
@@ -332,11 +368,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1772624091,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
         "type": "github"
       },
       "original": {
@@ -346,41 +382,9 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1768564909,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pumo-system-info": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -408,11 +412,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768689040,
+        "lastModified": 1771926182,
-        "narHash": "sha256-Tlnr5BulJcMers/cb+YvmBQW4nKHjdKo9loInJkyO2k=",
+        "narHash": "sha256-QbXuSLhiSxOq6ydBL3+KGe1aiYWBW+e3J6qjJZaRMq0=",
         "ref": "refs/heads/master",
-        "rev": "7a427ce1979ce7447e885c4f30129b40f3d466f5",
+        "rev": "cddb4f061bab495f4473ca5f2c571b6c710efef7",
-        "revCount": 729,
+        "revCount": 744,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -424,6 +428,7 @@
     "root": {
       "inputs": {
         "caelestia-shell": "caelestia-shell",
+        "copyparty": "copyparty",
         "devenv": "devenv",
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
@@ -463,11 +468,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768863606,
+        "lastModified": 1772495394,
-        "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=",
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
         "type": "github"
       },
       "original": {
@@ -478,15 +483,17 @@
     },
     "spicetify": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1768656845,
+        "lastModified": 1772494187,
-        "narHash": "sha256-xNlXMyn7yc3Z/NOsz4NchO7gWFwsoCvtJ26pys4s2/M=",
+        "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "8bd7e49d5ac62756bee6e4b02221fb96bfc3c99a",
+        "rev": "915ab06b046d05613041780c575c62a32fe67cea",
         "type": "github"
       },
       "original": {
@@ -497,14 +504,16 @@
     },
     "srvos": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1769046412,
+        "lastModified": 1772799438,
-        "narHash": "sha256-LbjKkSB4Nar9pX+AxHs2FGH2ZAFpKWUvr79uyEhFVqc=",
+        "narHash": "sha256-81/Ow6L5azplWp9p8gtl/Q1m5s2gCX4iuKNF5ujwxBA=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "a78abbc16a5352ee848e454c99166c97415fbf39",
+        "rev": "e6ec80588a07aea2cdb67c2865759e02d85b94b2",
         "type": "github"
       },
       "original": {
@@ -572,11 +581,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769228180,
+        "lastModified": 1772685307,
-        "narHash": "sha256-94KY0JNjdd3CcSyKlHPCPswlqmUrWT6+MfOHektsdB8=",
+        "narHash": "sha256-5xthZHeqwBeXNhnRIlxnCuaZLky0SZ6vQsxtd+eqhTU=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "ef1663c14b7c3c2b84bcf140232534be5a2a0257",
+        "rev": "dc92d88524ee83308795bc90f6a9f1d965265aaa",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,7 +2,7 @@
   description = "Home Manager configuration of phundrak";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
 
     devenv = {
       url = "github:cachix/devenv";
@@ -19,13 +19,18 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    pumo-system-info = {
+    caelestia-shell = {
-      url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
+      url = "github:caelestia-dots/shell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    caelestia-shell = {
+    copyparty = {
-      url = "github:caelestia-dots/shell";
+      url = "github:9001/copyparty";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    pumo-system-info = {
+      url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -34,9 +39,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    spicetify.url = "github:Gerg-L/spicetify-nix";
+    spicetify = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    srvos.url = "github:nix-community/srvos";
+    srvos = {
+      url = "github:nix-community/srvos";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
@@ -94,6 +105,7 @@
       defaultUserModules = [
         inputs.sops-nix.homeManagerModules.sops
         inputs.spicetify.homeManagerModules.default
+        inputs.caelestia-shell.homeManagerModules.default
       ];
       withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]);
     in {
@@ -101,19 +113,21 @@
         inherit extraSpecialArgs pkgs;
         modules = withUserModules ./users/phundrak/host/alys.nix;
       };
+      "creug@elcafe" = home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs pkgs;
+        modules = withUserModules ./users/creug/host/elcafe.nix;
+      };
+      "phundrak@elcafe" = home-manager.lib.homeManagerConfiguration {
+        inherit extraSpecialArgs pkgs;
+        modules = withUserModules ./users/phundrak/host/elcafe.nix;
+      };
       "phundrak@gampo" = home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs pkgs;
-        modules = withUserModules [
+        modules = withUserModules ./users/phundrak/host/marpa.nix;
-          inputs.caelestia-shell.homeManagerModules.default
-          ./users/phundrak/host/marpa.nix
-        ];
       };
       "phundrak@marpa" = home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs pkgs;
-        modules = withUserModules [
+        modules = withUserModules ./users/phundrak/host/marpa.nix;
-          inputs.caelestia-shell.homeManagerModules.default
-          ./users/phundrak/host/marpa.nix
-        ];
       };
       "phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs pkgs;
@@ -129,6 +143,7 @@
       specialArgs = {inherit inputs outputs;};
       defaultSystemModules = [
         inputs.sops-nix.nixosModules.sops
+        inputs.copyparty.nixosModules.default
       ];
       withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]);
     in {
@@ -136,6 +151,10 @@
         inherit specialArgs;
         modules = withSystemModules ./hosts/alys/configuration.nix;
       };
+      elcafe = nixpkgs.lib.nixosSystem {
+        inherit specialArgs;
+        modules = withSystemModules ./hosts/elcafe/configuration.nix;
+      };
       gampo = nixpkgs.lib.nixosSystem {
         inherit specialArgs;
         modules = withSystemModules ./hosts/gampo/configuration.nix;

hosts/alys/configuration.nix

@@ -20,10 +20,7 @@
       domain = "phundrak.com";
       id = "41157110";
     };
-    packages.nix = {
+    packages.nix.gc.automatic = true;
-      gc.automatic = true;
-      trusted-users = ["root" "phundrak"];
-    };
     services = {
       endlessh.enable = true;
       ssh = {
@@ -34,7 +31,10 @@
     };
     users = {
       root.disablePassword = true;
-      phundrak.enable = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
     };
   };
   system.stateVersion = "23.11";

hosts/elcafe/configuration.nix

@@ -0,0 +1,90 @@
+{
+  inputs,
+  config,
+  ...
+}: {
+  imports = [
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+    ../../system
+  ];
+
+  sops.secrets = {
+    "elcafe/traefik/env".restartUnits = ["traefik.service"];
+    "elcafe/traefik/dynamic".restartUnits = ["traefik.service"];
+    "elcafe/copyparty/passwords/creug" = {
+      restartUnits = ["copyparty.service"];
+      owner = "creug";
+    };
+    "elcafe/copyparty/passwords/phundrak" = {
+      restartUnits = ["copyparty.service"];
+      owner = "phundrak";
+    };
+  };
+
+  mySystem = {
+    boot = {
+      kernel = {
+        hardened = true;
+        cpuVendor = "intel";
+      };
+      grub = {
+        enable = true;
+        device = "/dev/sdh";
+      };
+      zfs = {
+        enable = true;
+        pools = ["tank"];
+      };
+    };
+    dev.docker = {
+      enable = true;
+      storage = "/tank/docker/";
+    };
+    misc.keymap = "fr";
+    networking = {
+      hostname = "elcafe";
+      id = "501c7fb9";
+    };
+    packages.nix.gc.automatic = true;
+    services = {
+      endlessh.enable = true;
+      ssh = {
+        enable = true;
+        allowedUsers = ["phundrak"];
+        passwordAuthentication = true;
+      };
+      traefik = {
+        enable = false;
+        environmentFiles = [config.sops.secrets."elcafe/traefik/env".path];
+        dynamicConfigFile = config.sops.secrets."elcafe/traefik/dynamic".path;
+      };
+    };
+    users = {
+      root.disablePassword = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
+      creug = {
+        enable = true;
+        sudo = true;
+      };
+    };
+  };
+
+  services.copyparty = import ./copyparty.nix {
+    passwordFiles = {
+      creug = config.sops.secrets."elcafe/copyparty/passwords/creug".path;
+      phundrak = config.sops.secrets."elcafe/copyparty/passwords/phundrak".path;
+    };
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It's perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.11"; # Did you read the comment?
+}

hosts/elcafe/copyparty.nix

@@ -0,0 +1,23 @@
+{passwordFiles}: {
+  enable = true;
+  user = "creug";
+  group = "users";
+  accounts = {
+    creug.passwordFile = passwordFiles.creug;
+    phundrak.passwordFile = passwordFiles.phundrak;
+  };
+  volumes = {
+    "/plex" = {
+      path = "/plex";
+      access.rwmd = ["creug" "phundrak"];
+      flags = {
+        e2dsa = true;
+        e2ts = true;
+        xdev = true;
+        xvol = true;
+        dedup = true;
+        nohash = "\\.iso$";
+      };
+    };
+  };
+}

hosts/elcafe/hardware-configuration.nix

@@ -0,0 +1,42 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = ["ahci" "xhci_pci" "ehci_pci" "megaraid_sas" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
+      kernelModules = [];
+    };
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/d2e703f7-90e0-43e7-9872-ce036f201c4b";
+    fsType = "ext4";
+  };
+
+  swapDevices = [];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno3.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno4.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/gampo/configuration.nix

@@ -33,6 +33,7 @@
     };
     hardware = {
       bluetooth.enable = true;
+      fingerprint.enable = true;
       input = {
         corne.allowHidAccess = true;
         ibmTrackpoint.disable = true;
@@ -49,8 +50,8 @@
       appimage.enable = true;
       flatpak.enable = true;
       nix = {
+        gc.automatic = true;
         nix-ld.enable = true;
-        trusted-users = ["root" "phundrak"];
       };
     };
     programs.steam.enable = true;
@@ -60,7 +61,10 @@
     };
     users = {
       root.disablePassword = true;
-      phundrak.enable = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
     };
   };
 

hosts/marpa/configuration.nix

@@ -46,11 +46,14 @@
 
   mySystem = {
     boot = {
-      extraModprobeConfig = ''
-        options snd_usb_audio vid=0x1235 pid=0x8212 device_setup=1
-      '';
       plymouth.enable = true;
-      kernel.cpuVendor = "amd";
+      kernel = {
+        cpuVendor = "amd";
+        v4l2loopback.enable = true;
+        extraModprobeConfig = ''
+          options snd_usb_audio vid=0x1235 pid=0x8212 device_setup=1
+        '';
+      };
       systemd-boot = true;
     };
     desktop = {
@@ -98,25 +101,25 @@
     packages = {
       appimage.enable = true;
       flatpak.enable = true;
-      nix = {
+      nix.nix-ld.enable = true;
-        nix-ld.enable = true;
-        trusted-users = ["root" "phundrak"];
-      };
     };
     programs.steam.enable = true;
     services = {
       fwupd.enable = true;
+      languagetool.enable = true;
       printing.enable = true;
       ssh.enable = true;
       sunshine = {
         enable = true;
         autostart = true;
       };
-      languagetool.enable = true;
     };
     users = {
       root.disablePassword = true;
-      phundrak.enable = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
     };
   };
 

hosts/naromk3/configuration.nix

@@ -29,10 +29,7 @@
         ];
       };
     };
-    packages.nix = {
+    packages.nix.gc.automatic = true;
-      gc.automatic = true;
-      trusted-users = ["phundrak"];
-    };
     services = {
       endlessh.enable = false;
       ssh = {
@@ -44,7 +41,10 @@
     };
     users = {
       root.disablePassword = true;
-      phundrak.enable = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
     };
   };
 

hosts/naromk3/hardware-configuration.nix

@@ -10,25 +10,31 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
+  boot = {
-  boot.initrd.kernelModules = [];
+    initrd = {
-  boot.kernelModules = [];
+      availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
-  boot.extraModulePackages = [];
+      kernelModules = [];
-
+    };
-  fileSystems."/" = {
+    kernelModules = [];
-    device = "/dev/disk/by-uuid/28b965a5-940b-4990-87fe-039c9f373bf0";
+    extraModulePackages = [];
-    fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/EBAD-6B85";
+    "/" = {
-    fsType = "vfat";
+      device = "/dev/disk/by-uuid/28b965a5-940b-4990-87fe-039c9f373bf0";
-    options = ["fmask=0022" "dmask=0022"];
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/tank" = {
+    "/boot" = {
-    device = "/dev/disk/by-uuid/ed00871e-a14a-428f-b6e4-5b56febd756a";
+      device = "/dev/disk/by-uuid/EBAD-6B85";
-    fsType = "ext4";
+      fsType = "vfat";
+      options = ["fmask=0022" "dmask=0022"];
+    };
+
+    "/tank" = {
+      device = "/dev/disk/by-uuid/ed00871e-a14a-428f-b6e4-5b56febd756a";
+      fsType = "ext4";
+    };
   };
 
   swapDevices = [];

hosts/tilo/configuration.nix

@@ -30,10 +30,7 @@
         ];
       };
     };
-    packages.nix = {
+    packages.nix.gc.automatic = true;
-      gc.automatic = true;
-      trusted-users = ["root" "phundrak"];
-    };
     services = {
       calibre.enable = true;
       endlessh.enable = true;
@@ -50,7 +47,10 @@
     };
     users = {
       root.disablePassword = true;
-      phundrak.enable = true;
+      phundrak = {
+        enable = true;
+        trusted = true;
+      };
     };
   };
 

packages/handy.nix

@@ -0,0 +1,24 @@
+# https://handy.computer/
+{
+  appimageTools,
+  fetchurl,
+  lib,
+}: let
+  name = "Handy";
+  pname = lib.strings.toLower name;
+  version = "0.7.7";
+  src = fetchurl {
+    url = "https://github.com/cjpais/${name}/releases/download/v${version}/${name}_${version}_amd64.AppImage";
+    hash = "sha256-76Hno39I3+46blnVW6XWwg944vF5n7IdMYXGMlYMNb0=";
+  };
+  appimageContent = appimageTools.extractType2 {inherit pname version src;};
+in
+  appimageTools.wrapType2 {
+    inherit pname version src;
+    extraPkgs = pkgs: [pkgs.wtype];
+    extraInstallCommands = ''
+      install -m 444 -D ${appimageContent}/${name}.desktop $out/share/applications/${name}.desktop
+      install -m 444 -D ${appimageContent}/${name}.png $out/share/icons/hicolor/256x256/apps/${name}.png
+      install -m 444 -D ${appimageContent}/${pname}.png $out/share/icons/hicolor/256x256/apps/${pname}.png
+    '';
+  }

packages/inkdrop.nix

@@ -0,0 +1,149 @@
+# https://www.inkdrop.app/
+{
+  lib,
+  fetchurl,
+  stdenv,
+  autoPatchelfHook,
+  makeWrapper,
+  wrapGAppsHook3,
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libdrm,
+  libnotify,
+  libpulseaudio,
+  libsecret,
+  libuuid,
+  libxkbcommon,
+  mesa,
+  nspr,
+  nss,
+  pango,
+  systemd,
+  libx11,
+  libxscrnsaver,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxtst,
+  libxcb,
+  libxkbfile,
+  libxshmfence,
+}:
+stdenv.mkDerivation rec {
+  pname = "inkdrop";
+  version = "5.11.8";
+
+  src = fetchurl {
+    url = "https://dist.inkdrop.app/v${version}/${pname}_${version}_amd64.deb";
+    hash = "sha256-8aJSeUi5K9PgNJvfYAtnRnI2t+vM10jiqVAZmX+zni0=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    cairo
+    cups
+    dbus
+    expat
+    gdk-pixbuf
+    glib
+    gtk3
+    libdrm
+    libnotify
+    libpulseaudio
+    libsecret
+    libuuid
+    libxkbcommon
+    mesa
+    nspr
+    nss
+    pango
+    systemd
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
+    libxcb
+    libxkbfile
+    libxshmfence
+  ];
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  # Ignore musl dependency since we're using glibc
+  autoPatchelfIgnoreMissingDeps = ["libc.musl-x86_64.so.1"];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    # Extract deb file manually to avoid setuid issues
+    ar x $src
+    tar xf data.tar.xz --no-same-permissions --no-same-owner
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Create output directories
+    mkdir -p $out/bin $out/share
+
+    # Copy the main application
+    cp -r usr/lib/inkdrop $out/share/inkdrop
+
+    # Copy desktop file and icon
+    cp -r usr/share/applications $out/share/
+    cp -r usr/share/pixmaps $out/share/
+
+    # Fix desktop file to use absolute paths
+    substituteInPlace $out/share/applications/inkdrop.desktop \
+      --replace-quiet "Exec=inkdrop" "Exec=$out/bin/inkdrop" \
+      --replace-quiet "Icon=inkdrop" "Icon=$out/share/pixmaps/inkdrop.png"
+
+    # Create wrapper script in bin
+    makeWrapper $out/share/inkdrop/inkdrop $out/bin/inkdrop \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Notebook app for Markdown lovers";
+    homepage = "https://www.inkdrop.app/";
+    license = licenses.unfree;
+    maintainers = [];
+    platforms = ["x86_64-linux"];
+    mainProgram = "inkdrop";
+  };
+}

secrets/secrets.yaml

@@ -1,85 +1,111 @@
-extraHosts: ENC[AES256_GCM,data:buAUbxVALT7zjwYfySVQ7E6RsI4EaVBUFN/ZXOuSaj42DLoLPM45PSgkxjner9o4g6a3s58Snp3siO8l0KPSTYyPUPBZ7dgbCcsWp5t8Q3K111d4TPTlx+gcluK5BvwNvFB4esRXJOgpm5jK498COKq/UZJECM0D5Emid0CKkzZynUYdbQeHkQEKIXV2LxJNro87xHtU/l11nox37Na0+t+eqp8/jcQh9pGnKmppPhviJeCy6GoiDPNFHDalQUmd204gi6EaTx0p3r7gRK61RfTwSCiX1Y7N5muzPvJQJt8lwgqznw5Etjud8wn6HF+fmb/BbYtioO9TjOVJnjVOlB4iUMApx3XY4VOuBPJm7D9ET+2J8Umw4OD5pB9A5WF+gVseAqYYNZYpe2hlHBoXMw4IZh8qOgxR/noE71PHxRe5gSB/2Hq0lKwG0e8lyFEeJKZdXsl47CtQE39RfC/+ik2COaRmYxY8fHHs2/yTylopv/pSM6K2TGF5B3dwVS18LU5AR48C1Ip7CseMgjgAWvjQ43KBc+P74a+237tlRFlFsU3HNk9Hk4fF53DPUX67+l42W6sNcgrszFHb/dm939qDKYqdNcWEjaaVSdDo34I6NGhmTUI7FxCVYipe,iv:SehibPtT3k9Ufen8Gri3HcFthUe0S7dMT+486fwOK0w=,tag:oatCeFr2j3EPHwXc6eU66w==,type:str]
+elcafe:
+    copyparty:
+        passwords:
+            creug: ENC[AES256_GCM,data:bWiDsIB9xbCC8N3VNzoXQ/ciyh5LyX5gaH5HrCR1n18=,iv:UOUUs/dXMQ4gF5x1UZuSs/DZh14OErWq1EJjv1B5+No=,tag:gMrL7RlaIegw+gXE4Du0KQ==,type:str]
+            phundrak: ENC[AES256_GCM,data:0kdrtlw2KeF4ZGqhejdnf1j59Lm5Gchh+wka2lOf8jU=,iv:4XG7M6oqRL0ZQiWMBe4oQ+mHjONkvuIXGa6m2Zqfd/A=,tag:A54LlE+7W2wXYn3HfCfBDw==,type:str]
+    traefik:
+        env: ENC[AES256_GCM,data:HUdWGYoEPp2v8dnDuVsl7YmPxuBfHmXzGrvKWeiqPlmAwMqVZrZ1j8on/7QKvYDJoTJ40XY2qNynSA==,iv:Vgc/fZERnNp7hSMeRd9EgB3IenKAFTAhwC0bk8CX4DE=,tag:SdfhOST/o29Lt1zRdXXRyQ==,type:str]
+        dynamic: ENC[AES256_GCM,data:BKsjTfqpZhrocHOUfxjCNS61DVb1oSdPW99IrwmNjpFcs68WvyfD0+QZ9F362L88CQDTnDSXWAbc7mcBtxhqfhkjtsdxkhtLHMGG0WxlnYungTnROh9EDJRLNyjy/RCYWOIVOXIEUE5lLwnQkboZLEiruw1Ri+r27WYmGpD5DaR4XWDankb6BQPJA6f2ziPyynjNYZaRhMIQUDFLM3QRAXPYD00eaYIQtx253z8Uocz4LpOw2JReAQkI2zc+6Oe1O4fP/Cg8klF0owR6NkNUWoIUVwLqFmU7Yr45VO+T/f96Ev0hlDaMklxYJGNOS8kRbSqpaiuMCmL2mQ6rsZGFVfdMdImSL2j51lrPFJCsg/hNGXHAxQ0/OpHtcZz/cwn5nSHBXg6gX21kOpkWGY1+BRA15X0k5sUqXkZWjkP9wkSCV6pQTbr8a3GrX2VvGwguAC4EpTCkCobXw/d9a7bMfZFeJqFhwjpU/dfBi6OjF7bniOQ7k3+5RZRDqAxJiPaBk7NKVN1FzUCvFBjKifbfICOJaPJr1CmayNuBZtsSlj0MXBYx8D8oShzhsCo/+pyni4poMYyfNC9jQKWCBsjKEa6eWb1+TfOHv4W+lSlBFg3vGm4NDxCPnACKWlhKB4WoJGRHqnp809XF2fqP4lZN8S7+sB2rhNlr2CICk9oM80FNmW/8TTtIgbpfEeFeJwNTM+S95cFSqaIRg3kfcqB/bHG37BYthcL1SC85/lxhL2LJ/O0qXxbioyxVAaBIumAO8BB1qrdbOozHZZAU1IIKylDWMWUoJMyMdhMGnOxxxWcbV2jPUXUv03DYNp3G/5F2Hlr+h0bPIJEFZ2kb14wTK+25MsgfBgky26f8qjNwROqKA+bPeB2yUKSSCJb//PzzE4xyqu1mq2/1zTal0eSRTCEnAUCj0wDqCLBMO6GnL0PS4PtGJ9n/IbOjFXZeixWGJzUTcmxPAmsClH6FV8brEMVs5bfrjLieXQvcn0b8b9/1W2jV4dJGUE1TxUQ2B92VG7PrA39O/FO8tQJZrAMXO9iMv495w0Nxbt0HYN6wsFTUwlQ+3DCXxgmmVBqVSf1OtHuhxcznl1oR+sgPSgBRLVB22mv5677ErQGCWp1luyPSF6xvhIaKe9BDwxBwJ+RsqSn4w5t1qJM9uYqFunSJPY5439B4zWG+lUy1ZDNn1oHUaX3hZUhzc9tEm+0CWFNXxH2hiRFb2nYP6Pv/GNqjZCsflY0YYty0UJBqRELGpUO3Sd+zbyJmWtvDjto726/0jHB/jb0RVThUem0PzWmmIUth0ucKp0M7zqEWNyVPbvWOK6rWQW9eaW87bFeMhrD1PC+U0ilq9DKG1J3ldc0lEBrguc4fk72T3I62pw5KdGnsmB+FjAc8kdTFKhM52ylChsAnJGFu0LyBUgjGIzZ03XkO8RbYs/wzc9VQOvyikvB67wImXMu8PJDzMxXnu58y7C4U86kvLdUfYm5bz+MxZmXsDA1L7C4si6oLf7rOCfLLc4A1a/X/aMSk330SARW/UAZ/NaFDXhotYXZUSbr41Z6b0qRPZjjZfOkdeKxTp+r07+8oJpPOaIaaOIlNRkGyRCnbCGvJ4CuUfTQuywIefBHlawGzhsDvOKorWYTuim7MbJcd19bYMG6k8qqTQlNeHjZJaDLKJ/rnSAIGDSNYRP4uUUo0gqSp82E9bXUUn5VuFSPcJ55uvFXZD0f6tLZGIyUuG5tqw3xNQF2cA+4ZXzbxi6VIZQ+ahZELkoBR+dVXQ0yGkDJusNf61A1lfI2bd7JQnJ7YVhbF1gXNnDXdWO0F8zsnZyhSSJY3ZoXLdYn+v39+AxQvE3mpX7zNsk7+0WUHuqAh6JG6OBt7jF5OVwD3bfuQfDhPlfD7YOU5/C+rekDGXmfZOMXxadvQgWFcpHdgbV7NwKqdgj6pJDVoGO8/4HGtlb94/o6dtXzfheSLUhCUZ2Im81yduu8386fCYLHX/ZsP+CuuC2wlXQaSCgoODRXXDz7jsRcQNfW2ohmFT9iDn95NI5ylCgt49t2Cr06ft7Pd0tWjh69VQ8TjNlfqm3Sxlf/Gb9ihwOOytmbDv4bNKhpRIPC0jIZv3aaA7vgdLCbySVeMo1tfMx3Xvf6q8XqlsQ/HgwBxAMmjakIAukNwtU74oJ2AYpIO/Oc47081JR2sVtGWer6l7C8KMy9O0xYtABsofkc9kHQWtAvn82sSQTuI/UgD5ttfdfVZZaanHek3vgJyTYI3sPQDVJ6SXrC0a+fqMlTL7Jux/0B70gK1z46j5C54IBCChNa4CwXhvxofyoDgyF6DVC2qZxoKXGl1veQKJh68q9hCiDlYEpiwuRCs3j6uSUG4Rssc9TKfdY3AQltVrhykEORVEgZe1HWmlms=,iv:3G3geSZRziwGiKcUMVNZ7j5s/4YA6Uk7wCSb4aFNSMo=,tag:FxARskR9+wdV7/xCKP8UdA==,type:str]
+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:89vPpgJ53eYou01qgxfqxOO6G/raBA0Vzck31PLchE4Jhi6HcNnoW4wwhHW3pG0AfCu5sE1CuryhRpWTc62fXIBoenKiCiU7chFhBF0UNq3Fcie26l6hdEx+XYVcM/MNBBbkb8VZq1mR0sgGmUESuZVzeI3LMykF,iv:n+LxuijWCZGW2YacrYQ2QIF2BTSilLmJ72piFRK25vw=,tag:iOQatj2UJdlMvn6C40IILg==,type:str]
+    spotify: ENC[AES256_GCM,data:6i9BzQmlndnROuT1H2zgN/3I6hBiFf14BlcS+XL2PbTiiEQZe2yE3tnZo3KXU9S5CjS3MwxsVdytKOFMQt2s1bVjcibBhJzoKEQByaapdzn1mK3kQLdJfhPf4Hf9YZV9Dlc60ngS7ESLZakdFVlj4rlbV5XReLhK,iv:fYd78r4U0kTyq1TZjBVXkjdNiOQ29gLJ53kwTXsi8W0=,tag:oWaeOuzdHWS4joZAdeA2pg==,type:str]
-    bandcamp: ENC[AES256_GCM,data:Sas5Sk0gNaq2E1XnsK8lvaZEzsaFZKY+zDxvgTiqTm2hrI2BnWieRWcZV6u1yRKjLAhh1rdSYhnZJHWUGIAY9qnFOk4vUVUHLtxnkxO/bJN/sykc4qwXRg4/NNap+8TcsN/S1AFJYKmXYn1Otx/02wbMEzHIuw==,iv:VGC7COqF3goMyyJvasiT0yVxOk4QKLOuXd2FbHjuRwk=,tag:pvyX4Q+dvlWFkdSJzTlgwA==,type:str]
+    bandcamp: ENC[AES256_GCM,data:3uWlk1W6pgExsUkLpqpFXpMceYEdMfWMxNUq8iGEyq8/P3OAjzg7pvvPBGcVwmh4jSgNilRiqmmGrtYLwdqPUMlmbFB56K6ZLDIcC2yg2SRfulYcObvimOkIkx7ITr1u6jSzjMkTR5ekIlzlPBxFQzEfBbgdrQ==,iv:IY1VH/8vjNCPz8LGbYbyr5U3FcmhV+YhK3fHnLfWiak=,tag:lB78PRuEuFen54csc7jHIQ==,type:str]
-emailPassword: ENC[AES256_GCM,data:RXmfWKIm5CzZrqhT6bAPZdijByO1NvrSwN1YO4/huVQnQh5p1g==,iv:lh/mxH5sPce+to6TsK2f0SrpHJuuGUiKWzrNmQfJcY0=,tag:EyR7Nml7Jyh4Modsq7DuBw==,type:str]
+emailPassword: ENC[AES256_GCM,data:RUuXzEfkqu1hEg12vBko17MtvdcFIxPofB+nFOuuMdWqjqJgEg==,iv:725/ttk8jHmSIj16gqvLykOu8D8rUbzzvOyxyZx8Jds=,tag:jv1ZO14WsKyWFsfqzRzZPg==,type:str]
 ssh:
-    hosts: ENC[AES256_GCM,data:CnSHwOiLbrA3C902LrkyLKvZOd4Lv1RCBF+IVVbNcx1aCibpMHlFN6Ov+CFNrHG1ZVd3tarnZdGX5kScJJa0khDOVtrUF1gtvifqn1A9tUDP2M+iu3JrVxDw6cPeVyoxWL1hwuWwfO3zgApBGT3CvzAy9V85cNEdS7ukx08VRTgnM6rXYLJKLvjwaDnhnB43Am8XpZQkI0I6DkhCAQuGCrxsqtEE/mQXItZUGlOp/Al8B1XEs35b16odMJEextf85bnzpYYbpV9n4OCMTgoZ8ciQgTbi7u9FD8vmKs5W15pZvL4sxFIcbegn29SvRd7sfsotQ6xNgXHqAQtTa+VcUPA7bSjDw5KHs0iC8AkxdHwGL1kY0GSb992BIZ7PqKdNRLAikttGslFM98Ce6fpHQXj3soYYMdsm9vj7av1+P4N6SQ2cmhpVDrbnrmXQ5MT5gbQlecu32b0Yqf6rfjGyZ+SCZmMzTwAsEpHSnIgYPin38ztDsMMPaouxaTR8V1TXK715ITtA9ojrZhTBbWlaJWVybicc6tT164ZDKyurGdPHf2KrakkVYZghuCkWZWM/yc4GoW1o7/XxWnwQDkUvte8kPDwB2Rvc1jjG6SFvhdXouIqfNNxrdbSoFURBuouZIbfamVqU3MfSF0JRBrpRerA5tqrWYOPL4rXqsqGWyQ==,iv:92tBq0zjlJ44Ia5ug2zk9PgspWzA6QlT0A+j9T74T7U=,tag:XTB7zG14DsPw1uNXTpD7Bg==,type:str]
+    hosts: ENC[AES256_GCM,data:WTgCxNIyKTwFxDVlWkJcxrvUjYuVionDQSWgSqSc0SZ5mGbl228mv7Z6mXvwbN78+jIwTuuUtfmTsDoaUaSqyIReaXFsrIHAoCGoSMbJ10RiAbyDfCEH9vbHamAX22Ccfnyh7eUOb3AsAQo/pJs/95bdCpKEPy4SXcpB0tc+KpgrEijVLpRJFyB6UGl+2qg/hVfo8no5l4tZMUBxzS5KEU7pEEcA/SLfdVMM/4+aeVmJudxJPi3RsqnA8qORVpvJC0y/ln71OrFdRVrX4e47NEXzX2Hfr+hiFbW190xBp6a/kZypQl4vk4fzn8RUathQMOVmf1r4v7eJOYRWeGeZinZtQNe7SFWtiYc0pTbQ6GNyOMwzk3bMjlyzhlrTe1MqFqVbAHSsKk6ydpcjtXt4DgQ93IL4BU6emJu7HBFBOuQ9QWEvDubhB/0Y68BWUqGqY/2lPdllGJrXL87h5KJrLHSMyUX4mF9Je84aC0cv1N3d78kepo2wCz7jrfsxixT+qN7ufu/TurLloC6y2skOCmB+gcRo79Jzk4LRi+Zf+RWnWiXw5HsZWwO7so5JIDlgApkERif6vwup12jhdu+ZxcqFfjMt1wEFceS8YGNvUl0XWPgvmM9kdqn/4XXOYCnysbpcfZaBMGDOBUlbhLUybHdDzvGYV/kMU5m8xoXAjA==,iv:Gf2f71TluSEQtiHf7CIHE2tFX8N4Y17AjP1PnNuWuNA=,tag:sGmZR1lKbbOeEhPvrHHO8Q==,type:str]
 sops:
     age:
         - recipient: age1ajemtm502nn2n4q7v4j8meyd5mxtcqngkkedxq2pqzuwu78zp93qnw8q48
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLMG1wWDcrSjN0NjEzY05q
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2S3VaTmg3b2QxMGtVeStr
-            YVBWbXJ1ZTlMYkdxZmRMakNZdm9qQnFxYzBFClMzS3RUVzM1aVRoazhXNkxwZFdv
+            WWRpb0RhVFNWM3RJNEV4ZTdRVmJUa2d6YVZrCnFTOWwwTlNhc2hqM2pwZ1hkcWd1
-            OVVIQWlWS0dLS2puN0ZZVjNwaGpWeE0KLS0tIGtaVWJoZmN3bnFtbWt6RmhvUnpK
+            QlE2N0FtSGFFR1NHbzFOSzI5Um4rVTQKLS0tIEFaMHprc3Jlclk3MGtvc2NzZ3cr
-            NnlaM2VmdnRVQitxUXZueGxXeWdhQlkK99cfnUusVZO/icWY2pDLExVveLtf1xPp
+            blMrcWVSVFB3TVc0aTQ0RUYvbDFJS0kKmGisf9VDK2RPA1uQCK5udt7sdeDyh344
-            43QVMMWTnkF8fS1SyM6KT7T12gFOeCIxa06IDKs1AIvuOuaq6OxEhw==
+            IKhPHzEHAHjKEkE6sWc6TB/l8K3IfL9zdHQZ9ZqTvCiS8CBZOwPQeg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age197lfdanym647wdaz9uy8hrfqjwj9fs8rm7vs3fsrctceu8mr9gms2jedhz
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2SjlaZGdmNWZOKzRUYU5B
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTRzRqTzlzVWpGMVFEbjV5
-            NlpDeEREOUlkamhINnREeVFoYUJqSkNlc1U0CkU2QUpBTi9DUDI0RmV3M3U3Vmgv
+            R1RXS1RBMzZGaGZjUkFZc3RLb2JkSzlRQlJZCnp5c0pMOHBZUkhralArcUhLSmx5
-            UTJ5ZXBlaEcxeUtzUjcwcGw0MG9xKzAKLS0tIFpWeHRMWDlDekVMOWtLWFR2S05y
+            Uk41cGRUR3RxR1FYVHBWU3d6ZXJpcFUKLS0tIFdLclpadHV0QlRuYmJhYVZGWVc5
-            MHNUYUlJVHc4cnRwdGpKYXJOUE9ydWcKrJmvP3y+xVMGvS17iIzAzrKjvO4LAFOH
+            eHRMV2o0TXhoVkcyaXZqU0tsR0o2eDQKdYwEuPeQ1fntKQKIlOlxet+SJ0rT5I1y
-            mQV2c2WwZpNFYb63zwKKVxxRsTMCZjQviMXywCB7GRuUk1/aCEjZyA==
+            WDpfGZUVvghx5dwdd6EMq3sQUeoFSfjrlgIAwNtHRwMC19A68ubzhQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age17pn6suvz2f7zmrm9zxj5hr0putvcvdamqxqt7ewhncgg6ccgmp2qr00xm2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvMlUrWnFoZGZuZi8yVUJW
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUEtOZ3Zac01HTjVZVXNF
-            R1lJeUYydHZCMWZFeTZBNGVVRDQxTmlGZ0RjCmVKZ3BocEVLTUl3M1VoWjRvTi96
+            endFNVprclpJMmh1eTA2ZmVJRTJlbjI3dEVNCjA4K2U5QWlOdkI0R3JwbVpNRWJG
-            SzNaWUIrUkxpVjZPVytJTmNEV2g5SkkKLS0tIDlyY1E4T1cxSXNuZDFtT3lhdFVl
+            T0VQWS9uS2UrRVk0YU9VcGhSUkJ6S2sKLS0tIGJZY1VSM1o3QUR5Mk9vNmhsRWxr
-            c2pDd2hCUE9RWHRCN1pXZ2prRk9iNFEKFWnDpPTFbi/l+aJnILF5NWwXLdpzzA7P
+            YURQR2kxdExKR00vYVJMVVQxekdVOE0KDkPOMeCo1MoM5R89t1rsMWR/bGIx592Z
-            RWoYja2qWNyIH8+6p+hazvezEVOpGECK5EVCH1dkLv52utuznmwsYg==
+            wvbVmE/El4Z0QzuvXl0XK3CFlKGuwgNw5TvtQ9QZP1aAL3yN0+T5oQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1cnnpnglkvgw5ffv8qpgwpqvj203lh4uwt698y9mxjwklxt8nysmsa8hepn
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtMkZ6dC84cHY5ZGtOd0cv
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQQTV1dkxMK3dxbGhiTGJG
-            RERqSXI3ejB2andMcldDVmp2SjNVc1hzZlIwCmVoWEFwMXdtVUU3dTVZZ05mRkhB
+            bkVQTUFOU1I4SXAyV21PdThSZFNOTTA0cmpFCkpXcmRXdlE0eVRYWWErQUxSWFN4
-            Z2ZCMnY3SUlkV0xRQUVlUDE3VE1aTzgKLS0tIHdiYXh1aE5nb3FSZTlpdVNZOUlF
+            bjI5bkU1NE84V1FTNVZiYUpLSnhSL2cKLS0tIFl6YmxmM1JLSlpxcDcxTnRnT1k3
-            ZEpsL25rcGFZaXBaTXFKbjd2UFpYRzQKNytlpy3cD1OC3FOSfSADjMMzD9qcsLrg
+            M25EQU5zckVMa1VSK29iYW5PbHRJcVEK6+gstHbcPBdeRNvZa21nZB5sT1SdHWHs
-            A4w6NqhU8E1DJBln/AiElZ58AhzAb5okPsKRGWMQSb73XN0pLLRwXw==
+            8St5tYl5I3CxNWFgFjOrHqteRKc+ZTcj3euAJ6Wathbw0YMiA3gz0Q==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1g68hxv73llkyc7etzh499ztcrt93pwawy0n8p93px4taqu58mehsp88vjq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4M1hKditZLytKeVErbit5
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYRGYyUGhlL2NJelZTQ1g0
-            UEwyQW13bG1jakphRVA1WEd0WUtFa0I1UUc0ClV6NlUwRkZpZlhmY2t4RVliVExK
+            UEhJMFlkVmdlU1E2cGE2UHF2dytVYmhQMlIwCmdrOEZjUUFrQjMzK2FxVjF0NGY1
-            a2k4RkFFampEUUFkQVhvSWJwd1JPVVEKLS0tIDVzdGV4NFFveStkVUROWE1mUHAz
+            UStNT3ZXbEJlUGxzSXlBTmYwUzRIalEKLS0tIHFuWWIrTGN6eUxyNEhybHIydzRp
-            Z3R3MTRIRVZPc0pNVVhHYWhaSXdtbW8KorG+7fRAt1RT1fUD8Z4b2CJaIwCb+1br
+            cUFid1RwRXA4cExWd3poK2hEaVd5Q00KjjiEiQw2OxcGv/qDudLmbM6aysYhLTxi
-            Wt1E8hWeYVoHGnZuuJgrorv/GnqpRDkMrXix/qqGKuBlAgTDab5eYg==
+            Qjmh133pyznFs+pLVLdYnId42zvojAeuJD9cJYxuwwgPA2ZlKdSVrg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1awytvphvty4f9wmdn86xnjg9kgetqjx8qlwj5d2882t4fyyzy58s3vg5k4
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxTDRWRUJNelRPMitSTm1H
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRbUs1Qm1hUnJldDNZNUR0
-            U1FTY0xsTXZrWnF2VXdsQWNLcE5zeHJ6bGg4CkRZckY3Q0hBNTgxMUVDdUh3YWZS
+            N3d0YXp5NWtjV0xvc1ZrM3ArZllIbmJtRXpnCnp2TVRyQVFqNC9kWXpBa0NnbW9X
-            STgwOEZ5cGFkVHFEOWNnNjNONDZIZm8KLS0tIGg1TUZjbmQ5MFU2bG1sZFcycnRR
+            VVFONnNleG9wN2IwdkhSWjBObmVGd3cKLS0tIHVDVmVNazdLWUpOQVlTNFRwL1c5
-            cDVwRVIxeTVmcmJLekpXcG13cTZJVG8KwXR0NOiHcd0njWwRWzEyGf0vb1kXp766
+            bkdsaXNINEZpZjdMdHAwdElpWFQ0aW8K0guO/BF8hp1LDToVBFY5JKdz8WXOwK2P
-            FhBxX0RoUToq/UgTQGBWvEODrZTnNd/zXr1J8gA1TeacTEbkoWEkpA==
+            prGKdxPsTAfW8xTq97LHHRsLC7+4TVXnjF4LS4SM8EXIX9KCl5FIGA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1erkn7dd022e90ktyj66aux9j9xvl0uzd6ru5cmrjsvcm5rtr5pfs7q6k9h
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZQUwxenU2aFN5My9wcHpu
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ZEVtVzM0dFhJYWd5UXZO
-            c2prSCtvbW4xanlxZGhDT1dpT0V2ZUtmcGlvCkNrRkJ2OXVOSFhFcGxSYUdJMHBn
+            ajIzSFp1VENuSjlaYSs4ZUdBSS90aEoyM25JCnhrd0lyUVN0dEV5a2tQUjZwSlFx
-            M2VydHhVSW5MWTdvTW8vSWlXT3ZnV1UKLS0tIGpydEc5TXNpdXc4czVvNk54K0JO
+            eVlLT1kyejhuZDdGeHpDQnRMTllCSHMKLS0tIHZVS1JDVzBaaG1Oend1eDFiT1F4
-            RTlDblJHcUczdmtOdGc4VjUrYk1PTWMKVM07fdDfLWf4T3ELq8G4jsPhR4ZukOjP
+            NU1vREt6SXBWYU1xdW1JSm1uUGZQRVEKtaDeDNo817rXXoMkBHo0MZWtm4LayqwC
-            SATCHMTn3wG4qeGTI4R+4m4iqa3k7CFJUJapmBNHqXWOZeO5w9IonA==
+            NN8vbhGcgT+M+ehnmZ1HdPk8VWRvlQ+SMpG+a6DjK8BjYtAWcO16RQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age16crkeglm3j3f6rveylytuerptjf9mwtv3hl89ywkmnnvdkntfchsuvrsk5
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1SUtkZysyMU05Q0tlSHZh
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6eUFYSC82YVM1WVEwc2Fz
-            V21acktNUTA1SjBMNFJtcE9XVHVFWWFvcEhNCm9hRFY3QjZkTk05UTJXZkpyTytE
+            aEl3TG5oOFU5MUFhQ0JhbC9yRVYxOFo0bUVJCnpwQzMyZmN4ZTlNVW5pZTY5bkdY
-            N01WS3E1TERmcVlCTEluT2RoODR0RFUKLS0tIHpoNmkxNlc0YmcvTHBZNUZPRks0
+            bjhaSnFxS0Vrb3pHTlJkWjVvczBSOG8KLS0tIHlsbjhxODdvcnd4c21aWUNpK01M
-            VkdKMUVOemNhUnpYSFFocnZRQmxPaUEKgCne7JJRIuvFtDMtaqO21IKjRoDW8D+3
+            ZW1hTUFtVE15QzVIVU93ZExlUWZjYzAKUZj+/NtMHCPjFFqbJ/8b2ASljV6GEk6p
-            V5tGfZOQADuef3n8ZG1j5t1OtNNBu4PjpxZynGx3/nR7+FThsK4vMg==
+            FbqV9LezRZrfl9GXBVUpB4Oeb9v2yp151aSda07/AG5YO0/jRAV/Bg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-25T02:54:23Z"
+        - recipient: age1tkywsvddjj6r6ukuqgz9aql92jfx85rz57dhmkkndysh6yx6p5rs0zj0qr
-    mac: ENC[AES256_GCM,data:nIOwiSAT3YCRabbPwfO2XBFhb/qH5cFLsMUQUCUa7trBnLeerzWLpngB96T0ZkDmsVsdJLhfv5ZWWZlgIg+K9uIww+DzvK48B3+EyVpNCJ4cDfgz3gZXlnp41Eu8LSklQ+sk9lVFEbHNPPhbTliXma9Kr1ldkdP035lQmYXUz6Y=,iv:sp7oiTUvO/FchubMlCuaaWDpNO9+aLIyehjS9+8pEPw=,tag:/PvIJTM17nFi5YIq0b1LyQ==,type:str]
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxdjFYN01HcXZMNVBJckVm
+            eklKZHAxeWgvVlcwWk9yWUJpcFFBUnpUV0FZCi85dGE2L3d3OS9CdW5sL0pZTTM2
+            SFJkcUN0emh6S3hMenhCcXBhNWF6eVUKLS0tIExwNEVyRmpGRXRLMjgxY1dqbkxQ
+            bk04K1luNnJVTjZQY25KRXNSVG0venMK7uM4tqqmq/o4QgMlE/x/FXkQsPRkofNO
+            I6C93RYgp1OcGPH14Kmp5lXtK4/pdToaRnVXPGenDQJsFhwWCEI+Fg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age17p69ktg7yfzgdsk00f32mupe4n4fevdpw2wsv7ft30yvpeseau6s7t0zdg
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsOTFXaHE0SDRCTnE4di9N
+            S2JIbHF2a1pzNzU4UFIvQmpZMVpOUjJqd0RJClVxcTd3d05aRDN1RGVmWVpQS2lI
+            L1RVU3FUM3d4SU9pYXlwSko2RW5uWjgKLS0tIEplR1l1bGlad3p1ZkNBbFY3YmlM
+            dUpXZis2N2VyN0ZFbjlPRXdwRFQ1aHMKm1Mk6MPKxFmwdATCYUANRSY5rHKgmQer
+            LBlqqWKt1JiIUAYtazQeQ6KYxmjVlQPY7AZw2t+EhBEPrqbTL3vOiw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2026-03-07T17:19:05Z"
+    mac: ENC[AES256_GCM,data:hT4mPKLcIuAFmllJBYFXL5sGyMn95mYEv+eGVA+KQYm629YKSncgvn5g8elau/8HXR1O/bwQlkGmGr8VPeR/0KRb6TPCA4MrCwox38fy3ZLx2e0movVi/xIgKXIo5wYUq4Qm/pSo715limxGChxUxKtdEK/lmMkSnxyGmlkQtwM=,iv:XoOfhdK/CK6shUXhH4h14gtyqZqcqmTV6/R2jkynFr8=,tag:q3V0xcWQxjFi2drk5fLJoQ==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

system/boot/boot.nix

@@ -8,13 +8,6 @@ with lib; let
   cfg = config.mySystem.boot;
 in {
   options.mySystem.boot = {
-    extraModprobeConfig = mkOption {
-      type = types.lines;
-      default = "";
-      example = ''
-        options snd_usb_audio vid=0x1235 pid=0x8212 device_setup=1
-      '';
-    };
     kernel = {
       package = mkOption {
         type = types.raw;
@@ -29,12 +22,15 @@ in {
         type = types.enum ["intel" "amd"];
         default = "amd";
       };
-      v4l2loopback = mkOption {
+      v4l2loopback.enable = mkEnableOption "Enables v4l2loopback kernel module";
-        description = "Enables v4l2loopback";
-        type = types.bool;
-        default = true;
-      };
       hardened = mkEnableOption "Enables hardened Linux kernel";
+      extraModprobeConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          options snd_usb_audio vid=0x1235 pid=0x8212 device_setup=1
+        '';
+      };
     };
     systemd-boot = mkOption {
       type = types.bool;
@@ -44,7 +40,7 @@ in {
     grub = {
       enable = mkEnableOption "Does the system use GRUB? (Disables systemd-boot)";
       device = mkOption {
-        type = types.str;
+        type = types.path;
         description = "The GRUB device";
         default = "";
       };
@@ -64,6 +60,10 @@ in {
       then "amdgpu"
       else "i915"
     );
+    extraModprobeConfig =
+      strings.concatLines
+      ([cfg.kernel.extraModprobeConfig]
+        ++ lists.optional cfg.kernel.v4l2loopback.enable ''options v4l2loopback exclusive_caps=1 devices=1 video_nr=0 card_label="OBS Studio"'');
     loader = {
       systemd-boot.enable = cfg.systemd-boot;
       efi.canTouchEfiVariables = cfg.systemd-boot;
@@ -80,7 +80,6 @@ in {
     kernelModules =
       cfg.kernel.modules
       ++ ["kvm-${cfg.kernel.cpuVendor}"]
-      ++ lists.optional cfg.kernel.v4l2loopback "v4l2loopback"
       ++ lists.optional cfg.kernel.hardened "tcp_bbr";
     kernel.sysctl = mkIf cfg.kernel.hardened {
       "kernel.sysrq" = 0; # Disable magic SysRq key

system/default.nix

@@ -34,8 +34,9 @@ in {
 
   config = {
     boot.tmp.cleanOnBoot = true;
-    time.timeZone = cfg.timezone;
     console.keyMap = cfg.keymap;
+    time.timeZone = cfg.timezone;
+    environment.pathsToLink = ["/share/bash-completion" "/share/zsh"];
     services = {
       orca.enable = false;
       envfs.enable = true;

system/dev/docker.nix

@@ -12,6 +12,11 @@ in {
     podman.enable = mkEnableOption "Enable Podman rather than Docker";
     nvidia.enable = mkEnableOption "Activate Nvidia support";
     autoprune.enable = mkEnableOption "Enable autoprune";
+    storage = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/path/to/docker/storage";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -29,6 +34,9 @@ in {
         enable = true;
         enableNvidia = cfg.nvidia.enable;
         autoPrune.enable = cfg.autoprune.enable;
+        daemon.settings = mkIf (cfg.storage != null) {
+          "data-root" = cfg.storage;
+        };
       };
       podman = mkIf cfg.podman.enable {
         enable = true;

system/hardware/default.nix

@@ -1,8 +1,11 @@
-{
+{lib, ...}: {
   imports = [
     ./amdgpu.nix
     ./bluetooth.nix
+    ./fingerprint.nix
     ./sound.nix
     ./input
   ];
+
+  hardware.enableAllFirmware = lib.mkDefault true;
 }

system/hardware/fingerprint.nix

@@ -0,0 +1,13 @@
+{
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.mySystem.hardware.fingerprint;
+in {
+  options.mySystem.hardware.fingerprint.enable = mkEnableOption "Enable fingerprint reader";
+  config = mkIf cfg.enable {
+    hardware.facter.detected.fingerprint.enable = cfg.enable;
+  };
+}

system/network/tailscale.nix

@@ -13,7 +13,7 @@ in {
     };
   };
   config.services.tailscale = {
-    enable = cfg.enable;
+    inherit (cfg) enable;
     extraSetFlags = [
       "--accept-dns"
       "--accept-routes"

system/services/sunshine.nix

@@ -15,33 +15,53 @@ in {
     autoStart = cfg.autostart;
     capSysAdmin = true;
     openFirewall = true;
-    settings.sunshine_name = config.mySystem.networking.hostname;
+    settings = {
-    applications.apps = [
+      sunshine_name = config.mySystem.networking.hostname;
+      locale = "en_GB";
+      system_tray = "enabled";
+      output_name = 1;
+    };
+    applications.apps = let
+      defaultPrep = [
+        {
+          do = "sh -c \"hyprctl -i 0 keyword monitor \\\"DP-2,\${SUNSHINE_CLIENT_WIDTH}x\${SUNSHINE_CLIENT_HEIGHT}@\${SUNSHINE_CLIENT_FPS},0x0,1\\\"\"";
+          undo = "sh -c \"hyprctl -i 0 keyword monitor 'DP-2,2560x1080@60,0x0,1,transform,1'\"";
+        }
+      ];
+    in [
       {
         name = "Desktop";
         image-path = "desktop.png";
+        prep-cmd = defaultPrep;
       }
       {
         name = "Low Res Desktop";
         image-path = "desktop.png";
+        prep-cmd = defaultPrep;
       }
       {
         name = "Steam Big Picture";
         detached = ["setsid steam steam://open/bigpicture"];
-        prep-cmd = {
+        prep-cmd = defaultPrep;
-          do = "";
-          undo = "setsid steam steam://close/bigpicture";
-        };
         image-path = "steam.png";
       }
       {
         name = "OpenTTD";
         cmd = "openttd";
         image-path = "/home/phundrak/.config/sunshine/covers/igdb_18074.png";
+        prep-cmd = defaultPrep;
       }
       {
         name = "OpenMW";
         cmd = "openmw";
+        image-path = "/home/phundrak/.config/sunshine/covers/igdb_24775.png";
+        prep-cmd = defaultPrep;
+      }
+      {
+        name = "Vintage Story";
+        cmd = "flatpak run at.vintagestory.VintageStory";
+        image-path = "/home/phundrak/.config/sunshine/covers/igdb_69547.png";
+        prep-cmd = defaultPrep;
       }
     ];
   };

system/services/traefik.nix

@@ -8,18 +8,28 @@ with lib; let
 in {
   options.mySystem.services.traefik = {
     enable = mkEnableOption "Enable Traefik";
-    dataDir = mkOption {
-      type = types.path;
-      default = "/tank/traefik";
-    };
     email = mkOption {
       type = types.str;
       default = "";
     };
+    dataDir = mkOption {
+      type = types.path;
+      default = "/tank/traefik";
+      example = "/path/to/traefik/data";
+    };
+    environmentFiles = mkOption {
+      type = types.listOf types.path;
+      example = ["/var/traefik/traefik.env"];
+      default = [];
+    };
+    dynamicConfigFile = mkOption {
+      type = types.path;
+      default = "${cfg.dataDir}/traefik.yaml";
+      example = "/var/traefik/dynamic.yaml";
+    };
   };
   config.services.traefik = {
-    inherit (cfg) enable;
+    inherit (cfg) enable dynamicConfigFile environmentFiles;
-    dynamicConfigFile = "${cfg.dataDir}/dynamic_config.toml";
     staticConfigOptions = {
       api.dashboard = true;
       log = {
@@ -29,18 +39,18 @@ in {
       };
       accessLog.filePath = "${cfg.dataDir}/access.log";
       entryPoints = {
-        http = {
+        web = {
           address = ":80";
           asDefault = true;
           http.redirections.entrypoint = {
-            to = "https";
+            to = "websecure";
             scheme = "https";
           };
         };
-        https = {
+        websecure = {
           address = ":443";
           asDefault = true;
-          httpChallenge.entryPoint = "https";
+          httpChallenge.entryPoint = "websecure";
         };
       };
       providers.docker = {
@@ -53,6 +63,7 @@ in {
         dnsChallenge = {
           provider = "cloudflare";
           resolvers = ["1.1.1.1:53" "1.0.0.1:53"];
+          propagation.delayBeforeChecks = 60;
         };
       };
     };

system/users/creug.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.mySystem.users.creug;
+in {
+  options.mySystem.users.creug = {
+    enable = mkEnableOption "Enables user creug";
+    sudo = mkEnableOption "Make the user a superuser";
+    trusted = mkOption {
+      description = "Mark the user as trusted by Nix";
+      default = cfg.sudo;
+      example = true;
+    };
+  };
+
+  config = {
+    users.users.creug = mkIf cfg.enable {
+      isNormalUser = true;
+      description = "Greg";
+      extraGroups =
+        ["networkmanager" "dialout" "games" "audio" "input"]
+        ++ lists.optional config.mySystem.dev.docker.enable "docker"
+        ++ lists.optional config.mySystem.dev.docker.podman.enable "podman"
+        ++ lists.optional cfg.sudo "wheel";
+      shell = pkgs.zsh;
+      openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/creug/keys;
+    };
+    nix.settings = mkIf cfg.trusted {
+      trusted-users = ["creug"];
+    };
+  };
+}

system/users/default.nix

@@ -1,5 +1,8 @@
 {
   imports = [
+    ./creug.nix
     ./phundrak.nix
+    ./root.nix
   ];
+  programs.zsh.enable = true;
 }

system/users/phundrak.nix

@@ -5,27 +5,23 @@
   ...
 }:
 with lib; let
-  cfg = config.mySystem.users;
+  cfg = config.mySystem.users.phundrak;
 in {
-  options.mySystem.users = {
+  options.mySystem.users.phundrak = {
-    root.disablePassword = mkEnableOption "Disables root password";
+    enable = mkEnableOption "Enables user phundrak";
-    phundrak.enable = mkEnableOption "Enables users phundrak";
+    trusted = mkEnableOption "Mark the user as trusted by Nix";
   };
 
   config = {
-    users.users = {
+    users.users.phundrak = mkIf cfg.enable {
-      root = {
+      isNormalUser = true;
-        hashedPassword = mkIf cfg.root.disablePassword "*";
+      description = "Lucien Cartier-Tilet";
-        shell = pkgs.zsh;
+      extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"];
-      };
+      shell = pkgs.zsh;
-      phundrak = mkIf cfg.phundrak.enable {
+      openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../users/phundrak/keys;
-        isNormalUser = true;
+    };
-        description = "Lucien Cartier-Tilet";
+    nix.settings = mkIf cfg.trusted {
-        extraGroups = ["networkmanager" "wheel" "docker" "dialout" "podman" "plugdev" "games" "audio" "input"];
+      trusted-users = ["phundrak"];
-        shell = pkgs.zsh;
-        openssh.authorizedKeys.keyFiles = lib.filesystem.listFilesRecursive ../../keys;
-      };
     };
-    programs.zsh.enable = true;
   };
 }

system/users/root.nix

@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.mySystem.users.root;
+in {
+  options.mySystem.users.root.disablePassword = mkEnableOption "Disables root password";
+  config = {
+    users.users.root = {
+      hashedPassword = mkIf cfg.disablePassword "*";
+      shell = pkgs.zsh;
+    };
+  };
+}

users/creug/home.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.home.creug;
+in {
+  imports = [../modules];
+  options.home.creug = {
+    sshKey = {
+      content = mkOption {
+        type = types.nullOr types.str;
+        example = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+        default = null;
+      };
+      file = mkOption {
+        type = with types; nullOr path;
+        default = "/home/creug/.ssh/id_ed25519.pub";
+      };
+    };
+  };
+
+  config = {
+    nixpkgs.config.allowUnfree = true;
+
+    home = {
+      username = "creug";
+      homeDirectory = "/home/creug";
+      packages = [pkgs.tree pkgs.ncdu];
+      preferXdgDirectories = true;
+
+      creug.sshKey.file = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+
+      dev.vcs = {
+        jj.enable = false;
+        git.enable = true;
+        publicKey = cfg.sshKey;
+      };
+
+      security.ssh.enable = true;
+
+      shell = {
+        bash.enable = true;
+        zsh.enable = true;
+        starship.enable = true;
+        tmux.enable = false;
+        zoxide.enable = false;
+      };
+
+      stateVersion = "24.11"; # Do not modify!
+    };
+
+    manual.manpages.enable = true;
+  };
+}

users/creug/host/elcafe.nix

@@ -0,0 +1,8 @@
+{
+  imports = [../home.nix];
+  home = {
+    cli.nh.flake = "/home/creug/.dotfiles";
+    dev.editors.emacs.enable = false;
+    creug.sshKey.content = builtins.readFile ../keys/id_elcafe.pub;
+  };
+}

users/creug/keys/id_elcafe.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBdd4cNNhONjhuH4jWZ8Z8K1gbBmeDNqRybKRHMQEvZj gregoryfoulachon@googlemail.com

users/modules/cli/btop.nix

@@ -1,10 +1,20 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: let
+  inherit (config.home) gpuType;
+in {
   programs.btop = {
     enable = true;
-    package = pkgs.btop.override {
+    package =
-      rocmSupport = true;
+      if gpuType != null
-      cudaSupport = true;
+      then
-    };
+        pkgs.btop.override {
+          rocmSupport = gpuType == "amd";
+          cudaSupport = gpuType == "nvidia";
+        }
+      else pkgs.btop;
     settings = {
       color_theme = "${pkgs.btop}/share/btop/themes/nord.theme";
       cpu_bottom = false;

users/modules/cli/scripts/mp42webm.nix

@@ -1,3 +1,3 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "mp42webm" ''
-  ${pkgs.ffmpeg}/bin/ffmpeg -i "$1" -c:v libvpx -crf 10 -b:v 1M -c:a libvorbis "$1".webm''
+  ${pkgs.ffmpeg}/bin/ffmpeg -i "$1" -c:v libvpx -crf 10 -b:v 1M -c:a -hwaccel=auto libvorbis "$1".webm''

users/modules/cli/scripts/plock.nix

@@ -1,16 +1,40 @@
 {pkgs, ...}:
 pkgs.writeShellScriptBin "plock" ''
+  LOG_FILE="$HOME/.local/share/plock.log"
+
+  logger() {
+      local level="$1"
+      local message="$2"
+      local timestamp
+      timestamp=$(date +"%Y-%m-%d %H:%M:%S")
+      printf "[%s] [%-7s] %s\n" "$timestamp" "''${level^^}" "$message" >> "$LOG_FILE"
+  }
+
+  CAELESTIA_ACTIVE=$(systemctl --user is-active caelestia.service)
+  logger debug "Caelestia activity: $CAELESTIA_ACTIVE"
+  if systemctl --user is-active caelestia.service | grep 'active' &> /dev/null ; then
+      logger info "locking Caelestia session"
+      caelestia shell lock lock || \
+          logger error "failed to lock Caelestia session"
+      exit 0
+  fi
+
   TMPBG="/tmp/screen.png"
   if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+      logger info "wayland session detected"
       SCREENER=${pkgs.grim}/bin/grim
       LOCKER="${pkgs.swaylock}/bin/swaylock -feF"
   else
+      logger info "x11 session detected"
       SCREENER=${pkgs.scrot}/bin/scrot
       LOCKER="${pkgs.i3lock}/bin/i3lock -ef"
   fi
 
   $SCREENER "$TMPBG"
-  ${pkgs.corrupter}/bin/corrupter -add 0 "$TMPBG" "$TMPBG"
+  logger info "generating lock screen image"
+  ${pkgs.corrupter}/bin/corrupter -add 0 "$TMPBG" "$TMPBG" || logger error "failed to generate lock screen image"
+  logger info "locking screen"
+  logger debug "locking screen with command `''${SCREENER}`"
   $LOCKER -ti "$TMPBG"
   rm "$TMPBG"
 ''

users/modules/default.nix

@@ -17,7 +17,14 @@ in {
     ./shell
   ];
 
-  options.home.fullDesktop = mkEnableOption "Enable most modules";
+  options.home = {
+    fullDesktop = mkEnableOption "Enable most modules";
+    gpuType = mkOption {
+      type = types.nullOr (types.enum ["nvidia" "amd" "intel"]);
+      default = null;
+      example = "amd";
+    };
+  };
   config.home = {
     cli.fullDesktop = mkDefault cfg.fullDesktop;
     desktop.fullDesktop = mkDefault cfg.fullDesktop;

users/modules/desktop/caelestia.nix

@@ -52,6 +52,7 @@ in {
           wallpapers = true;
         };
       };
+      osd.enableMicrophone = true;
       bar = {
         status = {
           showAudio = true;
@@ -59,7 +60,9 @@ in {
         };
         tray.compact = true;
       };
-      services.gpuType = "amd";
+      services = mkIf (config.home.gpuType != null) {
+        inherit (config.home) gpuType;
+      };
       session.commands = {
         logout = ["uwsm" "stop"];
         shutdown = ["systemctl" "poweroff"];

users/modules/desktop/default.nix

@@ -13,7 +13,6 @@ in {
     ./kdeconnect.nix
     ./kitty.nix
     ./obs.nix
-    ./qt.nix
     ./rofi
     ./spotify.nix
     ./swaync.nix
@@ -30,10 +29,10 @@ in {
     kdeconnect.enable = mkDefault cfg.fullDesktop;
     kitty.enable = mkDefault cfg.fullDesktop;
     obs.enable = mkDefault cfg.fullDesktop;
-    qt.enable = mkDefault cfg.fullDesktop;
     rofi.enable = mkDefault cfg.fullDesktop;
     spotify.enable = mkDefault cfg.fullDesktop;
     spotify.spicetify.enable = mkDefault cfg.fullDesktop;
+    theme.enable = mkDefault cfg.fullDesktop;
     wlr-which-key.enable = mkDefault cfg.fullDesktop;
   };
 }

users/modules/desktop/hyprland.nix

@@ -64,8 +64,6 @@ in {
             "marpa" = [
               "DP-1, 3440x1440@144, 1080x550, 1"
               "DP-2, 2560x1080@60, 0x0, 1, transform, 1"
-              # "DP-2, 1366x768@60, 0x0, 1"
-              # "DP-2, 1829x1143@60, 0x0, 1"
             ];
             "gampo" = [];
           }."${cfg.host}";
@@ -172,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/qt.nix

@@ -1,11 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  cfg = config.home.desktop.qt;
-in {
-  options.home.desktop.qt.enable = mkEnableOption "Enable Qt support";
-  config.qt.enable = cfg.enable;
-}

users/modules/desktop/spotify.nix

@@ -6,8 +6,8 @@
   ...
 }:
 with lib; let
+  inherit (pkgs.stdenv.hostPlatform) system;
   cfg = config.home.desktop.spotify;
-  system = pkgs.stdenv.hostPlatform.system;
   spicePkgs = inputs.spicetify.legacyPackages.${system};
 in {
   options.home.desktop.spotify = {

users/modules/desktop/theme.nix

@@ -1,26 +1,33 @@
 {
   pkgs,
   config,
+  lib,
   ...
-}: {
+}:
-  gtk = {
+with lib; let
-    enable = true;
+  cfg = config.home.desktop.theme;
-    colorScheme = "dark";
+in {
-    iconTheme = {
+  options.home.desktop.theme.enable = mkEnableOption "Enable theme options";
-      name = "Nordzy-icons";
+  config = mkIf cfg.enable {
-      package = pkgs.nordzy-icon-theme;
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
+      iconTheme = {
+        name = "Nordzy-icons";
+        package = pkgs.nordzy-icon-theme;
+      };
+      theme = {
+        package = pkgs.nordic;
+        name = "Nordic";
+      };
     };
-    theme = {
+    home.pointerCursor = {
-      package = pkgs.nordic;
+      enable = true;
-      name = "Nordic";
+      gtk.enable = true;
+      hyprcursor.enable = config.home.desktop.hyprland.enable;
+      name = "Nordzy-cursors";
+      package = pkgs.nordzy-cursor-theme;
     };
+    qt.enable = true;
   };
-  home.pointerCursor = {
-    enable = true;
-    gtk.enable = true;
-    hyprcursor.enable = config.home.desktop.hyprland.enable;
-    name = "Nordzy-cursors";
-    package = pkgs.nordzy-cursor-theme;
-  };
-  qt.enable = true;
 }

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

@@ -21,7 +21,7 @@
   # Recursively filter out null values and convert kebab-case keys to snake_case
   filterNulls = value:
     if lib.isAttrs value
-    then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (n: v: v != null) value)
+    then lib.mapAttrs' (n: v: lib.nameValuePair (toSnakeCase n) (filterNulls v)) (lib.filterAttrs (_: v: v != null) value)
     else if lib.isList value
     then map filterNulls value
     else value;

users/modules/dev/ai/default.nix

@@ -8,15 +8,15 @@ with lib; let
   cfg = config.home.dev.ai;
 in {
   imports = [
-    ./ollama.nix
     ./claude.nix
+    ./ollama.nix
   ];
 
   options.home.dev.ai.enable = mkEnableOption "Enables AI features";
   config.home = mkIf cfg.enable {
     dev.ai = {
-      ollama.enable = mkDefault cfg.enable;
       claude.enable = mkDefault cfg.enable;
+      ollama.enable = mkDefault cfg.enable;
     };
     packages = [pkgs.lmstudio];
   };

users/modules/dev/vcs/jujutsu.nix

@@ -45,9 +45,8 @@ in {
         default-command = "st";
         pager = ":builtin";
         show-cryptographic-signatures = true;
-        conflict-marker-style = "git"; # Support for vc-jj.el
-        diff-formatter = ":git"; # Support for vc-jj.el
         diff-editor = ":builtin";
+        merge-editort = ":builtin";
         inherit (cfg) editor;
       };
       signing = mkIf cfg.signing.enable {
@@ -63,24 +62,41 @@ in {
         eject = ["squash" "--from" "@" "--into"];
         d = ["diff"];
         dm = ["desc" "-m"];
+        gc = ["git" "clone"];
+        gcc = ["git" "clone" "--colocate"];
         l = ["log"];
+        la = ["log" "-r" "::"];
         lc = ["log" "-r" "(remote_bookmarks()..@)::"];
         ll = ["log" "-T" "builtin_log_detailed"];
         open = ["log" "-r" "open()"];
         n = ["new"];
         nd = ["new" "dev()"];
         nt = ["new" "trunk()"];
+        revlog = ["evolog"];
         s = ["show"];
         tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
       };
+      colors.working_copy.underline = true;
+      git = {
+        private-commits = "blacklist()";
+        colocate = true;
+        subprocess = true;
+      };
       revset-aliases = {
+        "immutable_heads()" = "present(trunk()) | tags()";
+        # Resolves by default to latest main/master remote bookmarks
+        "trunk()" = "latest((present(main) | present(master)) & remote_bookmarks())";
+        # Same as trunk() but for `dev` or `develop` bookmarks
+        "dev()" = "latest((present(dev) | present(develop)) & remote_bookmarks())";
+
         "user(x)" = "author(x) | committer(x)";
         "gh_pages()" = "ancestors(remote_bookmarks(exact:\"gh-pages\"))";
-        "trunk()" = "latest((present(main) | present(master)) & remote_bookmarks())";
+
-        "dev()" = "latest((present(dev) | present(develop)) & remote_bookmarks())";
+        #Private and WIP commits that should never be pushed
         "wip()" = "description(glob:\"wip:*\")";
         "private()" = "description(glob:\"private:*\")";
         "blacklist()" = "wip() | private()";
+
         # stack(x, n) is the set of mutable commits reachable from
         # 'x', with 'n' parents. 'n' is often useful to customize the
         # display and return set for certain operations. 'x' can be
@@ -93,6 +109,7 @@ in {
         "open()" = "stack(dev().. & mine(), 1)";
         "ready()" = "open() ~ blacklist()::";
       };
+      remotes.origin.auto-track-bookmarks = "*";
     };
   };
 }

users/modules/media/mpv.nix

@@ -15,7 +15,7 @@ in {
       force-seekable = true; # force streams to be seekable
       slang = "jpn,jp,eng,en,fra,fr";
       alang = "eng,en,fra,fr";
-      gpu-api = "vulkan";
+      gpu-api = "auto";
       osc = true;
       profile = "gpu-hq";
       # geometry = "50%x50%";
@@ -44,7 +44,7 @@ in {
       encode
       inhibit-gnome
       mpris
-      mpv-cheatsheet
+      mpv-cheatsheet-ng
       quality-menu
       sponsorblock
       thumbfast

users/modules/shell/bash.nix

@@ -16,6 +16,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     eatIntegration = mkEnableOption "Enable Emacs Eat integration";
     bashrcExtra = mkOption {
       type = types.lines;
@@ -33,6 +38,7 @@ in {
           (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'')
           cfg.bashrcExtra
         ];
+      enableCompletion = cfg.autocompletion;
       shellAliases = cfg.aliases;
       shellOptions = [
         "histappend"

users/modules/shell/default.nix

@@ -88,6 +88,10 @@ in {
       default = {};
       example = {la = "ls -a";};
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = true;
+    };
   };
   config.home.shell = {
     enableShellIntegration = cfg.bash.enable or cfg.zsh.enable or cfg.fish.enable;

users/modules/shell/fish.nix

@@ -17,6 +17,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     extraShellInit = mkOption {
       type = types.lines;
       default = "";
@@ -26,6 +31,7 @@ in {
   config = lib.mkIf cfg.enable {
     programs.fish = {
       enable = true;
+      generateCompletions = cfg.autocompletion;
       shellAbbrs = cfg.abbrs;
       preferAbbrs = true;
       shellInit = with lib;

users/modules/shell/zsh.nix

@@ -17,6 +17,11 @@ in {
         lns = "ln -si";
       };
     };
+    autocompletion = mkOption {
+      type = types.bool;
+      default = config.home.shell.autocompletion;
+      example = true;
+    };
     eatIntegration = mkEnableOption "Enable Emacs Eat integration";
     zshrcExtra = lib.mkOption {
       type = types.lines;
@@ -32,7 +37,7 @@ in {
         enable = true;
         strategy = ["match_prev_cmd" "completion"];
       };
-      enableCompletion = true;
+      enableCompletion = cfg.autocompletion;
       enableVteIntegration = true;
       history = {
         findNoDups = true;

users/phundrak/email.nix

@@ -8,6 +8,7 @@
 
     @@@ Sauvez un arbre, mangez un castor @@@
     @@@     Save a tree, eat a beaver     @@@
+    @@@       Bjarg tré, et bjórr         @@@
   '';
 in {
   home.file.".signature" = {

users/phundrak/home.nix

@@ -63,7 +63,13 @@
         LSP_USE_PLISTS = "true";
         OPENAI_API_URL = "http://localhost:1234/";
       };
-      desktop.caelestia.enable = true;
+      desktop = {
+        caelestia.enable = true;
+        spotify = {
+          enable = true;
+          spicetify.enable = false;
+        };
+      };
       dev = {
         ai.claude.enable = true;
         editors.emacs.package = emacsPackage;
@@ -78,7 +84,7 @@
             parts = lib.strings.splitString " " content;
             email = lib.lists.last parts;
           in "${email} namespaces=\"git\" ${content}")
-          (lib.filesystem.listFilesRecursive ../../keys)
+          (lib.filesystem.listFilesRecursive ./keys)
         );
       };
     };

users/phundrak/host/alys.nix

@@ -2,9 +2,6 @@
   imports = [../light-home.nix];
   home = {
     cli.nh.flake = "${config.home.homeDirectory}/nixos";
-    phundrak.sshKey = {
+    phundrak.sshKey.content = builtins.readFile ../keys/id_alys.pub;
-      content = builtins.readFile ../../../keys/id_alys.pub;
-      # file = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-    };
   };
 }

users/phundrak/host/elcafe.nix

@@ -0,0 +1,8 @@
+{
+  imports = [../light-home.nix];
+  home = {
+    cli.nh.flake = "/home/phundrak/.dotfiles";
+    dev.editors.emacs.enable = false;
+    phundrak.sshKey.content = builtins.readFile ../keys/id_elcafe.pub;
+  };
+}

users/phundrak/host/gampo.nix

@@ -3,8 +3,7 @@
   home = {
     cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
     desktop.hyprland.host = "gampo";
-    phundrak.sshKey = {
+    phundrak.sshKey.content = builtins.readFile ../keys/id_gampo.pub;
-      content = builtins.readFile ../../../keys/id_gampo.pub;
-    };
   };
+  programs.caelestia.settings.bar.persistent = false;
 }

users/phundrak/host/marpa.nix

@@ -1,14 +1,17 @@
 {config, ...}: {
   imports = [../home.nix];
   home = {
+    gpuType = "amd";
     cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
     dev.ai = {
       enable = true;
       ollama.gpu = "rocm";
     };
     desktop.hyprland.host = "marpa";
-    phundrak.sshKey = {
+    phundrak.sshKey.content = builtins.readFile ../keys/id_marpa.pub;
-      content = builtins.readFile ../../../keys/id_marpa.pub;
+  };
-    };
+  programs.caelestia.settings.bar = {
+    showBattery = false;
+    showWifi = false;
   };
 }

users/phundrak/host/naromk3.nix

@@ -2,6 +2,6 @@
   imports = [../light-home.nix];
   home = {
     cli.nh.flake = "/home/phundrak/.dotfiles";
-    phundrak.sshKey.content = builtins.readFile ../../../keys/id_naromk3.pub;
+    phundrak.sshKey.content = builtins.readFile ../keys/id_naromk3.pub;
   };
 }

users/phundrak/host/tilo.nix

@@ -2,6 +2,6 @@
   imports = [../light-home.nix];
   home = {
     cli.nh.flake = "/tank/phundrak/.dotfiles";
-    phundrak.sshKey.content = builtins.readFile ../../../keys/id_tilo.pub;
+    phundrak.sshKey.content = builtins.readFile ../keys/id_tilo.pub;
   };
 }

users/phundrak/keys/id_elcafe.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+UvZISwPdbDUQKbcBksi6dKvsVccvRIbdOE0zDQt60 lucien@phundrak.com

users/phundrak/light-home.nix

@@ -13,7 +13,7 @@ in {
     sshKey = {
       content = mkOption {
         type = types.nullOr types.str;
-        example = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGj+J6N6SO+4P8dOZqfR1oiay2yxhhHnagH52avUqw5h";
+        example = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
         default = null;
       };
       file = mkOption {

users/phundrak/packages.nix

@@ -5,7 +5,11 @@
   ...
 }:
 with lib; let
-  system = pkgs.stdenv.hostPlatform.system;
+  inherit (pkgs.stdenv.hostPlatform) system;
+  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; [
@@ -35,19 +39,20 @@ in {
     # Social
     vesktop # Discord alternative that works well with wayland
     element-desktop
-    signal-desktop-bin
+    signal-desktop
 
     # Misc
     bitwarden-desktop
-    gplates
+    # gplates
+    handy
     libnotify
     nextcloud-client
     onlyoffice-desktopeditors
+    pumo-system-info
     scrcpy
     syncthing
     watchmate
-    inputs.zen-browser.packages.${system}.default
+    zen
-    inputs.pumo-system-info.packages.${system}.default
 
     # Games
     atlauncher
@@ -68,6 +73,7 @@ in {
     # Dev
     dbeaver-bin
     devenv
+    inkdrop
     nodejs
     sqlite
     tectonic # better LaTeX engine

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

@@ -26,6 +26,7 @@
       fullscreen = import ./fullscreen.nix {inherit pkgs;};
       logout = import ./logout.nix {inherit pkgs;};
       ytplay = import ../../modules/cli/scripts/ytplay.nix {inherit pkgs;};
+      plock = import ../../modules/cli/scripts/plock.nix {inherit pkgs;};
     in [
       {
         key = "a";
@@ -56,6 +57,11 @@
             desc = "Gimp";
             cmd = "${pkgs.gimp}/bin/gimp";
           }
+          {
+            key = "h";
+            desc = "Handy";
+            cmd = "pkill -USR2 -n handy";
+          }
           {
             key = "n";
             desc = "Nemo";
@@ -165,6 +171,11 @@
           }
         ];
       }
+      {
+        key = "l";
+        desc = "Lock session";
+        cmd = "${plock}/bin/plock";
+      }
       {
         key = "p";
         desc = "Power";