diff --git a/flake.lock b/flake.lock index a2bf8a1..24f4f42 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684610121, - "narHash": "sha256-mp1wfJ4VkMgK/yex4jeBhd2yd6CqFXYAIv6e1lnDGjI=", + "lastModified": 1684672698, + "narHash": "sha256-qHH7BFAzbWG4uzeDLolqNfvgBYHy+shzn8uJu9YDllg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5627b70981730cf1839ae4477f9fd086d4fc7a6c", + "rev": "9f8c5cb63c239ffd09b69cb0c635e8870dbd667e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8467525..e5f0751 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 = { + nixosConfigurations = rec { thinkpad = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -86,6 +86,20 @@ ./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 { @@ -119,6 +133,15 @@ ./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 new file mode 100644 index 0000000..bb3eec7 --- /dev/null +++ b/hosts/netboot/default.nix @@ -0,0 +1,19 @@ +{ 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"; + + +} diff --git a/hosts/thinkpad/modules/greetd/default.nix b/hosts/thinkpad/modules/greetd/default.nix index 1c85692..f011f3d 100644 --- a/hosts/thinkpad/modules/greetd/default.nix +++ b/hosts/thinkpad/modules/greetd/default.nix @@ -4,7 +4,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.greetd}/bin/agreety --cmd Hyprland"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd Hyprland"; }; }; }; diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 881654a..e0bee54 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -4,7 +4,7 @@ # essentials wpa_supplicant_gui # manage wifi - xfce.thunar + cinnamon.nemo xdg-utils # used for xdg-open snapper-gui