diff --git a/configs/hardware/cpu_amd.nix b/configs/hardware/cpu_amd.nix deleted file mode 100644 index 54b9a51..0000000 --- a/configs/hardware/cpu_amd.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, config, ... }: -{ - boot.kernelModules = [ "kvm-amd" ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/configs/hardware/cpu_intel.nix b/configs/hardware/cpu_intel.nix deleted file mode 100644 index 2666b0f..0000000 --- a/configs/hardware/cpu_intel.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, config, ... }: -{ - boot.kernelModules = [ "kvm-intel" ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/configs/programs/scripts/default.nix b/configs/programs/scripts/default.nix index a18489e..83df4f7 100644 --- a/configs/programs/scripts/default.nix +++ b/configs/programs/scripts/default.nix @@ -38,7 +38,7 @@ case "$1" in all) # Create a list of hostnames to rebuild - hosts=("nemesis" "apollo") + hosts=("nemesis" "apollo" "mellinoe") # Use parallel to rebuild each host , parallel rebuild ::: "''${hosts[@]}" @@ -52,6 +52,9 @@ fi ;; *) + echo "==========================" + echo "=== Rebuilding $1 ===" + echo "==========================" rebuild_remote "$1" exit 0 ;; diff --git a/configs/programs/scripts/deploy.sh b/configs/programs/scripts/deploy.sh index 0c09576..2fc615f 100755 --- a/configs/programs/scripts/deploy.sh +++ b/configs/programs/scripts/deploy.sh @@ -1,6 +1,6 @@ # Set default values -flake=".#default" # Default flake attribute if none is provided -target_host="nixos@" # Default target host +flake="" # Default flake attribute if none is provided +target_host="" # Default target host # Process command-line arguments while [[ $# -gt 0 ]]; do diff --git a/flake.nix b/flake.nix index e739ce6..99c466c 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ (mkSystem "graphical" "nemesis" "nvme-nvme.c0a9-323332354536453737343334-435432303030503353534438-00000001" ) - # (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab") + (mkSystem "graphical" "mellinoe" "/dev/disk/by-id/nvme-eui.01000000000000008ce38e04019a68ab") (mkSystem "headless" "apollo" "/dev/disk/by-id/nvme-eui.002538d221b47b01") ]; }; diff --git a/hosts/apollo.nix b/hosts/apollo.nix index 43e0592..9b59f5f 100644 --- a/hosts/apollo.nix +++ b/hosts/apollo.nix @@ -1,8 +1,11 @@ +{ lib, config, ... }: { imports = [ ../configs/bootloaders/systemd-boot.nix ../configs/filesystems/impermanence.nix - ../configs/hardware/cpu_intel.nix ../configs/services.nix ]; + boot.kernelModules = [ "kvm-intel" ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/mellinoe.nix b/hosts/mellinoe.nix new file mode 100644 index 0000000..e5aefaa --- /dev/null +++ b/hosts/mellinoe.nix @@ -0,0 +1,17 @@ +{ + inputs, + lib, + config, + ... +}: +{ + imports = [ + ../configs/bootloaders/systemd-boot.nix + ../configs/filesystems/impermanence.nix + ../configs/hardware/nvidia.nix + inputs.nixos-hardware.nixosModules.gigabyte-b650 + ]; + boot.kernelModules = [ "kvm-intel" ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}