diff options
| -rw-r--r-- | hosts/ganymede/config.nix | 8 | ||||
| -rw-r--r-- | modules/services/nixos/networking/default.nix | 1 | ||||
| -rw-r--r-- | modules/services/nixos/networking/static.nix | 40 | ||||
| -rw-r--r-- | modules/services/options.nix | 16 | ||||
| -rw-r--r-- | secrets/default.nix | 1 | ||||
| -rw-r--r-- | secrets/secrets.nix | 1 | ||||
| -rw-r--r-- | secrets/williams-psk.age | 5 |
7 files changed, 69 insertions, 3 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 2a0293c..8e751eb 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -17,7 +17,13 @@ services = { networking = { enable = true; - iwd.enable = true; + static = { + enable = true; + ssid = "williams"; + pskFile = "williams-psk"; + ip = "192.168.50.2"; + gateway = "192.168.50.1"; + }; tailscale.enable = true; sshd.enable = true; }; diff --git a/modules/services/nixos/networking/default.nix b/modules/services/nixos/networking/default.nix index 929578d..42cab1e 100644 --- a/modules/services/nixos/networking/default.nix +++ b/modules/services/nixos/networking/default.nix @@ -2,6 +2,7 @@ imports = [ ./iwd.nix ./networkmanager.nix + ./static.nix ]; config = { diff --git a/modules/services/nixos/networking/static.nix b/modules/services/nixos/networking/static.nix new file mode 100644 index 0000000..9338a6a --- /dev/null +++ b/modules/services/nixos/networking/static.nix @@ -0,0 +1,40 @@ +{ + lib, + config, + ... +}: let + cfg = config.collinux.services.networking.static; +in + lib.mkIf cfg.enable { + networking = { + wireless = { + enable = true; + networks.${cfg.ssid}.pskRaw = "ext:psk"; + secretsFile = config.age.secrets.${cfg.pskFile}.path; + }; + + # Disable default networking stuff + dhcpcd.enable = false; + useDHCP = false; + networkmanager.enable = false; + }; + + systemd.network = { + enable = true; + networks."10-static-lan" = { + name = "wl*"; + + networkConfig = { + Address = "${cfg.ip}/24"; + Gateway = cfg.gateway; + DNS = "1.1.1.1"; + DHCP = "no"; + + # diable ipv6 addresses + IPv6AcceptRA = "no"; + IPv6PrivacyExtensions = "no"; + LinkLocalAddressing = "no"; + }; + }; + }; + } diff --git a/modules/services/options.nix b/modules/services/options.nix index 681ed99..78a5a8f 100644 --- a/modules/services/options.nix +++ b/modules/services/options.nix @@ -11,6 +11,18 @@ in { enable = mkEnableOption "wifi"; iwd.enable = mkEnableOption "lightweight wifi daemon"; networkmanager.enable = mkEnableOption "heavier wifi daemon"; + + static = let + ip_addr = + lib.types.strMatching + "^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$"; + in { + enable = mkEnableOption "set static IP (systemd-networkd)"; + ssid = mkOption {type = lib.types.str;}; + ip = mkOption {type = ip_addr;}; + gateway = mkOption {type = ip_addr;}; + pskFile = mkOption {type = lib.types.str;}; + }; tailscale.enable = mkEnableOption "tailscale"; sshd.enable = mkEnableOption "OpenSSH server"; }; @@ -42,8 +54,8 @@ in { config = { assertions = [ { - assertion = with config.collinux.services.networking; !(iwd.enable && networkmanager.enable); - message = "can not use iwd and networkmanager at the same time"; + assertion = with config.collinux.services.networking; (iwd.enable && !networkmanager.enable && !static.enable) || (!iwd.enable && networkmanager.enable && !static.enable) || (!iwd.enable && !networkmanager.enable && static.enable); + message = "only one networking method (iwd, networkmanager, static) can be active"; } ]; }; diff --git a/secrets/default.nix b/secrets/default.nix index 2254909..b9e8c6f 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -3,6 +3,7 @@ identityPaths = ["/etc/ssh/ssh_host_ed25519_key"]; secrets = { "caddy-tailscale-authkey".file = ./caddy-tailscale-authkey.age; + "williams-psk".file = ./williams-psk.age; }; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b01b609..29b3d28 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,4 +5,5 @@ let ganymede = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlr+53UmlGVP1blkdNl6NFqn1w2umFJyjH1EVUPKIy9"; in { "caddy-tailscale-authkey.age".publicKeys = [ganymede]; + "williams-psk.age".publicKeys = [ganymede]; } diff --git a/secrets/williams-psk.age b/secrets/williams-psk.age new file mode 100644 index 0000000..1f26949 --- /dev/null +++ b/secrets/williams-psk.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 Jg4yWQ x4yUAZMn9eCey8YxPpdecYM/gjL81nLx8knzQcZDlV0 +5me7Z8K2hvNyTNY80GUM+rB9trko2x1MyUHRmCXl9vA +--- sQ2n7Rc6fd4QqfibSvSJGvTCKXygTeas4rVBlUXreVE +|wB AB:B-=VD}Epnq
\ No newline at end of file |