From b195dc569701543b0db61e2eda31e2ba0a428fd6 Mon Sep 17 00:00:00 2001 From: Faris Date: Mon, 1 Jun 2026 00:17:48 +0100 Subject: [PATCH] update to NixOS 26.05 --- flake.lock | 24 ++++++------ flake.nix | 11 ++++-- home/podman.nix | 97 ++++++++++--------------------------------------- 3 files changed, 39 insertions(+), 93 deletions(-) diff --git a/flake.lock b/flake.lock index 65b210f..4f2b0a7 100644 --- a/flake.lock +++ b/flake.lock @@ -25,16 +25,16 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -86,16 +86,16 @@ ] }, "locked": { - "lastModified": 1772129556, - "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "lastModified": 1779036909, + "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "rev": "56c666e108467d87d13508936aade6d567f2a501", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.11", + "ref": "nix-darwin-26.05", "repo": "nix-darwin", "type": "github" } @@ -165,16 +165,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777428379, - "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "lastModified": 1780203844, + "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 63a8ed1..08c2e83 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,14 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; - home-manager.url = "github:nix-community/home-manager/release-25.11"; + home-manager.url = "github:nix-community/home-manager/release-26.05"; home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; + nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; lazyvim.url = "github:pfassina/lazyvim-nix"; nix-flatpak.url = "github:gmodena/nix-flatpak"; @@ -72,6 +72,11 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { + inherit lazyvim; + inherit inputs; + hostname = "nixos-server"; + }; home-manager.users.admin = { imports = [ ./home/common.nix diff --git a/home/podman.nix b/home/podman.nix index 28f1c0d..8947341 100644 --- a/home/podman.nix +++ b/home/podman.nix @@ -520,65 +520,6 @@ }; }; - jellyseerr = { - image = "ghcr.io/fallenbagel/jellyseerr"; - autoStart = true; - autoUpdate = "registry"; - network = "internal_net"; - environmentFile = [ - "/pool/services/secrets/default" - ]; - volumes = [ - "/pool/services/podman/jellyseerr:/app/config" - ]; - extraConfig = { - Service = { - TimeoutStartSec = 900; - }; - }; - }; - - # joplin = { - # image = "docker.io/joplin/server:latest"; - # autoStart = true; - # autoUpdate = "registry"; - # network = "internal_net"; - # environmentFile = [ - # "/pool/services/secrets/default" - # "/pool/services/secrets/joplin" - # ]; - # ports = [ - # "22300:22300" - # ]; - # extraConfig = { - # Service = { - # TimeoutStartSec = 900; - # }; - # }; - # }; - # - # joplin-db = { - # image = "docker.io/postgres:15"; - # autoStart = true; - # autoUpdate = "registry"; - # network = "internal_net"; - # environmentFile = [ - # "/pool/services/secrets/default" - # "/pool/services/secrets/joplin" - # ]; - # volumes = [ - # "/pool/services/podman/joplin-db:/var/lib/postgresql/data" - # ]; - # ports = [ - # "5432:5432" - # ]; - # extraConfig = { - # Service = { - # TimeoutStartSec = 900; - # }; - # }; - # }; - kiwix = { image = "ghcr.io/kiwix/kiwix-serve:latest"; autoStart = true; @@ -931,7 +872,7 @@ "/pool/services/podman/paperless-ngx/data:/usr/src/paperless/data" "/pool/services/podman/paperless-ngx/media:/usr/src/paperless/media" "/pool/services/podman/paperless-ngx/export:/usr/src/paperless/export" - "/pool/data/scans:/usr/src/paperless/consume" + "/pool/services/scans:/usr/src/paperless/consume" ]; extraConfig = { Service = { @@ -1079,6 +1020,24 @@ }; }; + seerr = { + image = "ghcr.io/seerr-team/seerr:latest"; + autoStart = true; + autoUpdate = "registry"; + network = "internal_net"; + environmentFile = [ + "/pool/services/secrets/default" + ]; + volumes = [ + "/pool/services/podman/seerr:/app/config" + ]; + extraConfig = { + Service = { + TimeoutStartSec = 900; + }; + }; + }; + searxng = { image = "docker.io/searxng/searxng:latest"; autoStart = true; @@ -1180,24 +1139,6 @@ }; }; - tinyauth = { - image = "ghcr.io/steveiliop56/tinyauth:v5"; - autoStart = true; - autoUpdate = "registry"; - network = "internal_net"; - environmentFile = [ - "/pool/services/secrets/default" - "/pool/services/secrets/tinyauth" - ]; - volumes = [ - "/pool/services/podman/tinyauth/:/data" - ]; - extraConfig = { - Service = { - TimeoutStartSec = 900; - }; - }; - }; tubearchivist = { image = "docker.io/bbilly1/tubearchivist";