nix-configs

commit f6991304a164dc241204fe021b60d52b72017f2b
parent 19b2067ae151c2c5b8dbeae7f9db849a531f7dfb
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Wed, 27 Aug 2025 17:04:50 +0100

Move DHCP setup to common include

Diffstat:
A
common/dhcp.nix
 | 
10
++++++++++
M
machines/arcadia.nix
 | 
11
++++-------
M
machines/artemis.nix
 | 
8
++++----
M
machines/ilias.nix
 | 
16
+++++++---------
M
machines/minerva.nix
 | 
15
+++++++--------

5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/common/dhcp.nix b/common/dhcp.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+
+{
+  networking = {
+    networkmanager.enable = true;
+    useDHCP = lib.mkDefault true;
+  };
+}
+
+
diff --git a/machines/arcadia.nix b/machines/arcadia.nix
@@ -7,11 +7,15 @@ let
 in
 
 {
+
+  networking.hostName = "arcadia";
+
   imports =
     [
       (import "${home-manager}/nixos") # Home-Manager
       ../common/audio.nix
       (import ../common/autologin.nix {inherit username;})
+      ../common/dhcp.nix
       ../common/flakes.nix
       ../common/garbage.nix
       (import ../common/hyprland.nix {inherit pkgs username;})
@@ -61,13 +65,6 @@ in
     };
   };
 
-  # Networking
-  networking = {
-    hostName = "arcadia";
-    networkmanager.enable = true;
-    useDHCP = lib.mkDefault true;
-  };
-
   system.stateVersion = "24.11";
 
 }
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -7,11 +7,15 @@ let
 in
 
 {
+
+  networking.hostName = "artemis";
+
   imports = [
     (import "${home-manager}/nixos")
     (import ../scripts/blog-duolingo.nix {inherit pkgs domain username;})
     (import ../scripts/blog-status.nix {inherit pkgs domain;})
     (import ../common/docker.nix {inherit config pkgs username domain timezone htpasswd todosecret vpnusername vpnpassword;})
+    ../common/dhcp.nix
     ../common/flakes.nix
     ../common/garbage.nix
     (import ../common/locale.nix {inherit pkgs timezone;})
@@ -55,10 +59,6 @@ in
     };
   };
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  networking = {
-    hostName = "artemis";
-    useDHCP = lib.mkDefault true;
-  };
 
   # Cron jobs
   services.cron = {
diff --git a/machines/ilias.nix b/machines/ilias.nix
@@ -4,9 +4,15 @@
 
 let
   home-manager = builtins.fetchTarball https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz;
-in {
+in
+
+{
+
+  networking.hostName = "ilias";
+
   imports = [
     (import "${home-manager}/nixos")
+    ../common/dhcp.nix
     ../common/flakes.nix
     ../common/garbage.nix
     (import ../common/locale.nix {inherit pkgs timezone;})
@@ -44,7 +50,6 @@ in {
         (import ../home/fish.nix {inherit pkgs domain;})
         (import ../home/git.nix {inherit fullname email;})
         ../home/htop.nix
-        ../home/iamb.nix
         ../home/neovim.nix
         (import ../home/rbw.nix {inherit pkgs domain email;})
         (import ../home/rclone.nix {inherit domain username sshport privatekey;})
@@ -73,13 +78,6 @@ in {
     { device = "/dev/disk/by-uuid/3397e636-91db-44ae-9572-923e4b3acbbe"; }
   ];
 
-  # Networking
-  networking = {
-    hostName = "ilias";
-    networkmanager.enable = true;
-    useDHCP = lib.mkDefault true;
-  };
-
   # Cron jobs
   services = {
     cron = {
diff --git a/machines/minerva.nix b/machines/minerva.nix
@@ -4,11 +4,17 @@
 
 let
   home-manager = builtins.fetchTarball https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz;
-in {
+in
+
+{
+
+  networking.hostName = "minerva";
+
   imports = [
     (import "${home-manager}/nixos")
     ../common/audio.nix
     (import ../common/autologin.nix {inherit username;})
+    ../common/dhcp.nix
     ../common/flakes.nix
     ../common/fonts.nix
     ../common/garbage.nix
@@ -67,13 +73,6 @@ in {
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  # Networking
-  networking = {
-    hostName = "minerva";
-    networkmanager.enable = true;
-    useDHCP = lib.mkDefault true;
-  };
-
   # Packages
   environment.systemPackages = with pkgs; [
     atool