From da424f1cf5b656fa0bfab75b69038233dac1c81c Mon Sep 17 00:00:00 2001 From: Soispha Date: Fri, 21 Apr 2023 20:15:15 +0200 Subject: Fix(hosts): Rename spawn to marduk to comply with scheme --- hosts/hostinfo.toml | 4 ++-- hosts/marduk/default.nix | 11 +++++++++++ hosts/marduk/hardware/default.nix | 28 ++++++++++++++++++++++++++++ hosts/marduk/networking.nix | 14 ++++++++++++++ hosts/spawn/default.nix | 11 ----------- hosts/spawn/hardware/default.nix | 28 ---------------------------- hosts/spawn/networking.nix | 14 -------------- 7 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 hosts/marduk/default.nix create mode 100644 hosts/marduk/hardware/default.nix create mode 100644 hosts/marduk/networking.nix delete mode 100644 hosts/spawn/default.nix delete mode 100644 hosts/spawn/hardware/default.nix delete mode 100644 hosts/spawn/networking.nix diff --git a/hosts/hostinfo.toml b/hosts/hostinfo.toml index 4f3b9aed..27125170 100644 --- a/hosts/hostinfo.toml +++ b/hosts/hostinfo.toml @@ -10,5 +10,5 @@ description = "This is my older and heavier laptop" [Lahmu] description = "This is my config running on a vm" -[Spawn] -description = "This is a small compilation target, to get sshkeys for secret unlocking" +[Marduk] +description = "This is a small compilation target, to get a install-iso" diff --git a/hosts/marduk/default.nix b/hosts/marduk/default.nix new file mode 100644 index 00000000..ff50f404 --- /dev/null +++ b/hosts/marduk/default.nix @@ -0,0 +1,11 @@ +# vim: ts=2 +{...}: { + imports = [ + ./hardware + ./networking.nix + + ../../system + ]; + + system.stateVersion = "23.05"; +} diff --git a/hosts/marduk/hardware/default.nix b/hosts/marduk/hardware/default.nix new file mode 100644 index 00000000..f6500ed5 --- /dev/null +++ b/hosts/marduk/hardware/default.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + (modulesPath + "/installer/scan/detected.nix") + # (modulesPath + "/installer/cd-dvd/installation-cd-base.nix") + + (modulesPath + "/profiles/base.nix") + (modulesPath + "/profiles/minimal.nix") + (modulesPath + "/profiles/all-hardware.nix") + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + system.fileSystemLayouts = { + enable = true; + mainDisk = "/dev/disk/by-uuid/"; + efiDisk = "/dev/disk/by-uuid/"; + }; + + boot = { + }; +} diff --git a/hosts/marduk/networking.nix b/hosts/marduk/networking.nix new file mode 100644 index 00000000..da8f3850 --- /dev/null +++ b/hosts/marduk/networking.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: { + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + networking.hostName = "marduk"; +} diff --git a/hosts/spawn/default.nix b/hosts/spawn/default.nix deleted file mode 100644 index ff50f404..00000000 --- a/hosts/spawn/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -# vim: ts=2 -{...}: { - imports = [ - ./hardware - ./networking.nix - - ../../system - ]; - - system.stateVersion = "23.05"; -} diff --git a/hosts/spawn/hardware/default.nix b/hosts/spawn/hardware/default.nix deleted file mode 100644 index f6500ed5..00000000 --- a/hosts/spawn/hardware/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/installer/scan/detected.nix") - # (modulesPath + "/installer/cd-dvd/installation-cd-base.nix") - - (modulesPath + "/profiles/base.nix") - (modulesPath + "/profiles/minimal.nix") - (modulesPath + "/profiles/all-hardware.nix") - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - system.fileSystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/"; - efiDisk = "/dev/disk/by-uuid/"; - }; - - boot = { - }; -} diff --git a/hosts/spawn/networking.nix b/hosts/spawn/networking.nix deleted file mode 100644 index 11c97f67..00000000 --- a/hosts/spawn/networking.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - lib, - ... -}: { - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - networking.hostName = "spawn"; -} -- cgit 1.4.1