geir/home-lab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: resolve configuration conflicts

Browse source 
- 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
This commit is contained in:
Geir Okkenhaug Jerstad 2025-06-05 16:33:29 +02:00
parent 6fe8cdb790
commit 2530b918ca
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/network/network-sleeper-service.nix
View file

@ -30,7 +30,10 @@
}; };
# Network gateway and DNS (based on nmap discovery) # 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 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 # Additional firewall ports for file server services

6
modules/users/sma.nix
View file

@ -103,9 +103,9 @@
"connections" = "ss -tuln"; "connections" = "ss -tuln";
# Git for infrastructure # Git for infrastructure
"lab" = "cd /home/geir/Home-lab"; "homelab" = "cd /home/geir/Home-lab";
"lab-status" = "cd /home/geir/Home-lab && git status"; "homelab-status" = "cd /home/geir/Home-lab && git status";
"lab-pull" = "cd /home/geir/Home-lab && git pull"; "homelab-pull" = "cd /home/geir/Home-lab && git pull";
# Security # Security
"audit-users" = "cat /etc/passwd | grep -E '/bin/(bash|zsh|fish)'"; "audit-users" = "cat /etc/passwd | grep -E '/bin/(bash|zsh|fish)'";