Add immich module

2024-09-27 17:09:23 +01:00
20 changed files with 222 additions and 291 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@@ -107,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732742778,
-        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
+        "lastModified": 1727359191,
+        "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
+        "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700",
        "type": "github"
      },
      "original": {
@@ -123,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1732798888,
-        "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=",
+        "lastModified": 1723137499,
+        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "ef6ac4285eaac6053338a6240bc615902a839493",
+        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
        "type": "github"
      },
      "original": {
@@ -182,6 +182,22 @@
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@@ -190,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1725234343,
+        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
        "type": "github"
      },
      "original": {
@@ -203,30 +219,9 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "git-hooks": {
      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "flake-compat"
-        ],
+        "flake-compat": "flake-compat_4",
        "gitignore": "gitignore",
        "nixpkgs": [
          "nixvim",
@@ -238,11 +233,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732021966,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
        "type": "github"
      },
      "original": {
@@ -318,16 +313,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1732466619,
-        "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f3111f62a23451114433888902a55cf0692b408d",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -340,47 +335,20 @@
        ]
      },
      "locked": {
-        "lastModified": 1732482255,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
    "kvlibadwaita": {
      "flake": false,
      "locked": {
@@ -405,11 +373,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732603785,
-        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
+        "lastModified": 1725189302,
+        "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
+        "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
        "type": "github"
      },
      "original": {
@@ -420,11 +388,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1727437159,
+        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
        "type": "github"
      },
      "original": {
@@ -440,18 +408,20 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05"
+        "nixpkgs-24_05": "nixpkgs-24_05",
+        "utils": "utils_2"
      },
      "locked": {
-        "lastModified": 1722877200,
-        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
+        "lastModified": 1718084203,
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-24.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@@ -489,11 +459,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
        "type": "github"
      },
      "original": {
@@ -520,16 +490,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1732350895,
-        "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
+        "lastModified": 1727264057,
+        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
+        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
        "type": "indirect"
      }
    },
@@ -544,46 +514,23 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1732726573,
-        "narHash": "sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748=",
+        "lastModified": 1725350106,
+        "narHash": "sha256-TaMMlI2KPJ3wCyxJk6AShOLhNuTeabHCnvYRkLBlEFs=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "fc9178d124eba824f1862513314d351784e1a84c",
+        "rev": "0f2c31e6a57a83ed4e6fa3adc76749620231055d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "nixos-24.05",
        "repo": "nixvim",
        "type": "github"
      }
    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731936508,
-        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@@ -594,11 +541,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732639391,
-        "narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=",
+        "lastModified": 1727210241,
+        "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "06e3209d11797d9c741e25df06ab61048746bf93",
+        "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1",
        "type": "github"
      },
      "original": {
@@ -629,11 +576,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1730732927,
-        "narHash": "sha256-t3MTEgi6O7DMxMjdi3xcTAztLDQmEtqQ+oU+ZbWz2AI=",
+        "lastModified": 1724093899,
+        "narHash": "sha256-VohYwTIBq7NEssFibuu+HMXXwuCoLmMOmEwQf7sESSI=",
        "ref": "refs/heads/master",
-        "rev": "4ae2ac777c38f60a29384b70c456f41847cdf1b5",
-        "revCount": 28,
+        "rev": "7f5901bb5d6eeaa94d7e1f18f66093be9df014e4",
+        "revCount": 27,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@@ -690,11 +637,11 @@
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1732643121,
-        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
+        "lastModified": 1721874544,
+        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
+        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
        "type": "github"
      },
      "original": {
@@ -711,11 +658,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732643199,
-        "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
+        "lastModified": 1724833132,
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
        "type": "github"
      },
      "original": {
@@ -741,6 +688,24 @@
        "repo": "flake-utils",
        "type": "github"
      }
+    },
+    "utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
  description = "NixOS system configuration";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
    # nixpkgs-master.url = "nixpkgs";
    agenix.url = "github:ryantm/agenix";
@@ -12,7 +12,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    firefox-gnome-theme = {
@@ -29,11 +29,11 @@
    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim";
+      url = "github:nix-community/nixvim/nixos-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    plasma-manager = {
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -54,7 +54,7 @@
  programs.zsh.enable = true;

  nix = {
-    package = pkgs.nixVersions.stable;
+    package = pkgs.nixFlakes;
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -9,9 +9,10 @@
    (import ../overlays/gnome.nix)
  ];

-  services.printing.enable = false;
+  services.printing.enable = true;
  services.openssh.startWhenNeeded = true;

+  sound.enable = true;
  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@@ -29,12 +29,13 @@
      modesetting.enable = true;
      powerManagement.enable = true;
    };
-    graphics = {
+    opengl = {
      enable = true;
      extraPackages = with pkgs; [
        libvdpau-va-gl
      ];
-      enable32Bit = true;
+      driSupport = true;
+      driSupport32Bit = true;
    };
  };
 }
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@@ -156,16 +156,16 @@
    };
  };

-  hardware.graphics = {
+  hardware.opengl = {
    enable = true;
    extraPackages = with pkgs; [
      vaapiVdpau
    ];
+    driSupport = true;
  };
  users.users.jellyfin.extraGroups = [ "video" "render" ];
  services.jellyfin = {
    enable = true;
-    package = pkgs.unstable.jellyfin;
    cacheDir = "/var/cache/jellyfin";
    dataDir = "/var/lib/jellyfin";
  };
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -1,7 +1,5 @@
-{ config, pkgs, ... }:
+{ config, ... }:

-let streamrip = pkgs.callPackage ../../pkgs/streamrip/package.nix { };
-in
 {
  imports = [
    ./hardware-configuration.nix
@@ -51,10 +49,6 @@ in
    };
  };

-  environment.systemPackages = [
-    streamrip
-  ];
-
  modules = {
    desktop = {
      apps.qbittorrent.enable = true;
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@@ -19,7 +19,6 @@
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    nvidia = {
      modesetting.enable = true;
-      open = true;
      package = config.boot.kernelPackages.nvidiaPackages.beta;
      powerManagement.enable = true;
    };
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -100,6 +100,8 @@

  networking.hostId = "731d1660";

+  sound.enable = true;
+
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -43,6 +43,7 @@
    ./services/gitea
    ./services/gitea-runner
    ./services/headscale
+    ./services/immich
    ./services/mail
    ./services/matrix
    ./services/nginx
--- a/modules/desktop/gaming/lutris.nix
+++ b/modules/desktop/gaming/lutris.nix
@@ -21,9 +21,10 @@ in {
      vulkan-tools
    ];

-    hardware.graphics = {
+    hardware.opengl = {
      enable = true;
-      enable32Bit = true;
+      driSupport = true;
+      driSupport32Bit = true;
    };
  };
 }
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -77,6 +77,7 @@ in {
          "appindicatorsupport@rgcjonas.gmail.com"
          # "arcmenu@arcmenu.com"
          "blur-my-shell@aunetx"
+          # "browser-tabs@com.github.harshadgavali"
          "burn-my-windows@schneegans.github.com"
          "clipboard-indicator@tudmotu.com"
          "CoverflowAltTab@palatis.blogspot.com"
@@ -88,13 +89,14 @@ in {
          # "forge@jmmaranan.com"
          "gsconnect@andyholmes.github.io"
          # "gSnap@micahosborne"
-          "hidetopbar@mathieu.bidon.ca"
+          # "hidetopbar@mathieu.bidon.ca"
          "just-perfection-desktop@just-perfection"
          # "mediacontrols@cliffniff.github.com"
          # "mousefollowsfocus@matthes.biz"
          # "pano@elhan.io"
          # "paperwm@hedning:matrix.org"
          "pip-on-top@rafostar.github.com"
+          # "rounded-window-corners@yilozt"
          # "search-light@icedman.github.com"
          # "smart-auto-move@khimaros.com"
          "space-bar@luchrioh"
@@ -216,8 +218,8 @@ in {
      # d-spy
      # drawing
      # fragments
-      dconf-editor
-      ghex
+      gnome.dconf-editor
+      gnome.ghex
      # gnome-builder
      gnome-decoder
      gnome-firmware
@@ -225,7 +227,7 @@ in {
      # gnome-obfuscate
      gnome-podcasts
      identity
-      # mission-center
+      mission-center
      mousam
      newsflash
      # schemes
@@ -248,6 +250,7 @@ in {
      gnomeExtensions.appindicator
      gnomeExtensions.arcmenu
      gnomeExtensions.blur-my-shell
+      gnomeExtensions.browser-tabs
      gnomeExtensions.burn-my-windows
      gnomeExtensions.clipboard-indicator
      gnomeExtensions.coverflow-alt-tab
@@ -266,6 +269,7 @@ in {
      gnomeExtensions.pano
      gnomeExtensions.paperwm
      gnomeExtensions.pip-on-top
+      gnomeExtensions.rounded-window-corners
      gnomeExtensions.search-light
      gnomeExtensions.smart-auto-move
      gnomeExtensions.space-bar
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@@ -11,7 +11,7 @@ in {
  };

  config = lib.mkIf cfg.enable {
-    home.programs.nixvim.config = {
+    home.programs.nixvim = {
      enable = true;
      defaultEditor = true;

@@ -59,15 +59,15 @@ in {
          eslint.enable = true;
          gopls.enable = true;
          html.enable = true;
-          lua_ls.enable = true;
+          lua-ls.enable = true;
          pylsp.enable = true;
          nixd.enable = true;
-          rust_analyzer = {
+          rust-analyzer = {
            enable = true;
            installCargo = true;
            installRustc = true;
          };
-          ts_ls.enable = true;
+          tsserver.enable = true;
        };
      };

@@ -108,7 +108,7 @@ in {
        nixvimInjections = true;

        folding = true;
-        settings.indent.enable = true;
+        indent = true;
      };

      plugins.treesitter-refactor = {
@@ -121,8 +121,6 @@ in {

      plugins.undotree.enable = true;

-      plugins.web-devicons.enable = true;
-
      # plugins.gitsigns.enable = true;
      # plugins.gitgutter.enable = true;
      # plugins.goyo.enable = true;
--- a/modules/networking/wireless.nix
+++ b/modules/networking/wireless.nix
@@ -26,9 +26,9 @@ in {
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        secretsFile = config.age.secrets."passwords/networks".path;
+        environmentFile = config.age.secrets."passwords/networks".path;
        networks = {
-          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
+          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
        };
      };
      networkmanager.ensureProfiles.profiles = {
--- a/modules/services/headscale/default.nix
+++ b/modules/services/headscale/default.nix
@@ -20,7 +20,7 @@ in {
      port = 8080;

      settings = {
-        policy.path = null;
+        acl_policy_path = null;
        ip_prefixes = [
          "100.64.0.0/10"
        ];
@@ -28,9 +28,10 @@ in {
        derp = {
          auto_update_enable = false;
          update_frequency = "24h";
+          urls = [];
        };
-        dns = {
-          base_domain = "mesh.vimium.net";
+        dns_config = {
+          base_domain = "vimium.net";
          extra_records = [
            {
              name = "grafana.mesh.vimium.net";
@@ -44,7 +45,7 @@ in {
            }
          ];
          magic_dns = true;
-          nameservers.global = [
+          nameservers = [
            "9.9.9.9"
          ];
        };
--- a/modules/services/immich/default.nix
+++ b/modules/services/immich/default.nix
@@ -0,0 +1,54 @@
+{ config, lib, self, ... }:
+
+with lib;
+
+let cfg = config.modules.services.immich;
+in {
+  options.modules.services.immich = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.nginx = {
+      virtualHosts = {
+        "gallery.vimium.com" = {
+          forceSSL = true;
+          enableACME = true;
+          locations."/" = {
+            proxyPass = "http://localhost:${toString config.services.immich.port}";
+            extraConfig = ''
+              client_max_body_size 50000M;
+
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+              proxy_set_header X-Forwarded-Proto $scheme;
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header Host $host;
+
+              proxy_buffering off;
+              proxy_redirect off;
+              proxy_http_version 1.1;
+              proxy_set_header Upgrade $http_upgrade;
+              proxy_set_header Connection "upgrade";
+
+              proxy_read_timeout 600s;
+              proxy_send_timeout 600s;
+              send_timeout 600s;
+            '';
+          };
+        };
+      };
+    };
+
+    age.secrets."files/services/immich/envfile" = {
+      file = "${self.inputs.secrets}/files/services/immich/envfile.age";
+    };
+
+    services.immich = {
+      enable = true;
+      secretsFile = config.age.secrets."files/services/immich/envfile".path;
+    };
+  };
+}
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -28,6 +28,9 @@ in {
      default = "vimium.com";
      example = "vimium.com";
    };
+    slidingSync = {
+      enable = lib.mkEnableOption "sliding-sync";
+    };
    usePostgresql = lib.mkEnableOption "postgresql";
  };

@@ -39,9 +42,10 @@ in {
        base_url = "https://${matrixSubdomain}";
        server_name = cfg.serverName;
      };
-      "m.identity_server" = {
-        "base_url" = "https://vector.im";
-      };
+      "m.identity_server" = {};
+      "org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
+        "url" = "https://${matrixSubdomain}";
+      } else { };
    };
    matrixServerConfig."m.server" = "${matrixSubdomain}:443";
    commonBridgeSettings = bridge: {
@@ -130,6 +134,13 @@ in {
            '';
          };
          "/_synapse/client".proxyPass = "http://localhost:8008";
+          "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = lib.mkIf cfg.slidingSync.enable {
+            priority = 100;
+            proxyPass = "http://localhost:8009";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $remote_addr;
+            '';
+          };
        };
      };
      "${cfg.serverName}" = let
@@ -175,12 +186,26 @@ in {
        max_upload_size = "100M";
        report_stats = false;
        server_name = cfg.serverName;
+        app_service_config_files = (lib.optional cfg.bridges.whatsapp
+          "/var/lib/mautrix-whatsapp/whatsapp-registration.yaml");
      };
    };
    systemd.services.matrix-synapse.serviceConfig.SupplementaryGroups =
      (lib.optional cfg.bridges.whatsapp
        config.systemd.services.mautrix-whatsapp.serviceConfig.Group);

+    age.secrets = if cfg.slidingSync.enable then {
+      "files/services/matrix/sliding-sync" = {
+        file = "${self.inputs.secrets}/files/services/matrix/sliding-sync.age";
+      };
+    } else {};
+
+    services.matrix-sliding-sync = lib.mkIf cfg.slidingSync.enable {
+      enable = true;
+      environmentFile = config.age.secrets."files/services/matrix/sliding-sync".path;
+      settings = { SYNCV3_SERVER = "https://${matrixSubdomain}"; };
+    };
+
    services.postgresql = lib.mkIf cfg.usePostgresql {
      ensureUsers = [
        {
--- a/overlays/gnome.nix
+++ b/overlays/gnome.nix
@@ -1,22 +1,11 @@
 final: prev:
 {
-  gvdb = prev.fetchgit {
-    url = "https://gitlab.gnome.org/GNOME/gvdb.git";
-    rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
-    sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
-  };
-
-  mutter = prev.mutter.overrideAttrs (attrs: {
-    src = prev.fetchurl {
-      url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
-      sha256 = "U5YPJ3kfTMZWhpwsKpGcw02g+i7k+cPQdDjOYkvpwTM=";
-    };
-
-    postPatch = ''
-      mkdir -p subprojects/gvdb
-      cp -r ${final.gvdb}/* subprojects/gvdb/
-
-      ${attrs.postPatch or ""}
-    '';
+  gnome = prev.gnome.overrideScope' (gself: gsuper: {
+    mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
+      src = prev.fetchurl {
+        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-46/mutter-triple-buffering-v4-46.tar.gz";
+        sha256 = "9MVb53tcOTkcXJ025bF2kX1+fGSfffliA43q00x2c/Y=";
+      };
+    });
  });
 }
--- a/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
+++ b/pkgs/streamrip/ensure-the-default-config-file-is-writable.patch
@@ -1,26 +0,0 @@
-From 18efb9b5c8e562b169425f6ba79977e52e8b91b9 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Sat, 13 Jan 2024 12:49:45 +0000
-Subject: [PATCH] Ensure the default config file is writable.
-
---
- streamrip/config.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/streamrip/config.py b/streamrip/config.py
-index 7ee2f57..88a5fef 100644
--- a/streamrip/config.py
-+++ b/streamrip/config.py
-@@ -378,6 +378,9 @@ def set_user_defaults(path: str, /):
-     """Update the TOML file at the path with user-specific default values."""
-     shutil.copy(BLANK_CONFIG_PATH, path)
-
-+    # Ensure the default config file is writable
-+    os.chmod(path, 0o644)
-+
-     with open(path) as f:
-         toml = parse(f.read())
-     toml["downloads"]["folder"] = DEFAULT_DOWNLOADS_FOLDER  # type: ignore
--
-2.42.0
-
--- a/pkgs/streamrip/package.nix
+++ b/pkgs/streamrip/package.nix
@@ -1,78 +0,0 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-
-, ffmpeg
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "streamrip";
-  version = "2.0.7";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "nathom";
-    repo = "streamrip";
-    rev = "46b570dbb6f81d604cbaa3bfa379463e0a20a841";
-    hash = "sha256-LD99OjguaBnrQxCwmCeHvmBMq5aOfobwnMd5/aCRZW8=";
-  };
-
-  patches = [
-    ./ensure-the-default-config-file-is-writable.patch
-  ];
-
-  nativeBuildInputs = with python3Packages; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    aiodns
-    aiofiles
-    aiohttp
-    aiolimiter
-    appdirs
-    cleo
-    click-help-colors
-    deezer-py
-    m3u8
-    mutagen
-    pathvalidate
-    pillow
-    pycryptodomex
-    pytest-asyncio
-    pytest-mock
-    rich
-    simple-term-menu
-    tomlkit
-    tqdm
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  prePatch = ''
-    sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml
-    sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml
-    sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml
-    sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml
-    sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml
-    sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml
-    sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml
-
-    sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py
-  '';
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
-    homepage = "https://github.com/nathom/streamrip";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ paveloom ];
-    mainProgram = "rip";
-  };
-}
-