From beb22dc1dc02e27355688cfbf99982d0fd0380b1 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 25 Dec 2025 17:16:16 -0600 Subject: [PATCH] Package updates and fixes --- flake.lock | 85 ++++++++++++++++---------------- flake.nix | 3 +- home/hosts/ivr/default.nix | 2 +- modules/nixos/kubernetes.nix | 4 +- modules/nixos/remote-builder.nix | 1 + 5 files changed, 49 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 433fe44..4efefd3 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765893949, - "narHash": "sha256-5wn3/cMZ6cQ7BHaoTkeDiMxgjZUV/8FPGplCJ/P6Idc=", + "lastModified": 1766287748, + "narHash": "sha256-XbW+VGwYTpseu5Lkb0TExaBgiAV4XMJQNFu+Vy2zb9Y=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "39896cb5a1a6ad52d1feb6634913087e11059454", + "rev": "a873f009f7a78a2ffe0d14f113526175432608d0", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1765898887, - "narHash": "sha256-aNhzCsrGn7OiOc7OacJ4E+rFjjr5xxMVDbn9A2tmtnk=", + "lastModified": 1766626650, + "narHash": "sha256-DXdmSNMze2vivbnJbLN10gFRDQtODDO69g4FO3jt/JU=", "owner": "nix-community", "repo": "nixhelm", - "rev": "5124f0f609b252eb8fb10b520d2bc1e5604fab91", + "rev": "00104a9d5001fa32f7fea2f7566b6d8897101141", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1765684049, - "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", + "lastModified": 1766524813, + "narHash": "sha256-N/sxS27+t9nGvGWqwwAceSMW/Y5ddcypS/aiTnZ7ScA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", + "rev": "c2b36207f2c396c79dbed9d40536db221bd4e363", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1765860045, - "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", + "lastModified": 1766682973, + "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", "owner": "nix-community", "repo": "home-manager", - "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", + "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -619,27 +619,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759770925, - "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=", + "lastModified": 1766025857, + "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "674c2b09c59a220204350ced584cadaacee30038", + "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "674c2b09c59a220204350ced584cadaacee30038", + "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce", "type": "github" } }, "nixunstable": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1765929769, - "narHash": "sha256-I8dDf/GoO0MFXBMTrMcbPUd7DM0RyHhNIEU1fR0t0l4=", + "lastModified": 1766604046, + "narHash": "sha256-9Wvp2G/z0YYMn7oeN/E90pRtXJxQCo7EZrKKkNpwru4=", "owner": "nix-community", "repo": "nixvim", - "rev": "081bcc930f9cfe61dfefb3399af0602fc3fea586", + "rev": "48b23bdae0770d86e1d0cb8ed830a0cb58810333", "type": "github" }, "original": { @@ -678,11 +678,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765924577, - "narHash": "sha256-MWzHr/YVBJBPMaeh2NKi5vT6JiLavqMKMx4SzUVW/VI=", + "lastModified": 1766697400, + "narHash": "sha256-uJZAqVmVkk9nip04vk2wvv26WzZ4M5At23pIjUeed+M=", "owner": "nix-community", "repo": "NUR", - "rev": "5054aae520825f3343af533fb2f4339eb46bb1fb", + "rev": "d6f00d5d251c70a5276e332176c971c892039482", "type": "github" }, "original": { @@ -725,15 +725,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1764188113, - "narHash": "sha256-Oq4aCjczgnFQqFNWZ6Ablg6x9579CO8tyBktYDYiZEs=", - "owner": "SaumonNet", + "lastModified": 1766702611, + "narHash": "sha256-KW1zfIYBwgZMUqiegB3n5AtVPWT9Pd7M7YvNRSm/94U=", + "owner": "greg-hellings", "repo": "proxmox-nixos", - "rev": "3be878a84866b9ef9214b8ea6f53630f47f4b192", + "rev": "963d0326df73582fb5d31f8f38b3b9c616841e9f", "type": "github" }, "original": { - "owner": "SaumonNet", + "owner": "greg-hellings", + "ref": "fix/212-AcceptEnv-redefinition", "repo": "proxmox-nixos", "type": "github" } @@ -871,11 +872,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -929,11 +930,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1766109760, - "narHash": "sha256-7A0h2MCAmv/mRgZQSgTS89sXRdDN956hFkaHQ01XGRc=", + "lastModified": 1766696996, + "narHash": "sha256-UwNseK91484NV1QS+ENUgEXdRGM92UdWWZHNoG1bebk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "909232203bc0bc4c1e3311f41be190322bb04a94", + "rev": "2c7addbb9d9a5c36a39e99e8a1a1df4262b4a220", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 718f916..203923a 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,8 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixunstable"; }; - proxmox.url = "github:SaumonNet/proxmox-nixos"; + proxmox.url = "github:greg-hellings/proxmox-nixos/fix/212-AcceptEnv-redefinition"; + #proxmox.url = "github:SaumonNet/proxmox-nixos"; # To enable backups: https://github.com/SaumonNet/proxmox-nixos/pull/45 #proxmox.url = "github:blecher-at/proxmox-nixos/fix-backup-pve-manager"; nix-hardware.url = "github:nixos/nixos-hardware"; diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index 12c9e31..3bf489c 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -23,7 +23,7 @@ in development = true; gui = true; nix.cache = false; - vscodium = true; + vscodium = false; }; home = { diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix index babf965..0ac346f 100644 --- a/modules/nixos/kubernetes.nix +++ b/modules/nixos/kubernetes.nix @@ -88,7 +88,7 @@ in inherit (top.charts.chartsMetadata.external-secrets.external-secrets) repo version; enable = true; name = top.charts.chartsMetadata.external-secrets.external-secrets.chart; - hash = "sha256-aRlMiaKAOWlectqM0czjaVAaUWceGHm5t3Q2J1pXl28="; + hash = "sha256-S1EGl2QECb6t4ITiZepc7LLwcwNDi3ggUiW1YfSNCqQ="; createNamespace = true; targetNamespace = "external-secrets"; values = { @@ -115,7 +115,7 @@ in inherit (top.charts.chartsMetadata.tailscale.tailscale-operator) repo version; enable = true; name = top.charts.chartsMetadata.tailscale.tailscale-operator.chart; - hash = "sha256-8pZyWgBTDtnUXnYzDCtbXtTzvUe35BnqHckI/bBuk7o="; + hash = "sha256-pkgolk7ji3lEilTlL12BnaIpXtEIVt4MiUFKouH8fcM="; createNamespace = true; targetNamespace = "tailscale"; }; diff --git a/modules/nixos/remote-builder.nix b/modules/nixos/remote-builder.nix index 93e76d1..b2614e5 100644 --- a/modules/nixos/remote-builder.nix +++ b/modules/nixos/remote-builder.nix @@ -47,6 +47,7 @@ with lib; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4fNCnomQEsFKQZp16LXRqkfXHzzZbGAYJWPMvlGGQy root@exodus" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC189EnvWjNUp3xSzPMAtw85oQEsvP1tQR1TK640nLx6 greg@exodus" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4fNCnomQEsFKQZp16LXRqkfXHzzZbGAYJWPMvlGGQy root@exodus" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGJjyFVOsF74QKzRITc8z/5MJlIa47P1tMm9Z8HRJLm root@jude" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMMOdWSq6NtcP6sfe2uke4wSfgE16hfa970t+8ADdLwk root@nixos" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINwbFyuS9zcwZ7hGSpAWtx9NJq/elSLN8jYpr+/1nXd8 root@linode"