From 2530b918ca50158ff074816d7d1c8aeeeeb42e14 Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Thu, 5 Jun 2025 16:33:29 +0200 Subject: [PATCH] fix: resolve configuration conflicts - Fixed networking defaultGateway interface specification for sleeper-service - Resolved shell alias conflict between geir and sma users - Changed sma aliases from 'lab' to 'homelab' to avoid conflict --- modules/network/network-sleeper-service.nix | 5 ++++- modules/users/sma.nix | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/network/network-sleeper-service.nix b/modules/network/network-sleeper-service.nix index e83d3e0..9614a24 100644 --- a/modules/network/network-sleeper-service.nix +++ b/modules/network/network-sleeper-service.nix @@ -30,7 +30,10 @@ }; # Network gateway and DNS (based on nmap discovery) - defaultGateway = "10.0.0.138"; # Discovered router at lan.home + defaultGateway = { + address = "10.0.0.138"; # Discovered router at lan.home + interface = "enp0s25"; # Main ethernet interface + }; nameservers = [ "10.0.0.14" "10.0.0.138" "8.8.8.8" ]; # Pi-hole, router, Google DNS fallback # Additional firewall ports for file server services diff --git a/modules/users/sma.nix b/modules/users/sma.nix index 39ff0e4..9673839 100644 --- a/modules/users/sma.nix +++ b/modules/users/sma.nix @@ -103,9 +103,9 @@ "connections" = "ss -tuln"; # Git for infrastructure - "lab" = "cd /home/geir/Home-lab"; - "lab-status" = "cd /home/geir/Home-lab && git status"; - "lab-pull" = "cd /home/geir/Home-lab && git pull"; + "homelab" = "cd /home/geir/Home-lab"; + "homelab-status" = "cd /home/geir/Home-lab && git status"; + "homelab-pull" = "cd /home/geir/Home-lab && git pull"; # Security "audit-users" = "cat /etc/passwd | grep -E '/bin/(bash|zsh|fish)'";