From b62b7577cab4e6481b2d66d4e28a288d2fe59589 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 22 May 2023 11:14:56 +0200 Subject: [PATCH] remove netboot stuff again --- flake.lock | 6 +++--- flake.nix | 25 +------------------------ hosts/netboot/default.nix | 19 ------------------- 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 hosts/netboot/default.nix diff --git a/flake.lock b/flake.lock index 24f4f42..a2bf8a1 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684672698, - "narHash": "sha256-qHH7BFAzbWG4uzeDLolqNfvgBYHy+shzn8uJu9YDllg=", + "lastModified": 1684610121, + "narHash": "sha256-mp1wfJ4VkMgK/yex4jeBhd2yd6CqFXYAIv6e1lnDGjI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9f8c5cb63c239ffd09b69cb0c635e8870dbd667e", + "rev": "5627b70981730cf1839ae4477f9fd086d4fc7a6c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5f0751..8467525 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ # packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { }; hydraJobs = self.packages; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; - nixosConfigurations = rec { + nixosConfigurations = { thinkpad = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -86,20 +86,6 @@ ./hosts/nuc ./shared sops-nix.nixosModules.sops - - # hacking this into here since it somehow doesnt' work as module - { - services.pixiecore = rec { - enable = true; - port = 64172; - statusPort = port; - openFirewall = true; - kernel = "${netboot.config.system.build.kernel}/bzImage"; - initrd = "${netboot.config.system.build.netbootRamdisk}/initrd"; - cmdLine = "init=${netboot.config.system.build.toplevel}/init loglevel=4"; - }; - } - ]; }; falkenstein-1 = nixpkgs.lib.nixosSystem { @@ -133,15 +119,6 @@ ./shared/vim.nix ]; }; - netboot = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs.inputs = attrs; - modules = [ - ./hosts/netboot - ./shared/caches.nix - ./shared/vim.nix - ]; - }; }; }; } diff --git a/hosts/netboot/default.nix b/hosts/netboot/default.nix deleted file mode 100644 index bb3eec7..0000000 --- a/hosts/netboot/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, modulesPath, ... }: -{ - imports = [ - "${modulesPath}/installer/netboot/netboot-minimal.nix" - - ]; - - console = { - font = "Lat2-Terminus16"; - keyMap = "dvorak"; - }; - programs.git.enable = true; - - # in case we need to rescue a zfs machine - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - system.stateVersion = "23.05"; - - -}