From db1f6baaf79749d818aa1e758d734e8a6dafa4fa Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Sun, 26 Nov 2023 07:48:58 +0000 Subject: [PATCH] Convert nix-dev to flake config. --- flake.nix | 8 +++++++ hosts/common/compute-node.nix | 1 + hosts/common/global/default.nix | 1 - .../{global/boot.nix => systemd-boot.nix} | 0 hosts/common/user-node.nix | 12 ++++++++++ hosts/nix-dev/default.nix | 22 ++++++++++++++++++ hosts/nix-dev/hardware.nix | 23 +++++++++++++++++++ 7 files changed, 66 insertions(+), 1 deletion(-) rename hosts/common/{global/boot.nix => systemd-boot.nix} (100%) create mode 100644 hosts/common/user-node.nix create mode 100644 hosts/nix-dev/default.nix create mode 100644 hosts/nix-dev/hardware.nix diff --git a/flake.nix b/flake.nix index c24ca56..bc58145 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ c1 = mkNixos [ ./hosts/c1 ]; c2 = mkNixos [ ./hosts/c2 ]; c3 = mkNixos [ ./hosts/c3 ]; + nix-dev = mkNixos [ ./hosts/nix-dev ]; }; deploy = { @@ -54,6 +55,13 @@ path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.c3; }; }; + nix-dev = { + hostname = "nix-dev"; + profiles.system = { + user = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.nix-dev; + }; + }; }; }; diff --git a/hosts/common/compute-node.nix b/hosts/common/compute-node.nix index 60924f1..f73097d 100644 --- a/hosts/common/compute-node.nix +++ b/hosts/common/compute-node.nix @@ -10,5 +10,6 @@ ./sshd.nix ./user-ppetru.nix ./unattended-encryption.nix + ./systemd-boot.nix ]; } diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index befc250..490e9e7 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -1,7 +1,6 @@ { pkgs, self, ... }: { imports = [ - ./boot.nix ./cpufreq.nix ./flakes.nix ./locale.nix diff --git a/hosts/common/global/boot.nix b/hosts/common/systemd-boot.nix similarity index 100% rename from hosts/common/global/boot.nix rename to hosts/common/systemd-boot.nix diff --git a/hosts/common/user-node.nix b/hosts/common/user-node.nix new file mode 100644 index 0000000..ca32020 --- /dev/null +++ b/hosts/common/user-node.nix @@ -0,0 +1,12 @@ +{ pkgs, inputs, ... }: +{ + imports = [ + # not used for this profile but defines options used by the other imports + inputs.impermanence.nixosModules.impermanence + ./cifs-client.nix + ./consul.nix + ./glusterfs-client.nix + ./sshd.nix + ./user-ppetru.nix + ]; +} diff --git a/hosts/nix-dev/default.nix b/hosts/nix-dev/default.nix new file mode 100644 index 0000000..df4735e --- /dev/null +++ b/hosts/nix-dev/default.nix @@ -0,0 +1,22 @@ +{ pkgs, inputs, ... }: +{ + imports = [ + ../common/global + ../common/user-node.nix + ./hardware.nix + ]; + + networking.hostName = "nix-dev"; + services.tailscaleAutoconnect.authkey = "tskey-auth-k6s6VD5CNTRL-3fmjSfzbQ3PHUMyaiML95P8xzmGv5XxYc"; + + environment.systemPackages = with pkgs; [ + wget + git + nomad + deploy-rs + docker + ]; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only +} diff --git a/hosts/nix-dev/hardware.nix b/hosts/nix-dev/hardware.nix new file mode 100644 index 0000000..7100600 --- /dev/null +++ b/hosts/nix-dev/hardware.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d8fd0d0d-99f3-47c3-9821-1ecb51e0fa7b"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/f50d64a5-948d-4ff4-88f2-0e0f4eae4c9e"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +}