From e514982fb6a95cdd10da54c2c9178ff3f520b9d8 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 19 Feb 2026 19:51:17 -0600 Subject: [PATCH] chore: remove proxmox from jeremiah --- flake.lock | 119 +--------------------------- flake.nix | 10 +-- hosts/unstable/isaiah/default.nix | 8 -- hosts/unstable/jeremiah/default.nix | 10 --- 4 files changed, 3 insertions(+), 144 deletions(-) diff --git a/flake.lock b/flake.lock index 1d036c2..eb1a94f 100644 --- a/flake.lock +++ b/flake.lock @@ -152,21 +152,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1767039857, @@ -467,51 +452,6 @@ "type": "github" } }, - "nixpkgs-libvncserver": { - "locked": { - "lastModified": 1750111231, - "narHash": "sha256-3a7Tha/RwYlzH/v3PJrG7+HjOj4c6YOv2K8sqdGsHVQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e6f23dc08d3624daab7094b701aa3954923c6bbb", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "e6f23dc08d3624daab7094b701aa3954923c6bbb", - "type": "indirect" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-25.05", - "type": "indirect" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1750134718, @@ -618,29 +558,6 @@ "type": "github" } }, - "proxmox": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs-libvncserver": "nixpkgs-libvncserver", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "utils": "utils" - }, - "locked": { - "lastModified": 1767936049, - "narHash": "sha256-Cq8VyCyBxNaQcUXbXvhpH8XN9EohmPV2N8OCNFC+nVQ=", - "owner": "greg-hellings", - "repo": "proxmox-nixos", - "rev": "9dc450d7e8cc95c36f0d48a5b8f80ceff1139a56", - "type": "github" - }, - "original": { - "owner": "greg-hellings", - "ref": "fix/212-AcceptEnv-redefinition", - "repo": "proxmox-nixos", - "type": "github" - } - }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -704,7 +621,6 @@ "nixunstable": "nixunstable", "nixvimunstable": "nixvimunstable", "nurpkgs": "nurpkgs", - "proxmox": "proxmox", "vsext": "vsext", "wsl": "wsl" } @@ -770,21 +686,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -806,24 +707,6 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -869,7 +752,7 @@ }, "wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixunstable" ] diff --git a/flake.nix b/flake.nix index cac4caf..a3be8fb 100644 --- a/flake.nix +++ b/flake.nix @@ -26,10 +26,6 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixunstable"; }; - 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"; nixvimunstable = { url = "github:nix-community/nixvim/main"; @@ -48,11 +44,10 @@ { self, ... }@top: let local_overlay = import ./overlays; - overlays = system: [ + overlays = [ top.agenix.overlays.default local_overlay top.nixvimunstable.overlays.default - top.proxmox.overlays.${system} top.nurpkgs.overlays.default top.vsext.overlays.default ]; @@ -65,13 +60,12 @@ imported_packages = top.nixunstable.lib.genAttrs systems ( system: import top.nixunstable { - inherit system; + inherit system overlays; config = { allowUnfree = true; allowUnfreePredicate = _: true; permittedInsecurePackages = [ "ventoy-1.1.05" ]; }; - overlays = overlays system; } ); in diff --git a/hosts/unstable/isaiah/default.nix b/hosts/unstable/isaiah/default.nix index b7c2db6..8e52f61 100644 --- a/hosts/unstable/isaiah/default.nix +++ b/hosts/unstable/isaiah/default.nix @@ -54,14 +54,6 @@ }; }; - fileSystems = { - "/media/proxmox" = { - device = "10.42.1.4:/volume1/proxmox"; - fsType = "nfs"; - options = [ "noatime" ]; - }; - }; - networking = { firewall = { enable = true; diff --git a/hosts/unstable/jeremiah/default.nix b/hosts/unstable/jeremiah/default.nix index ae7b8ec..e24d9d3 100644 --- a/hosts/unstable/jeremiah/default.nix +++ b/hosts/unstable/jeremiah/default.nix @@ -17,7 +17,6 @@ in { imports = [ ./hardware-configuration.nix - top.proxmox.nixosModules.proxmox-ve top.buildbot.nixosModules.buildbot-master top.buildbot.nixosModules.buildbot-worker ]; @@ -76,11 +75,6 @@ in fsType = "btrfs"; device = "/dev/nvme0n1p1"; }; - "/media/proxmox" = { - device = "10.42.1.4:/volume1/proxmox"; - fsType = "nfs"; - options = [ "noatime" ]; - }; }; greg = { @@ -182,10 +176,6 @@ in user = "greg"; }; }; - proxmox-ve = { - enable = true; - ipAddress = ip; - }; sunshine = { enable = true; autoStart = true;