From 7881651fba877dd9a79c4c32422cd7305f0306b5 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 19 Mar 2023 17:58:43 +0100
Subject: Fix(system/hardware): Use actually needed modules and UUID
The old values did work, but these should just make things a bit
clearer.
---
hosts/server1/configuration.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'hosts')
diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix
index 694b6b4..ad3d8a3 100644
--- a/hosts/server1/configuration.nix
+++ b/hosts/server1/configuration.nix
@@ -10,7 +10,7 @@
networking.hostName = "server1";
networking.domain = "vhack.eu";
- system.fileSystemLayouts.mainDisk = "/dev/vda3";
+ system.fileSystemLayouts.mainDisk = "/dev/disk/by-uuid/7d960eb9-9334-4aef-9f7c-9a908a91a6db";
system.stateVersion = "22.11";
}
--
cgit 1.4.1
From 0b55d0277cd341eed9532677036e885c0ae038ed Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 19 Mar 2023 18:01:16 +0100
Subject: Refactor(system/hardware): Move hardware to host
The hardware settings are (somewhat) host specific, and putting them in
`system` just builds the wrong expectations.
---
hosts/server1/configuration.nix | 1 +
hosts/server1/hardware.nix | 9 +++++++++
system/default.nix | 1 -
system/hardware/default.nix | 9 ---------
4 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 hosts/server1/hardware.nix
delete mode 100644 system/hardware/default.nix
(limited to 'hosts')
diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix
index ad3d8a3..891c5dc 100644
--- a/hosts/server1/configuration.nix
+++ b/hosts/server1/configuration.nix
@@ -1,6 +1,7 @@
{pkgs, ...}: {
imports = [
./networking.nix # network configuration that just works
+ ./hardware.nix
../../system
];
diff --git a/hosts/server1/hardware.nix b/hosts/server1/hardware.nix
new file mode 100644
index 0000000..9fabafe
--- /dev/null
+++ b/hosts/server1/hardware.nix
@@ -0,0 +1,9 @@
+{modulesPath, ...}: {
+ imports = [
+ (modulesPath + "/profiles/qemu-guest.nix")
+ (modulesPath + "/profiles/headless.nix")
+ ];
+ boot.loader.grub.device = "/dev/vda";
+ boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
+ boot.initrd.kernelModules = [];
+}
diff --git a/system/default.nix b/system/default.nix
index 9aa5d9e..d67ada2 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,7 +1,6 @@
{config, ...}: {
imports = [
./file_system_layouts
- ./hardware
./packages
./services
./users
diff --git a/system/hardware/default.nix b/system/hardware/default.nix
deleted file mode 100644
index 9fabafe..0000000
--- a/system/hardware/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{modulesPath, ...}: {
- imports = [
- (modulesPath + "/profiles/qemu-guest.nix")
- (modulesPath + "/profiles/headless.nix")
- ];
- boot.loader.grub.device = "/dev/vda";
- boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
- boot.initrd.kernelModules = [];
-}
--
cgit 1.4.1
From 8711fb2f30e59e21a31e3d4b7634dc66ef5c5917 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 19 Mar 2023 18:42:33 +0100
Subject: Fix(hosts/server1/networking): Remove ipv6 route
This is somewhat misconfigured, as it makes to config not compilable. I
assume, that this route setting is needed, but believe, that having a
compiling config is better.
---
hosts/server1/networking.nix | 4 ----
1 file changed, 4 deletions(-)
(limited to 'hosts')
diff --git a/hosts/server1/networking.nix b/hosts/server1/networking.nix
index 027bc27..ff83f52 100644
--- a/hosts/server1/networking.nix
+++ b/hosts/server1/networking.nix
@@ -34,10 +34,6 @@
}
];
ipv6.routes = [
- {
- address = "fe80::1";
- prefixLength = 128;
- }
];
};
};
--
cgit 1.4.1
From 25055f0921b0aed08e2d111fa295e0244fa44627 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 19 Mar 2023 19:20:12 +0100
Subject: Revert "Fix(hosts/server1/networking): Remove ipv6 route"
The commit didn't work and effectively disabled ipv6
---
hosts/server1/networking.nix | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'hosts')
diff --git a/hosts/server1/networking.nix b/hosts/server1/networking.nix
index ff83f52..027bc27 100644
--- a/hosts/server1/networking.nix
+++ b/hosts/server1/networking.nix
@@ -34,6 +34,10 @@
}
];
ipv6.routes = [
+ {
+ address = "fe80::1";
+ prefixLength = 128;
+ }
];
};
};
--
cgit 1.4.1