diff options
| author | sils <sils@sils.li> | 2023-11-17 22:26:38 +0100 |
|---|---|---|
| committer | sils <sils@sils.li> | 2023-11-17 22:26:38 +0100 |
| commit | a7acac59afe0c514df4201e9b0ddc2b76af16478 (patch) | |
| tree | 9284abc914703bf51d494cd36844da7b4001b90e | |
| parent | feat(treewide): add git-crypt (diff) | |
| download | nix-config-a7acac59afe0c514df4201e9b0ddc2b76af16478.tar.gz nix-config-a7acac59afe0c514df4201e9b0ddc2b76af16478.zip | |
feat(treewide): declare networks host-independent
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | hosts/thinklappi-bootstrap/default.nix | 9 | ||||
| -rw-r--r-- | hosts/thinklappi/default.nix | 10 | ||||
| -rw-r--r-- | sys/default.nix | 1 | ||||
| -rw-r--r-- | sys/networking/default.nix | 10 | ||||
| -rw-r--r-- | sys/networking/networks.nix | bin | 0 -> 103 bytes |
6 files changed, 15 insertions, 16 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..06ca72a --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +sys/networking/networks.nix filter=git-crypt diff=git-crypt diff --git a/hosts/thinklappi-bootstrap/default.nix b/hosts/thinklappi-bootstrap/default.nix index 4f12133..a72f3d0 100644 --- a/hosts/thinklappi-bootstrap/default.nix +++ b/hosts/thinklappi-bootstrap/default.nix @@ -29,14 +29,7 @@ i18n.defaultLocale = "en_US.UTF-8"; - networking = { - hostName = "thinklappi"; - #nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"]; - networkmanager = { - enable = true; - #dns = "none"; - }; - }; + networking.hostName = "thinklappi"; time.timeZone = "Europe/Berlin"; diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix index 2f53390..1679e0c 100644 --- a/hosts/thinklappi/default.nix +++ b/hosts/thinklappi/default.nix @@ -1,4 +1,5 @@ { + config, pkgs, ... @@ -25,14 +26,7 @@ i18n.defaultLocale = "en_US.UTF-8"; - networking = { - hostName = "thinklappi"; - #nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"]; - networkmanager = { - enable = true; - #dns = "none"; - }; - }; + networking.hostName = "thinklappi"; time.timeZone = "Europe/Berlin"; diff --git a/sys/default.nix b/sys/default.nix index 5bcab20..a60a9bb 100644 --- a/sys/default.nix +++ b/sys/default.nix @@ -6,6 +6,7 @@ ./font ./impermanence ./keyboard + ./networking ./nix ./packages ./services diff --git a/sys/networking/default.nix b/sys/networking/default.nix new file mode 100644 index 0000000..c630249 --- /dev/null +++ b/sys/networking/default.nix @@ -0,0 +1,10 @@ +{...}: { + networking = { + useDHCP = true; + #nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"]; + wireless = { + enable = true; + networks = import ./networks.nix; + }; + }; +} diff --git a/sys/networking/networks.nix b/sys/networking/networks.nix new file mode 100644 index 0000000..22fed37 --- /dev/null +++ b/sys/networking/networks.nix Binary files differ |