mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-01-19 01:21:39 +01:00
remove netboot stuff again
This commit is contained in:
parent
8b37b0adfc
commit
b62b7577ca
3 changed files with 4 additions and 46 deletions
|
@ -43,11 +43,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684672698,
|
"lastModified": 1684610121,
|
||||||
"narHash": "sha256-qHH7BFAzbWG4uzeDLolqNfvgBYHy+shzn8uJu9YDllg=",
|
"narHash": "sha256-mp1wfJ4VkMgK/yex4jeBhd2yd6CqFXYAIv6e1lnDGjI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "9f8c5cb63c239ffd09b69cb0c635e8870dbd667e",
|
"rev": "5627b70981730cf1839ae4477f9fd086d4fc7a6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
25
flake.nix
25
flake.nix
|
@ -52,7 +52,7 @@
|
||||||
# packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { };
|
# packages.x86_64-linux.circuitjs = nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/circuitjs { };
|
||||||
hydraJobs = self.packages;
|
hydraJobs = self.packages;
|
||||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||||
nixosConfigurations = rec {
|
nixosConfigurations = {
|
||||||
thinkpad = nixpkgs.lib.nixosSystem {
|
thinkpad = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = attrs;
|
specialArgs = attrs;
|
||||||
|
@ -86,20 +86,6 @@
|
||||||
./hosts/nuc
|
./hosts/nuc
|
||||||
./shared
|
./shared
|
||||||
sops-nix.nixosModules.sops
|
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 {
|
falkenstein-1 = nixpkgs.lib.nixosSystem {
|
||||||
|
@ -133,15 +119,6 @@
|
||||||
./shared/vim.nix
|
./shared/vim.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
netboot = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs.inputs = attrs;
|
|
||||||
modules = [
|
|
||||||
./hosts/netboot
|
|
||||||
./shared/caches.nix
|
|
||||||
./shared/vim.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -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";
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in a new issue