nixos: services: nginx: sso: use upstream module

It's finally been merged, so let's get rid of this module.

flake.lock

@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
+        "lastModified": 1733312601,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
+        "lastModified": 1735381016,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
         "type": "github"
       },
       "original": {
@@ -150,29 +150,13 @@
         "type": "github"
       }
     },
-    "impermanence": {
-      "locked": {
-        "lastModified": 1697303681,
-        "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732521221,
+        "lastModified": 1735291276,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
         "type": "github"
       },
       "original": {
@@ -183,12 +167,21 @@
       }
     },
     "nur": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
       "locked": {
-        "lastModified": 1732704680,
+        "lastModified": 1735408823,
-        "narHash": "sha256-x3NlO2qzuobU9BrynzydX7X9oskJpysv7BI7DJ5cVSE=",
+        "narHash": "sha256-1VjQeMQer5nXNYtw+BG+s78ucaEoxO5oqj+yRmM8MMs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "31a30f0862fd8b5f88a6597382bb09197356b19e",
+        "rev": "8283ea92deac8cdb6fd63ff04049ac9e879bf5eb",
         "type": "github"
       },
       "original": {
@@ -210,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
+        "lastModified": 1734797603,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
         "type": "github"
       },
       "original": {
@@ -230,7 +223,6 @@
         "flake-parts": "flake-parts",
         "futils": "futils",
         "home-manager": "home-manager",
-        "impermanence": "impermanence",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
         "pre-commit-hooks": "pre-commit-hooks",
@@ -252,6 +244,27 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -43,13 +43,6 @@
       };
     };
 
-    impermanence = {
-      type = "github";
-      owner = "nix-community";
-      repo = "impermanence";
-      ref = "master";
-    };
-
     nixpkgs = {
       type = "github";
       owner = "NixOS";
@@ -62,6 +55,10 @@
       owner = "nix-community";
       repo = "NUR";
       ref = "master";
+      inputs = {
+        flake-parts.follows = "flake-parts";
+        nixpkgs.follows = "nixpkgs";
+      };
     };
 
     pre-commit-hooks = {

flake/home-manager.nix

@@ -25,7 +25,7 @@ let
       inherit system;
 
       overlays = (lib.attrValues self.overlays) ++ [
-        inputs.nur.overlay
+        inputs.nur.overlays.default
       ];
     };
 

flake/nixos.nix

@@ -7,7 +7,7 @@ let
     }
     {
       nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
-        inputs.nur.overlay
+        inputs.nur.overlays.default
       ];
     }
     # Include generic settings

modules/home/packages/default.nix

@@ -26,6 +26,7 @@ in
       fd
       file
       ripgrep
+      tree
     ] ++ cfg.additionalPackages);
 
     nixpkgs.config = {

modules/home/tmux/default.nix

@@ -48,6 +48,7 @@ in
     escapeTime = 0; # Let vim do its thing instead
     historyLimit = 100000; # Bigger buffer
     mouse = false; # I dislike mouse support
+    focusEvents = true; # Report focus events
     terminal = "tmux-256color"; # I want accurate termcap info
 
     plugins = with pkgs.tmuxPlugins; [

modules/home/vim/after/ftplugin/query.vim

@@ -0,0 +1,6 @@
+" Create the `b:undo_ftplugin` variable if it doesn't exist
+call ftplugined#check_undo_ft()
+
+" Use a small indentation value on query files
+setlocal shiftwidth=2
+let b:undo_ftplugin.='|setlocal shiftwidth<'

modules/home/vim/plugin/settings/lspconfig.lua

@@ -74,6 +74,16 @@ if utils.is_executable("bash-language-server") then
         filetypes = { "bash", "sh", "zsh" },
         capabilities = capabilities,
         on_attach = lsp.on_attach,
+        settings = {
+            bashIde = {
+                shfmt = {
+                    -- Simplify the code
+                    simplifyCode = true,
+                    -- Indent switch cases
+                    caseIndent = true,
+                },
+            },
+        },
     })
 end
 

modules/home/vim/plugin/settings/null-ls.lua

@@ -46,29 +46,3 @@ null_ls.register({
         condition = utils.is_executable_condition("isort"),
     }),
 })
-
--- Shell (non-POSIX)
-null_ls.register({
-    null_ls.builtins.formatting.shfmt.with({
-        -- Indent with 4 spaces, simplify the code, indent switch cases,
-        -- add space after redirection, use bash dialect
-        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "bash" },
-        -- Restrict to bash and zsh
-        filetypes = { "bash", "zsh" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shfmt"),
-    }),
-})
-
--- Shell (POSIX)
-null_ls.register({
-    null_ls.builtins.formatting.shfmt.with({
-        -- Indent with 4 spaces, simplify the code, indent switch cases,
-        -- add space after redirection, use POSIX
-        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "posix" },
-        -- Restrict to POSIX sh
-        filetypes = { "sh" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shfmt"),
-    }),
-})

modules/home/wm/i3/default.nix

@@ -127,9 +127,10 @@ in
             { class = "^Blueman-.*$"; }
             { title = "^htop$"; }
             { class = "^Thunderbird$"; instance = "Mailnews"; window_role = "filterlist"; }
-            { class = "^Pavucontrol.*$"; }
+            { class = "^pavucontrol.*$"; }
             { class = "^Arandr$"; }
-            { class = ".?blueman-manager.*$"; }
+            { class = "^\\.blueman-manager-wrapped$"; }
+            { class = "^\\.arandr-wrapped$"; }
           ];
         };
 

modules/nixos/hardware/bluetooth/default.nix

@@ -18,13 +18,6 @@ in
       services.blueman.enable = true;
     }
 
-    # Persist bluetooth files
-    {
-      my.system.persist.directories = [
-        "/var/lib/bluetooth"
-      ];
-    }
-
     # Support for additional bluetooth codecs
     (lib.mkIf cfg.loadExtraCodecs {
       hardware.pulseaudio = {

modules/nixos/hardware/graphics/default.nix

@@ -33,9 +33,8 @@ in
 
     # AMD GPU
     (lib.mkIf (cfg.gpuFlavor == "amd") {
-      boot.initrd.kernelModules = lib.mkIf cfg.amd.enableKernelModule [ "amdgpu" ];
-
       hardware.amdgpu = {
+        initrd.enable = cfg.amd.enableKernelModule;
         # Vulkan
         amdvlk = lib.mkIf cfg.amd.amdvlk {
           enable = true;

modules/nixos/hardware/networking/default.nix

@@ -22,18 +22,6 @@ in
   config = lib.mkMerge [
     (lib.mkIf cfg.wireless.enable {
       networking.networkmanager.enable = true;
-
-      # IWD needs persistence if enabled
-
-      # Persist NetworkManager files
-      my.system.persist.files = [
-        "/var/lib/NetworkManager/secret_key"
-        "/var/lib/NetworkManager/seen-bssids"
-        "/var/lib/NetworkManager/timestamps"
-      ];
-      my.system.persist.directories = [
-        "/etc/NetworkManager/system-connections"
-      ];
     })
   ];
 }

modules/nixos/hardware/sound/default.nix

@@ -54,9 +54,6 @@ in
 
     # Pulseaudio setup
     (lib.mkIf cfg.pulse.enable {
-      # ALSA
-      sound.enable = true;
-
       hardware.pulseaudio.enable = true;
     })
   ]);

modules/nixos/services/aria/default.nix

@@ -69,11 +69,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      cfg.downloadDir
-      "/var/lib/aria2"
-    ];
-
     # NOTE: unfortunately aria2 does not log connection failures for fail2ban
   };
 }

modules/nixos/services/audiobookshelf/default.nix

@@ -34,10 +34,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      "/var/lib/${config.services.audiobookshelf.dataDir}"
-    ];
-
     services.fail2ban.jails = {
       audiobookshelf = ''
         enabled = true

modules/nixos/services/blog/default.nix

@@ -41,12 +41,5 @@ in
 
     # Those are all subdomains, no problem
     my.services.nginx.virtualHosts = hostsInfo;
-
-    my.system.persist.directories = [
-      "/var/www/blog"
-      "/var/www/cv"
-      "/var/www/dev"
-      "/var/www/key"
-    ];
   };
 }

modules/nixos/services/calibre-web/default.nix

@@ -53,11 +53,6 @@ in
       ];
     };
 
-    my.system.persist.directories = [
-      "/var/lib/${config.services.calibre-web.dataDir}"
-      cfg.libraryPath
-    ];
-
     services.fail2ban.jails = {
       calibre-web = ''
         enabled = true

modules/nixos/services/drone/runner-docker/default.nix

@@ -39,7 +39,5 @@ in
       extraGroups = [ "docker" ]; # Give access to the daemon
     };
     users.groups.drone-runner-docker = { };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/drone/runner-exec/default.nix

@@ -63,7 +63,5 @@ in
       group = "drone-runner-exec";
     };
     users.groups.drone-runner-exec = { };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/drone/server/default.nix

@@ -50,7 +50,5 @@ in
         inherit (cfg) port;
       };
     };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/fail2ban/default.nix

@@ -33,9 +33,5 @@ in
         bantime = "10m";
       };
     };
-
-    my.system.persist.directories = [
-      "/var/lib/fail2ban"
-    ];
   };
 }

modules/nixos/services/flood/default.nix

@@ -28,10 +28,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      "/var/lib/flood"
-    ];
-
     # NOTE: unfortunately flood does not log connection failures for fail2ban
   };
 }

modules/nixos/services/forgejo/default.nix

@@ -147,11 +147,6 @@ in
       ];
     };
 
-    my.system.persist.directories = [
-      config.services.forgejo.lfs.contentDir
-      config.services.forgejo.repositoryRoot
-    ];
-
     services.fail2ban.jails = {
       forgejo = ''
         enabled = true

modules/nixos/services/gitea/default.nix

@@ -131,11 +131,6 @@ in
       ];
     };
 
-    my.system.persist.directories = [
-      config.services.gitea.lfs.contentDir
-      config.services.gitea.repositoryRoot
-    ];
-
     services.fail2ban.jails = {
       gitea = ''
         enabled = true

modules/nixos/services/grocy/default.nix

@@ -37,16 +37,6 @@ in
       useACMEHost = config.networking.domain;
     };
 
-    my.services.backup = {
-      paths = [
-        config.services.grocy.dataDir
-      ];
-    };
-
-    my.system.persist.directories = [
-      config.services.grocy.dataDir
-    ];
-
     # NOTE: unfortunately grocy does not log connection failures for fail2ban
   };
 }

modules/nixos/services/indexers/default.nix

@@ -33,10 +33,6 @@ in
           port = jackettPort;
         };
       };
-
-      my.system.persist.directories = [
-        config.services.jackett.dataDir
-      ];
     })
 
     (lib.mkIf cfg.nzbhydra.enable {
@@ -49,10 +45,6 @@ in
           port = nzbhydraPort;
         };
       };
-
-      my.system.persist.directories = [
-        config.services.nzbhydra2.dataDir
-      ];
     })
 
     (lib.mkIf cfg.prowlarr.enable {
@@ -66,10 +58,6 @@ in
         };
       };
 
-      my.system.persist.directories = [
-        "/var/lib/prowlarr"
-      ];
-
       services.fail2ban.jails = {
         prowlarr = ''
           enabled = true

modules/nixos/services/jellyfin/default.nix

@@ -38,10 +38,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      "/var/lib/jellyfin"
-    ];
-
     services.fail2ban.jails = {
       jellyfin = ''
         enabled = true

modules/nixos/services/komga/default.nix

@@ -36,10 +36,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      config.services.komga.stateDir
-    ];
-
     services.fail2ban.jails = {
       komga = ''
         enabled = true

modules/nixos/services/lohr/default.nix

@@ -107,9 +107,5 @@ in
         };
       };
     };
-
-    my.system.persist.directories = [
-      "/var/lib/lohr"
-    ];
   };
 }

modules/nixos/services/matrix/default.nix

@@ -214,9 +214,5 @@ in
         config.services.matrix-synapse.dataDir
       ];
     };
-
-    my.system.persist.directories = [
-      config.services.matrix-synapse.dataDir
-    ];
   };
 }

modules/nixos/services/mealie/default.nix

@@ -72,12 +72,6 @@ in
       };
     };
 
-    my.services.backup = {
-      paths = [
-        "/var/lib/mealie"
-      ];
-    };
-
     services.fail2ban.jails = {
       mealie = ''
         enabled = true

modules/nixos/services/monitoring/default.nix

@@ -130,10 +130,5 @@ in
         inherit (cfg.grafana) port;
       };
     };
-
-    my.system.persist.directories = [
-      config.services.grafana.dataDir
-      "/var/lib/${config.services.prometheus.stateDir}"
-    ];
   };
 }

modules/nixos/services/navidrome/default.nix

@@ -53,10 +53,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      "/var/lib/navidrome"
-    ];
-
     services.fail2ban.jails = {
       navidrome = ''
         enabled = true

modules/nixos/services/nextcloud/collabora.nix

@@ -46,7 +46,5 @@ in
         ];
       };
     };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/nextcloud/default.nix

@@ -92,10 +92,6 @@ in
       ];
     };
 
-    my.system.persist.directories = [
-      config.services.nextcloud.home
-    ];
-
     services.fail2ban.jails = {
       nextcloud = ''
         enabled = true

modules/nixos/services/nginx/default.nix

@@ -87,10 +87,6 @@ let
   });
 in
 {
-  imports = [
-    ./sso
-  ];
-
   options.my.services.nginx = with lib; {
     enable = mkEnableOption "Nginx";
 
@@ -486,9 +482,5 @@ in
         }
       ];
     };
-
-    my.system.persist.directories = [
-      "/var/lib/acme"
-    ];
   };
 }

modules/nixos/services/nginx/sso/default.nix

@@ -1,84 +0,0 @@
-# I must override the module to allow having runtime secrets
-{ config, lib, pkgs, utils, ... }:
-let
-  cfg = config.services.nginx.sso;
-  pkg = lib.getBin cfg.package;
-  confPath = "/var/lib/nginx-sso/config.json";
-in
-{
-  disabledModules = [ "services/security/nginx-sso.nix" ];
-
-
-  options.services.nginx.sso = with lib; {
-    enable = mkEnableOption "nginx-sso service";
-
-    package = mkOption {
-      type = types.package;
-      default = pkgs.nginx-sso;
-      defaultText = "pkgs.nginx-sso";
-      description = ''
-        The nginx-sso package that should be used.
-      '';
-    };
-
-    configuration = mkOption {
-      type = types.attrsOf types.unspecified;
-      default = { };
-      example = literalExample ''
-        {
-          listen = { addr = "127.0.0.1"; port = 8080; };
-
-          providers.token.tokens = {
-            myuser = "MyToken";
-          };
-
-          acl = {
-            rule_sets = [
-              {
-                rules = [ { field = "x-application"; equals = "MyApp"; } ];
-                allow = [ "myuser" ];
-              }
-            ];
-          };
-        }
-      '';
-      description = ''
-        nginx-sso configuration
-        (<link xlink:href="https://github.com/Luzifer/nginx-sso/wiki/Main-Configuration">documentation</link>)
-        as a Nix attribute set.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.nginx-sso = {
-      description = "Nginx SSO Backend";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        StateDirectory = "nginx-sso";
-        WorkingDirectory = "/var/lib/nginx-sso";
-        # The files to be merged might not have the correct permissions
-        ExecStartPre = pkgs.writeShellScript "merge-nginx-sso-config" ''
-          rm -f '${confPath}'
-          ${utils.genJqSecretsReplacementSnippet cfg.configuration confPath}
-        '';
-        ExecStart = lib.mkForce ''
-          ${lib.getExe pkg} \
-            --config ${confPath} \
-            --frontend-dir ${pkg}/share/frontend
-        '';
-        Restart = "always";
-        User = "nginx-sso";
-        Group = "nginx-sso";
-      };
-    };
-
-    users.users.nginx-sso = {
-      isSystemUser = true;
-      group = "nginx-sso";
-    };
-
-    users.groups.nginx-sso = { };
-  };
-}

modules/nixos/services/paperless/default.nix

@@ -61,11 +61,6 @@ in
           PAPERLESS_ENABLE_HTTP_REMOTE_USER = true;
           PAPERLESS_HTTP_REMOTE_USER_HEADER_NAME = "HTTP_X_USER";
 
-          # Use PostgreSQL
-          PAPERLESS_DBHOST = "/run/postgresql";
-          PAPERLESS_DBUSER = "paperless";
-          PAPERLESS_DBNAME = "paperless";
-
           # Security settings
           PAPERLESS_ALLOWED_HOSTS = paperlessDomain;
           PAPERLESS_CORS_ALLOWED_HOSTS = "https://${paperlessDomain}";
@@ -87,40 +82,11 @@ in
 
       # Secret key
       environmentFile = cfg.secretKeyFile;
-    };
 
-    systemd.services = {
+      # Automatic PostgreSQL provisioning
-      paperless-scheduler = {
+      database = {
-        requires = [ "postgresql.service" ];
+        createLocally = true;
-        after = [ "postgresql.service" ];
       };
-
-      paperless-consumer = {
-        requires = [ "postgresql.service" ];
-        after = [ "postgresql.service" ];
-      };
-
-      paperless-web = {
-        requires = [ "postgresql.service" ];
-        after = [ "postgresql.service" ];
-      };
-
-      paperless-task-queue = {
-        requires = [ "postgresql.service" ];
-        after = [ "postgresql.service" ];
-      };
-    };
-
-    # Set-up database
-    services.postgresql = {
-      enable = true;
-      ensureDatabases = [ "paperless" ];
-      ensureUsers = [
-        {
-          name = "paperless";
-          ensureDBOwnership = true;
-        }
-      ];
     };
 
     # Set-up media group
@@ -146,10 +112,5 @@ in
         config.services.paperless.mediaDir
       ];
     };
-
-    my.system.persist.directories = [
-      config.services.paperless.dataDir
-      config.services.paperless.mediaDir
-    ];
   };
 }

modules/nixos/services/pdf-edit/default.nix

@@ -54,10 +54,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      "/var/lib/stirling-pdf"
-    ];
-
     services.fail2ban.jails = {
       stirling-pdf = ''
         enabled = true

modules/nixos/services/podgrab/default.nix

@@ -51,10 +51,5 @@ in
         inherit (cfg) port;
       };
     };
-
-    my.system.persist.directories = [
-      config.systemd.services.podgrab.environment.CONFIG
-      config.systemd.services.podgrab.environment.DATA
-    ];
   };
 }

modules/nixos/services/postgresql-backup/default.nix

@@ -24,9 +24,5 @@ in
         (config.services.postgresqlBackup.location + "/*.prev.sql.gz")
       ];
     };
-
-    my.system.persist.directories = [
-      config.services.postgresqlBackup.location
-    ];
   };
 }

modules/nixos/services/postgresql/default.nix

@@ -14,31 +14,24 @@ in
     # Let other services enable postgres when they need it
     (lib.mkIf cfg.enable {
       services.postgresql = {
-        package = pkgs.postgresql_13;
+        package = pkgs.postgresql_17;
       };
     })
 
-    # Only persist directory if the actual service is enabled
-    (lib.mkIf config.services.postgresql.enable {
-      my.system.persist.directories = [
-        config.services.postgresql.dataDir
-      ];
-    })
-
     # Taken from the manual
     (lib.mkIf cfg.upgradeScript {
       environment.systemPackages =
         let
           pgCfg = config.services.postgresql;
-          newPackage' = pkgs.postgresql_13;
+          newPackage' = pkgs.postgresql_17;
 
           oldPackage = if pgCfg.enableJIT then pgCfg.package.withJIT else pgCfg.package;
           oldData = pgCfg.dataDir;
-          oldBin = "${if pgCfg.extraPlugins == [] then oldPackage else oldPackage.withPackages pgCfg.extraPlugins}/bin";
+          oldBin = "${if pgCfg.extensions == [] then oldPackage else oldPackage.withPackages pgCfg.extensions}/bin";
 
           newPackage = if pgCfg.enableJIT then newPackage'.withJIT else newPackage';
           newData = "/var/lib/postgresql/${newPackage.psqlSchema}";
-          newBin = "${if pgCfg.extraPlugins == [] then newPackage else newPackage.withPackages pgCfg.extraPlugins}/bin";
+          newBin = "${if pgCfg.extensions == [] then newPackage else newPackage.withPackages pgCfg.extensions}/bin";
         in
         [
           (pkgs.writeScriptBin "upgrade-pg-cluster" ''

modules/nixos/services/pyload/default.nix

@@ -53,11 +53,6 @@ in
       };
     };
 
-    my.system.persist.directories = [
-      cfg.downloadDirectory
-      "/var/lib/pyload"
-    ];
-
     services.fail2ban.jails = {
       pyload = ''
         enabled = true

modules/nixos/services/quassel/default.nix

@@ -46,9 +46,5 @@ in
       # Because Quassel does not use the socket, I simply trust its connection
       authentication = "host quassel quassel localhost trust";
     };
-
-    my.system.persist.directories = [
-      config.services.quassel.dataDir
-    ];
   };
 }

modules/nixos/services/rss-bridge/default.nix

@@ -22,9 +22,5 @@ in
       forceSSL = true;
       useACMEHost = config.networking.domain;
     };
-
-    my.system.persist.directories = [
-      config.services.rss-bridge.dataDir
-    ];
   };
 }

modules/nixos/services/sabnzbd/default.nix

@@ -24,10 +24,6 @@ in
       };
     };
 
-    my.system.persist.files = [
-      config.services.sabnzbd.configFile
-    ];
-
     services.fail2ban.jails = {
       sabnzbd = ''
         enabled = true

modules/nixos/services/servarr/default.nix

@@ -19,16 +19,6 @@ let
       enable = true;
       group = "media";
     };
-
-    my.system.persist.directories =
-      let
-        # Bazarr breaks the mold unfortunately
-        dataDir =
-          if service != "bazarr"
-          then config.services.${service}.dataDir
-          else "/var/lib/bazarr";
-      in
-      [ dataDir ];
   };
 
   mkRedirection = service: {
@@ -106,5 +96,15 @@ in
     # Sonarr for shows
     (mkFullConfig "sonarr")
     (mkFail2Ban "sonarr")
+
+    # HACK: until https://github.com/NixOS/nixpkgs/issues/360592 is resolved
+    (lib.mkIf cfg.sonarr.enable {
+      nixpkgs.config.permittedInsecurePackages = [
+        "aspnetcore-runtime-6.0.36"
+        "aspnetcore-runtime-wrapped-6.0.36"
+        "dotnet-sdk-6.0.428"
+        "dotnet-sdk-wrapped-6.0.428"
+      ];
+    })
   ]);
 }

modules/nixos/services/ssh-server/default.nix

@@ -20,13 +20,6 @@ in
       };
     };
 
-    # Persist SSH keys
-    my.system.persist.files =
-      let
-        pubAndPrivKey = key: [ key.path "${key.path}.pub" ];
-      in
-      lib.concatMap pubAndPrivKey config.services.openssh.hostKeys;
-
     # Opens the relevant UDP ports.
     programs.mosh.enable = true;
   };

modules/nixos/services/tandoor-recipes/default.nix

@@ -83,16 +83,6 @@ in
       };
     };
 
-    my.services.backup = {
-      paths = [
-        "/var/lib/tandoor-recipes"
-      ];
-    };
-
-    my.system.persist.directories = [
-      "/var/lib/tandoor-recipes"
-    ];
-
     # NOTE: unfortunately tandoor-recipes does not log connection failures for fail2ban
   };
 }

modules/nixos/services/transmission/default.nix

@@ -91,11 +91,6 @@ in
       allowedUDPPorts = [ cfg.peerPort ];
     };
 
-    my.system.persist.directories = [
-      cfg.downloadBase
-      config.services.transmission.home
-    ];
-
     # NOTE: unfortunately transmission does not log connection failures for fail2ban
   };
 }

modules/nixos/services/vikunja/default.nix

@@ -100,10 +100,6 @@ in
       ];
     };
 
-    my.system.persist.directories = [
-      config.services.vikunja.settings.files.basepath
-    ];
-
     # NOTE: unfortunately vikunja does not log connection failures for fail2ban
   };
 }

modules/nixos/services/woodpecker/agent-docker/default.nix

@@ -38,7 +38,5 @@ in
         ];
       };
     };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/woodpecker/agent-exec/default.nix

@@ -62,7 +62,5 @@ in
         ];
       };
     };
-
-    # FIXME: persistence?
   };
 }

modules/nixos/services/woodpecker/server/default.nix

@@ -61,7 +61,5 @@ in
         port = cfg.rpcPort;
       };
     };
-
-    # FIXME: persistence
   };
 }

modules/nixos/system/default.nix

@@ -9,7 +9,6 @@
     ./language
     ./nix
     ./packages
-    ./persist
     ./podman
     ./polkit
     ./printing

modules/nixos/system/docker/default.nix

@@ -23,9 +23,5 @@ in
         ];
       };
     };
-
-    my.system.persist.directories = [
-      "/var/lib/docker"
-    ];
   };
 }

modules/nixos/system/persist/default.nix

@@ -1,71 +0,0 @@
-# Ephemeral root configuration
-{ config, inputs, lib, ... }:
-let
-  cfg = config.my.system.persist;
-in
-{
-  imports = [
-    inputs.impermanence.nixosModules.impermanence
-  ];
-
-  options.my.system.persist = with lib; {
-    enable = mkEnableOption "stateless system configuration";
-
-    mountPoint = lib.mkOption {
-      type = types.str;
-      default = "/persistent";
-      example = "/etc/nix/persist";
-      description = ''
-        Which mount point should be used to persist this system's files and
-        directories.
-      '';
-    };
-
-    files = lib.mkOption {
-      type = with types; listOf str;
-      default = [ ];
-      example = [
-        "/etc/nix/id_rsa"
-      ];
-      description = ''
-        Additional files in the root to link to persistent storage.
-      '';
-    };
-
-    directories = lib.mkOption {
-      type = with types; listOf str;
-      default = [ ];
-      example = [
-        "/var/lib/libvirt"
-      ];
-      description = ''
-        Additional directories in the root to link to persistent storage.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.persistence."${cfg.mountPoint}" = {
-      files = [
-        "/etc/machine-id"
-        "/etc/adjtime"
-        "/var/lib/systemd/timesync/clock"
-      ]
-      ++ lib.unique cfg.files
-      ;
-
-      directories = [
-        "/etc/nixos" # In case it's storage directory of our configuration
-        "/var/log"
-        "/var/lib/nixos" # UID/GID maps
-        "/var/lib/systemd/coredump"
-
-        "/var/lib/systemd" # FIXME: needed?
-        "/var/spool" # FIXME: needed?
-        "/var/tmp" # FIXME: needed?
-      ]
-      ++ lib.unique cfg.directories
-      ;
-    };
-  };
-}

modules/nixos/system/podman/default.nix

@@ -44,9 +44,5 @@ in
         ];
       };
     };
-
-    my.system.persist.directories = [
-      "/var/lib/containers"
-    ];
   };
 }

modules/nixos/system/printing/default.nix

@@ -65,7 +65,5 @@ in
       # Allow resolution of '.local' addresses
       nssmdns4 = true;
     };
-
-    # FIXME: persistence?
   };
 }

overlays/lsp-format-nvim-indentation/default.nix

@@ -0,0 +1,4 @@
+self: prev:
+{
+  vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
+}

overlays/lsp-format-nvim-indentation/generated.nix

@@ -0,0 +1,14 @@
+{ fetchpatch, ... }:
+
+_final: prev: {
+  lsp-format-nvim = prev.lsp-format-nvim.overrideAttrs (oa: {
+    patches = (oa.patches or [ ]) ++ [
+      # https://github.com/lukas-reineke/lsp-format.nvim/issues/94
+      (fetchpatch {
+        name = "use-effective-indentation";
+        url = "https://github.com/liskin/lsp-format.nvim/commit/3757ac443bdf5bd166673833794553229ee8d939.patch";
+        hash = "sha256-Dv+TvXrU/IrrPxz2MSPbLmRxch+qkHbI3AyFMj/ssDk=";
+      })
+    ];
+  });
+}

pkgs/cgt-calc/default.nix

@@ -1,47 +0,0 @@
-{ lib
-, fetchFromGitHub
-, python3Packages
-, withTeXLive ? true
-, texliveSmall
-}:
-python3Packages.buildPythonApplication rec {
-  pname = "cgt-calc";
-  version = "1.13.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "KapJI";
-    repo = "capital-gains-calculator";
-    rev = "v${version}";
-    hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw=";
-  };
-
-  build-system = with python3Packages; [
-    poetry-core
-  ];
-
-  dependencies = with python3Packages; [
-    defusedxml
-    jinja2
-    pandas
-    requests
-    types-requests
-    yfinance
-  ];
-
-  makeWrapperArgs = lib.optionals withTeXLive [
-    "--prefix"
-    "PATH"
-    ":"
-    "${lib.getBin texliveSmall}/bin"
-  ];
-
-  meta = with lib; {
-    description = "UK capital gains tax calculator";
-    homepage = "https://github.com/KapJI/capital-gains-calculator";
-    license = with licenses; [ mit ];
-    mainProgram = "cgt-calc";
-    maintainers = with maintainers; [ ambroisie ];
-    platforms = platforms.unix;
-  };
-}

pkgs/default.nix

@@ -2,8 +2,6 @@
 pkgs.lib.makeScope pkgs.newScope (pkgs: {
   bw-pass = pkgs.callPackage ./bw-pass { };
 
-  cgt-calc = pkgs.callPackage ./cgt-calc { };
-
   change-audio = pkgs.callPackage ./change-audio { };
 
   change-backlight = pkgs.callPackage ./change-backlight { };

pkgs/diff-flake/diff-flake

@@ -157,7 +157,7 @@ list_dev_shells() {
 }
 
 diff_output() {
-    local PREV NEW;
+    local PREV NEW
     PREV="$(mktemp --dry-run)"
     NEW="$(mktemp --dry-run)"