diff --git a/hosts/intuos/filesystems/default.nix b/hosts/intuos/filesystems/default.nix index 299da259..af061215 100644 --- a/hosts/intuos/filesystems/default.nix +++ b/hosts/intuos/filesystems/default.nix @@ -1,7 +1,7 @@ { config, ... }: { fileSystems."/home/${config.sysusers.main}/Midas" = { - device = "${config.ips.server}:/"; + device = "10.2.0.1:/"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/hosts/kitty/filesystems/default.nix b/hosts/kitty/filesystems/default.nix index 299da259..af061215 100644 --- a/hosts/kitty/filesystems/default.nix +++ b/hosts/kitty/filesystems/default.nix @@ -1,7 +1,7 @@ { config, ... }: { fileSystems."/home/${config.sysusers.main}/Midas" = { - device = "${config.ips.server}:/"; + device = "10.2.0.1:/"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/hosts/midas/firewall/default.nix b/hosts/midas/firewall/default.nix index 860c0ab9..a20a6761 100644 --- a/hosts/midas/firewall/default.nix +++ b/hosts/midas/firewall/default.nix @@ -5,15 +5,15 @@ content = '' chain PREROUTING { type nat hook prerouting priority dstnat; policy accept; - tcp dport 2211 dnat ip to ${config.ips.pc}:22 comment "SSH to PC" + tcp dport 2211 dnat ip to 10.2.0.100:22 comment "SSH to PC" - udp dport { 27005, 27015 } dnat ip to ${config.ips.pc} comment "PC Hosted Games" + udp dport { 27005, 27015 } dnat ip to 10.2.0.100 comment "PC Hosted Games" - tcp dport { 48010, 47989, 47984 } dnat ip to ${config.ips.pc} comment "PC Sunshine TCP" - udp dport { 47998, 47999, 48000 } dnat ip to ${config.ips.pc} comment "PC Sunshine UDP" + tcp dport { 48010, 47989, 47984 } dnat ip to 10.2.0.100 comment "PC Sunshine TCP" + udp dport { 47998, 47999, 48000 } dnat ip to 10.2.0.100 comment "PC Sunshine UDP" - tcp dport { 38010, 37989, 37984 } dnat ip to ${config.ips.vm} comment "VM Sunshine TCP" - udp dport { 37998, 37999, 38000 } dnat ip to ${config.ips.vm} comment "VM Sunshine UDP" + tcp dport { 38010, 37989, 37984 } dnat ip to 10.3.0.1 comment "VM Sunshine TCP" + udp dport { 37998, 37999, 38000 } dnat ip to 10.3.0.1 comment "VM Sunshine UDP" } chain POSTROUTING { diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix index f3814c97..74490d4f 100644 --- a/hosts/tower/filesystems/default.nix +++ b/hosts/tower/filesystems/default.nix @@ -40,7 +40,7 @@ # Network mounts "/home/${config.sysusers.main}/Midas" = { - device = "${config.ips.server}:/"; + device = "10.2.0.1:/"; fsType = "nfs4"; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; }; diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix index 6cd59939..5aafa718 100644 --- a/modules/system/devices/networking/default.nix +++ b/modules/system/devices/networking/default.nix @@ -1,9 +1,6 @@ { config, ... }: { - imports = [ - ./ips - ./wireless - ]; + imports = [ ./wireless ]; networking = { wireless.enable = false; diff --git a/modules/system/devices/networking/ips/default.nix b/modules/system/devices/networking/ips/default.nix deleted file mode 100644 index 410783d8..00000000 --- a/modules/system/devices/networking/ips/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, ... }: -{ - options.ips = lib.mkOption { - type = lib.types.attrs; - }; - - config.ips = rec { - server = "10.2.0.1"; - pc = "10.2.0.100"; - vm = "10.2.0.101"; - hx = "10.2.0.150"; - }; -}