diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | machines/pump-netboot.nix | 8 | ||||
| -rw-r--r-- | mut/ghostty/config | 1 | ||||
| -rw-r--r-- | mut/neovim/init.lua | 2 | ||||
| -rw-r--r-- | profiles/core/packages.nix | 1 | ||||
| -rw-r--r-- | profiles/netboot/system.nix | 13 |
6 files changed, 10 insertions, 17 deletions
@@ -65,7 +65,7 @@ ++ modulesIn ./profiles/station ++ modulesIn ./profiles/email ++ [ - (import ./profiles/netboot/system.nix nixosConfigurations.pump) + (import ./profiles/netboot/system.nix self.nixosConfigurations.pump) ]; opts = { isStation = true; diff --git a/machines/pump-netboot.nix b/machines/pump-netboot.nix index 5125440..ececa4c 100644 --- a/machines/pump-netboot.nix +++ b/machines/pump-netboot.nix @@ -29,10 +29,11 @@ networking.hostName = "pump"; networking.domain = "vinkies.net"; - boot.supportedFilesystems = [ "zfs" ]; - boot.zfs.forceImportRoot = false; networking.hostId = "7da046cb"; + netboot.storeContents = []; + # boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.forceImportRoot = false; boot.initrd.availableKernelModules = [ "e1000e" ]; boot.initrd.network = { enable = true; @@ -52,11 +53,10 @@ fileSystems."/data" = { device = "zpool/data"; fsType = "zfs"; - neededForBoot = true; }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - system.stateVersion = "24.05"; + system.stateVersion = config.system.nixos.release; nix.extraOptions = mkForce '' experimental-features = nix-command flakes ''; diff --git a/mut/ghostty/config b/mut/ghostty/config index ea81f22..d682f8c 100644 --- a/mut/ghostty/config +++ b/mut/ghostty/config @@ -16,3 +16,4 @@ macos-option-as-alt=true clipboard-read = allow clipboard-write = allow +clipboard-paste-protection=false diff --git a/mut/neovim/init.lua b/mut/neovim/init.lua index 7ab99c8..7da402c 100644 --- a/mut/neovim/init.lua +++ b/mut/neovim/init.lua @@ -1 +1 @@ -return require("my") +return require("my")
\ No newline at end of file diff --git a/profiles/core/packages.nix b/profiles/core/packages.nix index 4370616..118827a 100644 --- a/profiles/core/packages.nix +++ b/profiles/core/packages.nix @@ -39,6 +39,7 @@ with lib; coreutils killall carapace + vis ] ++ (optionals (!machine.isDarwin) [ man-pages man-pages-posix diff --git a/profiles/netboot/system.nix b/profiles/netboot/system.nix index b0e7945..882309d 100644 --- a/profiles/netboot/system.nix +++ b/profiles/netboot/system.nix @@ -5,25 +5,16 @@ sys: { pkgs, lib, ... }: let name = "run-pixiecore"; text = '' sudo ${pkgs.pixiecore}/bin/pixiecore \ - boot kernel/bzImage initrd/initrd \ - --cmdline "init=init/init loglevel=4" \ + boot ${build.kernel}/bzImage ${build.netbootRamdisk}/initrd \ + --cmdline "init=${build.toplevel}/init loglevel=4" \ --debug --dhcp-no-bind \ --port 64172 --status-port 64172 "$@" ''; }; - build-pixie = pkgs.writeShellApplication { - name = "build-pixie"; - text = '' - nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel - nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init - nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd - ''; - }; in { networking.firewall.allowedUDPPorts = [ 67 69 4011 ]; networking.firewall.allowedTCPPorts = [ 64172 ]; environment.systemPackages = [ run-pixiecore - build-pixie ]; } |