From da06bed086544ee842608aca3bcdc0f480da0760 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Thu, 25 Jun 2026 14:30:30 +0200 Subject: [PATCH] Updated Flake and resolved Warnings --- flake.lock | 105 +++++++----------- flake.nix | 40 +++++-- .../hardware-configuration.nix | 4 +- .../cyper-desktop/hardware-configuration.nix | 1 + hosts/cyper-node-1/hardware-configuration.nix | 2 + hosts/cyper-node-2/hardware-configuration.nix | 2 + hosts/cyper-proxy/hardware-configuration.nix | 3 +- 7 files changed, 78 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index e6d076c..3270468 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1781255309, - "narHash": "sha256-n2P5xkAYGylrJ3feu7L6uaCUw/+jW8rk+HO127gDbFA=", + "lastModified": 1782117778, + "narHash": "sha256-x6vIJpJziw3Hs0JKKDP+AeRPWwqyMDOmK6I26tqbYj4=", "owner": "catppuccin", "repo": "nix", - "rev": "036c78ea4cd8a42c8546c6316a944fd7d59d4341", + "rev": "e98afe2dfd950bda4e6a8ef32bb563ec2f04505a", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1781788787, - "narHash": "sha256-YqlTCRRhGvNjcJejPeMuHrYQ/TVhOO2MV/nEGMWb8nk=", + "lastModified": 1782358560, + "narHash": "sha256-vCcLh9pw3XO/+Lxk8r6xv6QnoCrTfGqiACcI7O637Wg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d456f483f157d4b706416005da226234b9c116ff", + "rev": "3a70e333f2950c302e875c44cfcfaff3f80f36bc", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1781796010, - "narHash": "sha256-bIqjZgUfp3vba/C1UJLVqTo8zdpfqMDvuwWrHmqDWm4=", + "lastModified": 1782366482, + "narHash": "sha256-J+yvgoF+zbYZHJkGxfMCPWa8L3i5Nm7Xlgfw2Eky/Xs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ae1690c2138313d988c81f5c25a9d0b6fadfd3b1", + "rev": "c9e1a6c3a05c0310424f99c6b90af1164340af99", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1781775854, - "narHash": "sha256-0eb1+zKSTwgD3qsBm7UiuRabahHQNkTP94Z/s3nMK60=", + "lastModified": 1782349937, + "narHash": "sha256-2haY6BBTL+yCblUup/P9t3D8sUTMSqIok68n+qGjjYI=", "owner": "kaylorben", "repo": "nixcord", - "rev": "b92ceb7923c87dfcfcf84415407b0ca63e17548b", + "rev": "afdacaafb10aa459dfabbb8af99e4b0deb74f1d2", "type": "github" }, "original": { @@ -688,42 +688,6 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769813415, - "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "8946737ff703382fda7623b9fab071d037e897d5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1780749050, @@ -787,20 +751,34 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1781607440, + "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "systems": "systems_3" }, "locked": { - "lastModified": 1781713417, - "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=", + "lastModified": 1782254890, + "narHash": "sha256-kjsEECqhpPnJWqhooXp6tWh2qGQftCPAo2G1GvZtKdw=", "owner": "nix-community", "repo": "nixvim", - "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7", + "rev": "dbf9550dba8448b03e11d58e5695d6c44a464554", "type": "github" }, "original": { @@ -817,11 +795,11 @@ ] }, "locked": { - "lastModified": 1781800183, - "narHash": "sha256-NcRZr/JQiAvqC2qCyMxcfx/98Hf1epwdtjcbwKHeMf8=", + "lastModified": 1782389847, + "narHash": "sha256-eP8eqJcG07GXr/mNOm6xS4ws+7sKw8pPk9xbAf11tb8=", "owner": "nix-community", "repo": "NUR", - "rev": "0559d992b12ee209570bb325d79e90007b13da52", + "rev": "a573a709b3b6778499500cdea3ea134faef25218", "type": "github" }, "original": { @@ -863,7 +841,6 @@ "hyprland-plugins": "hyprland-plugins", "nix-homebrew": "nix-homebrew", "nixcord": "nixcord", - "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "nur": "nur", @@ -878,11 +855,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1782165805, + "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "type": "github" }, "original": { @@ -899,11 +876,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1781425310, - "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=", + "lastModified": 1782031037, + "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441", + "rev": "9cb27462cfd20edac174353f1e95bc03aa888863", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 60942a8..469a78e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,6 @@ # monorepo w/ recipes ("derivations") nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixos-generators = { - url = "github:nix-community/nixos-generators"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # declarative Configs home-manager = { url = "github:nix-community/home-manager/master"; @@ -51,7 +46,6 @@ # declarative Neovim nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; }; # declarative Discord @@ -89,22 +83,37 @@ nixvim, hyprland, sops-nix, - nixos-generators, nur, ... }@inputs: let primaryUser = "phil"; + /* + mkIso - Build a NixOS image for a given target. + + Available targets (imageModule → imageBuildAttr): + ISO (minimal) : "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" → "isoImage" + ISO (graphical): "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" → "isoImage" + Amazon EC2 : "${nixpkgs}/nixos/modules/virtualisation/amazon-image.nix" → "amazonImage" + Linode : "${nixpkgs}/nixos/modules/virtualisation/linode-image.nix" → "linodeImage" + Proxmox LXC : "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" → "tarball" + Google Cloud : "${nixpkgs}/nixos/modules/virtualisation/google-compute-image.nix" → "googleComputeImage" + Azure : "${nixpkgs}/nixos/modules/virtualisation/azure-image.nix" → "azureImage" + QEMU (runnable): "${nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix" → "vm" + QEMU (headless): "${nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix" → "vmWithBootLoader" + - Claude Sonnet 4.6 + */ mkIso = { hostName, isDarwin ? false, isServer ? false, + imageModule ? "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix", + imageBuildAttr ? "isoImage", }: - nixos-generators.nixosGenerate { + (nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - format = "iso"; specialArgs = { inherit inputs @@ -116,6 +125,7 @@ ; }; modules = [ + imageModule { nixpkgs.overlays = [ inputs.nur.overlays.default @@ -145,10 +155,15 @@ backupFileExtension = "backup"; useGlobalPkgs = true; useUserPackages = true; + sharedModules = [ + { + programs.nixvim.nixpkgs.source = inputs.nixpkgs; + } + ]; }; } ]; - }; + }).config.system.build.${imageBuildAttr}; mkSystem = { @@ -190,6 +205,11 @@ backupFileExtension = "hm-backup"; useGlobalPkgs = true; useUserPackages = true; + sharedModules = [ + { + programs.nixvim.nixpkgs.source = inputs.nixpkgs; + } + ]; }; } ]; diff --git a/hosts/cyper-controller/hardware-configuration.nix b/hosts/cyper-controller/hardware-configuration.nix index 92ae68a..b7b4279 100644 --- a/hosts/cyper-controller/hardware-configuration.nix +++ b/hosts/cyper-controller/hardware-configuration.nix @@ -21,6 +21,7 @@ initrd.kernelModules = [ ]; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; + zfs.forceImportRoot = false; }; fileSystems = { @@ -86,8 +87,5 @@ } ]; - networking.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/cyper-desktop/hardware-configuration.nix b/hosts/cyper-desktop/hardware-configuration.nix index a69f267..5fef0cb 100644 --- a/hosts/cyper-desktop/hardware-configuration.nix +++ b/hosts/cyper-desktop/hardware-configuration.nix @@ -31,6 +31,7 @@ extraModprobeConfig = '' options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" ''; + zfs.forceImportRoot = false; }; sops = { diff --git a/hosts/cyper-node-1/hardware-configuration.nix b/hosts/cyper-node-1/hardware-configuration.nix index f6f9e88..ab059a3 100644 --- a/hosts/cyper-node-1/hardware-configuration.nix +++ b/hosts/cyper-node-1/hardware-configuration.nix @@ -20,7 +20,9 @@ initrd.kernelModules = [ ]; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; + zfs.forceImportRoot = false; }; + fileSystems = { "/" = { device = "/dev/disk/by-label/NIXROOT"; diff --git a/hosts/cyper-node-2/hardware-configuration.nix b/hosts/cyper-node-2/hardware-configuration.nix index f6f9e88..ab059a3 100644 --- a/hosts/cyper-node-2/hardware-configuration.nix +++ b/hosts/cyper-node-2/hardware-configuration.nix @@ -20,7 +20,9 @@ initrd.kernelModules = [ ]; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; + zfs.forceImportRoot = false; }; + fileSystems = { "/" = { device = "/dev/disk/by-label/NIXROOT"; diff --git a/hosts/cyper-proxy/hardware-configuration.nix b/hosts/cyper-proxy/hardware-configuration.nix index 46e3130..a2d7003 100644 --- a/hosts/cyper-proxy/hardware-configuration.nix +++ b/hosts/cyper-proxy/hardware-configuration.nix @@ -23,6 +23,7 @@ }; kernelModules = [ ]; extraModulePackages = [ ]; + zfs.forceImportRoot = false; }; fileSystems = { @@ -42,6 +43,4 @@ }; swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }