home: jujutsu: explicitly create 'conf.d'

This is to serve as a reminder of _how_ to add a local configuration
file.

flake.lock

@@ -14,11 +14,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747575206,
-        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
+        "lastModified": 1736955230,
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747978958,
-        "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
+        "lastModified": 1743869639,
+        "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
+        "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747744144,
-        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
+        "lastModified": 1744777043,
+        "narHash": "sha256-O6jgTxz9BKUiaJl03JsVHvSjtCOC8gHfDvC2UCfcLMc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
+        "rev": "7a6f7f4c1c69eee05641beaa40e7f85da8e69fb0",
         "type": "github"
       },
       "original": {

flake/home-manager.nix

@@ -22,6 +22,10 @@ let
   ];
 
   mkHome = name: system: inputs.home-manager.lib.homeManagerConfiguration {
+    # Work-around for home-manager
+    # * not letting me set `lib` as an extraSpecialArgs
+    # * not respecting `nixpkgs.overlays` [1]
+    # [1]: https://github.com/nix-community/home-manager/issues/2954
     pkgs = inputs.nixpkgs.legacyPackages.${system};
 
     modules = defaultModules ++ [

flake/nixos.nix

@@ -15,10 +15,8 @@ let
   ];
 
   buildHost = name: system: lib.nixosSystem {
+    inherit system;
     modules = defaultModules ++ [
-      {
-        nixpkgs.hostPlatform = system;
-      }
       "${self}/hosts/nixos/${name}"
     ];
     specialArgs = {

hosts/homes/ambroisie@bazin/default.nix

@@ -4,20 +4,6 @@
   services.gpg-agent.enable = lib.mkForce false;
 
   my.home = {
-    atuin = {
-      package = pkgs.stdenv.mkDerivation {
-        pname = "atuin";
-        version = "18.4.0";
-
-        buildCommand = ''
-          mkdir -p $out/bin
-          ln -s /usr/bin/atuin $out/bin/atuin
-        '';
-
-        meta.mainProgram = "atuin";
-      };
-    };
-
     git = {
       package = pkgs.emptyDirectory;
     };

hosts/homes/ambroisie@mousqueton/default.nix

@@ -7,20 +7,6 @@
   services.gpg-agent.enable = lib.mkForce false;
 
   my.home = {
-    atuin = {
-      package = pkgs.stdenv.mkDerivation {
-        pname = "atuin";
-        version = "18.4.0";
-
-        buildCommand = ''
-          mkdir -p $out/bin
-          ln -s /usr/bin/atuin $out/bin/atuin
-        '';
-
-        meta.mainProgram = "atuin";
-      };
-    };
-
     git = {
       package = pkgs.emptyDirectory;
     };

modules/home/delta/default.nix

@@ -27,13 +27,6 @@ in
           properly configured.
         '';
       }
-      {
-        assertion = cfg.enable -> config.programs.git.enable;
-        message = ''
-          `config.my.home.delta` relies on `config.programs.git` to be
-          enabled.
-        '';
-      }
       {
         assertion = cfg.jujutsu.enable -> cfg.git.enable;
         message = ''

modules/home/firefox/tridactyl/default.nix

@@ -12,7 +12,9 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    xdg.configFile."tridactyl/tridactylrc".source = pkgs.replaceVars ./tridactylrc {
+    xdg.configFile."tridactyl/tridactylrc".source = pkgs.substituteAll {
+      src = ./tridactylrc;
+
       editorcmd = lib.concatStringsSep " " [
         # Use my configured terminal
         term

modules/home/gpg/default.nix

@@ -17,7 +17,7 @@ in
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true; # One agent to rule them all
-      pinentry.package = cfg.pinentry;
+      pinentryPackage = cfg.pinentry;
       extraConfig = ''
         allow-loopback-pinentry
       '';

modules/home/vim/lua/ambroisie/lsp.lua

@@ -53,10 +53,6 @@ M.on_attach = function(client, bufnr)
         vim.diagnostic.open_float(nil, { scope = "buffer" })
     end
 
-    local function toggle_inlay_hints()
-        vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
-    end
-
     local keys = {
         buffer = bufnr,
         -- LSP navigation
@@ -71,7 +67,6 @@ M.on_attach = function(client, bufnr)
         { "<leader>ca", vim.lsp.buf.code_action, desc = "Code actions" },
         { "<leader>cd", cycle_diagnostics_display, desc = "Cycle diagnostics display" },
         { "<leader>cD", show_buffer_diagnostics, desc = "Show buffer diagnostics" },
-        { "<leader>ch", toggle_inlay_hints, desc = "Toggle inlay hints" },
         { "<leader>cr", vim.lsp.buf.rename, desc = "Rename symbol" },
         { "<leader>cs", vim.lsp.buf.signature_help, desc = "Show signature" },
         { "<leader>ct", vim.lsp.buf.type_definition, desc = "Go to type definition" },

modules/home/wm/i3/default.nix

@@ -127,7 +127,6 @@ in
             { class = "^Blueman-.*$"; }
             { title = "^htop$"; }
             { class = "^Thunderbird$"; instance = "Mailnews"; window_role = "filterlist"; }
-            { class = "^firefox$"; instance = "Places"; window_role = "Organizer"; }
             { class = "^pavucontrol.*$"; }
             { class = "^Arandr$"; }
             { class = "^\\.blueman-manager-wrapped$"; }

modules/nixos/profiles/wm/default.nix

@@ -24,8 +24,6 @@ in
       my.home.udiskie.enable = true;
       # udiskie fails if it can't find this dbus service
       services.udisks2.enable = true;
-      # Ensure i3lock can actually unlock the session
-      security.pam.services.i3lock.enable = true;
     })
   ];
 }

modules/nixos/services/mealie/default.nix

@@ -38,13 +38,27 @@ in
         # Make it work with socket auth
         POSTGRES_URL_OVERRIDE = "postgresql://mealie:@/mealie?host=/run/postgresql";
       };
+    };
 
-      # Automatic PostgreSQL provisioning
-      database = {
-        createLocally = true;
+    systemd.services = {
+      mealie = {
+        after = [ "postgresql.service" ];
+        requires = [ "postgresql.service" ];
       };
     };
 
+    # Set-up database
+    services.postgresql = {
+      enable = true;
+      ensureDatabases = [ "mealie" ];
+      ensureUsers = [
+        {
+          name = "mealie";
+          ensureDBOwnership = true;
+        }
+      ];
+    };
+
     my.services.nginx.virtualHosts = {
       mealie = {
         inherit (cfg) port;

modules/nixos/services/nextcloud/default.nix

@@ -44,15 +44,11 @@ in
         adminuser = cfg.admin;
         adminpassFile = cfg.passwordFile;
         dbtype = "pgsql";
+        dbhost = "/run/postgresql";
       };
 
       https = true;
 
-      # Automatic PostgreSQL provisioning
-      database = {
-        createLocally = true;
-      };
-
       settings = {
         overwriteprotocol = "https"; # Nginx only allows SSL
       };
@@ -64,6 +60,22 @@ in
       };
     };
 
+    services.postgresql = {
+      enable = true;
+      ensureDatabases = [ "nextcloud" ];
+      ensureUsers = [
+        {
+          name = "nextcloud";
+          ensureDBOwnership = true;
+        }
+      ];
+    };
+
+    systemd.services."nextcloud-setup" = {
+      requires = [ "postgresql.service" ];
+      after = [ "postgresql.service" ];
+    };
+
     # The service above configures the domain, no need for my wrapper
     services.nginx.virtualHosts."nextcloud.${config.networking.domain}" = {
       forceSSL = true;

modules/nixos/services/paperless/default.nix

@@ -52,28 +52,30 @@ in
 
       mediaDir = lib.mkIf (cfg.documentPath != null) cfg.documentPath;
 
-      settings = {
-        # Use SSO
-        PAPERLESS_ENABLE_HTTP_REMOTE_USER = true;
-        PAPERLESS_ENABLE_HTTP_REMOTE_USER_API = true;
-        PAPERLESS_HTTP_REMOTE_USER_HEADER_NAME = "HTTP_X_USER";
+      settings =
+        let
+          paperlessDomain = "paperless.${config.networking.domain}";
+        in
+        {
+          # Use SSO
+          PAPERLESS_ENABLE_HTTP_REMOTE_USER = true;
+          PAPERLESS_HTTP_REMOTE_USER_HEADER_NAME = "HTTP_X_USER";
 
-        # Security settings
-        PAPERLESS_URL = "https://paperless.${config.networking.domain}";
-        PAPERLESS_USE_X_FORWARD_HOST = true;
-        PAPERLESS_PROXY_SSL_HEADER = [ "HTTP_X_FORWARDED_PROTO" "https" ];
+          # Security settings
+          PAPERLESS_ALLOWED_HOSTS = paperlessDomain;
+          PAPERLESS_CORS_ALLOWED_HOSTS = "https://${paperlessDomain}";
 
-        # OCR settings
-        PAPERLESS_OCR_LANGUAGE = "fra+eng";
+          # OCR settings
+          PAPERLESS_OCR_LANGUAGE = "fra+eng";
 
-        # Workers
-        PAPERLESS_TASK_WORKERS = 3;
-        PAPERLESS_THREADS_PER_WORKER = 4;
+          # Workers
+          PAPERLESS_TASK_WORKERS = 3;
+          PAPERLESS_THREADS_PER_WORKER = 4;
 
-        # Misc
-        PAPERLESS_TIME_ZONE = config.time.timeZone;
-        PAPERLESS_ADMIN_USER = cfg.username;
-      };
+          # Misc
+          PAPERLESS_TIME_ZONE = config.time.timeZone;
+          PAPERLESS_ADMIN_USER = cfg.username;
+        };
 
       # Admin password
       passwordFile = cfg.passwordFile;