From 97263ced92d462333731a08715d9e5495b90e713 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 9 Dec 2025 12:28:24 +0100 Subject: [PATCH 1/3] winboat: Unpin nodejs version --- flake.lock | 17 ----------------- flake.nix | 2 -- modules/system/programs/winboat.nix | 11 +---------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index c3d3599..2656a8a 100644 --- a/flake.lock +++ b/flake.lock @@ -236,22 +236,6 @@ "type": "github" } }, - "nixpkgs-old": { - "locked": { - "lastModified": 1764836381, - "narHash": "sha256-8jemYbbW9EBttQKHep7Rj8kzXaxsrk/lACdXA2DN5Xk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ff06bd3398fb1bea6c937039ece7e7c8aa396ebf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1764667669, @@ -296,7 +280,6 @@ "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "radicale-birthday-calendar": "radicale-birthday-calendar", "sops": "sops", diff --git a/flake.nix b/flake.nix index 11498ac..f951be3 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { diff --git a/modules/system/programs/winboat.nix b/modules/system/programs/winboat.nix index 2cf3fac..42e53e5 100644 --- a/modules/system/programs/winboat.nix +++ b/modules/system/programs/winboat.nix @@ -1,7 +1,5 @@ { config, - inputs, - pkgs, pkgs-unstable, lib, ... @@ -13,13 +11,6 @@ virtualisation.docker.enable = true; users.users.seb.extraGroups = [ config.users.groups.docker.name ]; - environment.systemPackages = - let - pkgs-old = import inputs.nixpkgs-old { - inherit (pkgs.stdenv.hostPlatform) system; - inherit (config.nixpkgs) config; - }; - in - [ (pkgs-unstable.winboat.override { nodejs_24 = pkgs-old.nodejs_24; }) ]; + environment.systemPackages = [ pkgs-unstable.winboat ]; }; } From b5e13cea5402ffb9c962794699ae3fdcd750aca4 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 9 Dec 2025 12:53:58 +0100 Subject: [PATCH 2/3] hosts/vps-public: Remove unused porkbun secrets --- hosts/vps-public/secrets.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hosts/vps-public/secrets.json b/hosts/vps-public/secrets.json index cecde9b..89d3b20 100644 --- a/hosts/vps-public/secrets.json +++ b/hosts/vps-public/secrets.json @@ -23,10 +23,6 @@ "outline": { "gitlab-auth-secret": "ENC[AES256_GCM,data:fNxlI0sJdoY9hFxiJz4OdGLv1NyZbMchW/df5VuLBHqeQG19Seul0R1J0Fl+NBFfAAiyHA6oGzXerYLt6KsNDwFmK2ODuw==,iv:TfFyC+JUvb2GaeE8rh9Knj4fPkmoyWvymG9YAN/dpNA=,tag:PXn6uYXtFfV0N5+2fYyCZQ==,type:str]" }, - "porkbun": { - "api-key": "ENC[AES256_GCM,data:vH/WIUW9M2Z5zKi2cXT7YzB2X8wzKlo51a1ojwYT/ldurPajpSOe+Eq42MdaDP1d4R5V+n5cM7WkaEBRANmNut7q+S0=,iv:jNJusyrQqmmsU2olj7lP7YhYBCKE3Du1Ms79zH9kFa0=,tag:zRPhowwJT8/p7PFp4x624w==,type:str]", - "api-secret-key": "ENC[AES256_GCM,data:+X3HKEsqnrBiyptd+YFCIPriSCWH9UQt/iu7LDvWb10loPbI1VPGpSjr3rE9x2rnLAZKc+sDk5jdpAEUfAgG+0odGXg=,iv:W5HDePqDqfndfE2Jce8t3W1z97axBSvA2kzu6ichuTE=,tag:iSGRhQKzPQ6SUiwBpjN+UQ==,type:str]" - }, "sops": { "age": [ { @@ -38,8 +34,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvVnphWlNaTUU0QytIdnEv\nQnNzelN4MUMreXZrME5KZStFMDg2V1VFd21rCkk2Uy9ITEF3SjlRVEdMMXlPdHhG\nam1PNnp3emtnMnczeFFSSStJaHF6TkkKLS0tIEJKbFRzbmNqMjk5NXVHZnhlWWZ3\nYng5L1F5YUJGOTg3TTJCK281SG9Id3MKsmH2yj19ig2g+KzBGLD9dWkdvr6TLdSd\nuuDC+frhj7wWrEomOOjIoYtWHXkUtTSAnCEZhrhfyupYhEvlFfWRlw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-11-23T00:06:52Z", - "mac": "ENC[AES256_GCM,data:EYfQ1ZX85LjLLbTMeAgCWVKN7jQ28sntlml1vV8zu3ILaQKMHh3FSAWnrN0Xb8YTybGV9c+CP/ZxKH5DuxYo0/pstrLUqY8Bng4bFWDBk2n7eHZcm8suTPIsr0wLxx7tQwHz2KuV9l9JNYqpQQReD677SWjjxZTla6zmkK+uJm4=,iv:JgnCfdxx97Cr7z0Uan/5/49jZtPBoEN7jml+8zqWoBs=,tag:fPLCkAtAvFxVEr6CrnsFNQ==,type:str]", + "lastmodified": "2025-12-09T11:52:37Z", + "mac": "ENC[AES256_GCM,data:4vPUiXZZCBfNHH4yJ6ieHpo0eaTwulmJyaJVYjKBJtKvL5y19kE/Ax6XZtrQErTA85aBhe1S7O36WGv6ckaWIEhr16Cme5jbWZSZyuzM1QOy9+8+XboSu0uaurnA1EBZQlUXOB5ijC4Qt8r550m+wXb2fUVJIIWeqX+/R8gVFf0=,iv:yXVhgBG7x33tPuUURCswOJMR5vhzLJUvHsbmJ8xbtDI=,tag:SEmr2gIS1EUpjX/sNEpKmQ==,type:str]", "unencrypted_suffix": "_unencrypted", "version": "3.11.0" } From ed9e6ab5ef4dce92988fa69183e4db12911adb8b Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 9 Dec 2025 12:55:11 +0100 Subject: [PATCH 3/3] hosts/vps-public: Remove unused forgejo secret --- hosts/vps-public/secrets.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hosts/vps-public/secrets.json b/hosts/vps-public/secrets.json index 89d3b20..bcf32ec 100644 --- a/hosts/vps-public/secrets.json +++ b/hosts/vps-public/secrets.json @@ -4,9 +4,6 @@ "auth-key": "ENC[AES256_GCM,data:tnmR93k4iPsojBZgwVmnSPJkNDOYiJt9lJ/IpoDR/TWCIbpBmbFq7xKSnyoCXBRKiEZ6hK0z3jezuQc9IgQ=,iv:/b3+yxEOuPaRrrmD3LSUeSiNv/1u4bMxrg4B+1SKb0o=,tag:9f6ZSgFjP4HAExWiaStr2g==,type:str]", "service-auth-key": "ENC[AES256_GCM,data:fW9M95GXFGUrhIXiuVQdD+l7O+7qcTcYGVuTZC1hSUQunL/fjNh+cLFvjwEpKVvsZJ7uDzD0IHQlicBmzPI=,iv:XDFwA47jyQ8jkIOfkooywXGzUAtbQb5ktjbrcHnep9g=,tag:kh6G1ey8Ly2Rzx1DdoDmRQ==,type:str]" }, - "forgejo": { - "admin-password": "ENC[AES256_GCM,data:EI2o342VbzUBb1VOQNrFmOOD9BiDgCgY5Q==,iv:4BCOmHxzCr4Z3975MN4mr/lyeEVyJhwuGfDxek6GiSI=,tag:PRHh/HrvkgNQhZQ6yOKrxw==,type:str]" - }, "restic": { "password": "ENC[AES256_GCM,data:IGV07og9eSoleJnZ2+/FFLph7TLNd80q+u6WNn+V,iv:E2hBYbvpCMDul81lgUBNVr5Fm7x0u1f9cEkma9jKwYE=,tag:eA7CAtfQtodTCyOuEn4+ug==,type:str]" }, @@ -34,8 +31,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvVnphWlNaTUU0QytIdnEv\nQnNzelN4MUMreXZrME5KZStFMDg2V1VFd21rCkk2Uy9ITEF3SjlRVEdMMXlPdHhG\nam1PNnp3emtnMnczeFFSSStJaHF6TkkKLS0tIEJKbFRzbmNqMjk5NXVHZnhlWWZ3\nYng5L1F5YUJGOTg3TTJCK281SG9Id3MKsmH2yj19ig2g+KzBGLD9dWkdvr6TLdSd\nuuDC+frhj7wWrEomOOjIoYtWHXkUtTSAnCEZhrhfyupYhEvlFfWRlw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-12-09T11:52:37Z", - "mac": "ENC[AES256_GCM,data:4vPUiXZZCBfNHH4yJ6ieHpo0eaTwulmJyaJVYjKBJtKvL5y19kE/Ax6XZtrQErTA85aBhe1S7O36WGv6ckaWIEhr16Cme5jbWZSZyuzM1QOy9+8+XboSu0uaurnA1EBZQlUXOB5ijC4Qt8r550m+wXb2fUVJIIWeqX+/R8gVFf0=,iv:yXVhgBG7x33tPuUURCswOJMR5vhzLJUvHsbmJ8xbtDI=,tag:SEmr2gIS1EUpjX/sNEpKmQ==,type:str]", + "lastmodified": "2025-12-09T11:54:09Z", + "mac": "ENC[AES256_GCM,data:hmQQhRVXv+g2run9fftwEjH9B+feiGLVaSgmkAt14z6n1y38heThksgaLCT3uE3hAmH7CJ8kumF9o6IYVSGQMWwmlB1GYajrptaF57/m0aMgPEZpODz+bnstRVU7z6EmTT3Pp49PIP8cRXT8U9HQQpOcM4Fr5+epFkkzJicpSKs=,iv:JkDOVQ5PciUYQcff9cuP+KWEry2+X5hpf7Y/TwPDUhQ=,tag:rocHo+ml5zXp2KgYY/chOw==,type:str]", "unencrypted_suffix": "_unencrypted", "version": "3.11.0" }