diff options
| -rw-r--r-- | hosts/meowbook/default.nix | 38 | ||||
| -rw-r--r-- | hosts/the-meowchine/default.nix | 2 | ||||
| -rw-r--r-- | modules/user/default.nix | 1 | ||||
| -rw-r--r-- | modules/user/syncthing.nix | 18 |
4 files changed, 35 insertions, 24 deletions
diff --git a/hosts/meowbook/default.nix b/hosts/meowbook/default.nix index bff8e4f..7c93476 100644 --- a/hosts/meowbook/default.nix +++ b/hosts/meowbook/default.nix @@ -24,9 +24,13 @@ programs.vesktop.enable = true; }; - networking.networkmanager = { - enable = true; - wifi.macAddress = "random"; + networking = { + networkmanager = { + enable = true; + wifi.macAddress = "random"; + }; + + useNetworkd = true; }; programs.sway.enable = true; @@ -37,5 +41,33 @@ stateVersion = "26.05"; }; + systemd.network = { + netdevs."90-evilvpn" = { + netdevConfig = { + Kind = "wireguard"; + Name = "wg0"; + }; + + wireguardConfig = { + PrivateKeyFile = "/etc/wireguard/meowbook.key"; + RouteTable = "main"; + }; + + wireguardPeers = [ + { + AllowedIPs = [ "10.6.6.0/24" ]; + Endpoint = "51.79.54.109:51820"; + PersistentKeepalive = 25; + PublicKey = "ChnzJG0HJcgk3OhgTzoPZ9EOyhuCH1EAknaQ9VF7N0I="; + } + ]; + }; + + networks."90-evilvpn" = { + address = [ "10.6.6.4/24" ]; + matchConfig.Name = "wg0"; + }; + }; + users.users.rosa.enable = true; } diff --git a/hosts/the-meowchine/default.nix b/hosts/the-meowchine/default.nix index 0ca41fa..cef28f1 100644 --- a/hosts/the-meowchine/default.nix +++ b/hosts/the-meowchine/default.nix @@ -33,8 +33,6 @@ prismlauncher.enable = true; vesktop.enable = true; }; - - services.syncthing.enable = true; }; networking = { diff --git a/modules/user/default.nix b/modules/user/default.nix index cb685ee..4b9c6f7 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -4,7 +4,6 @@ ./desktop ./editors ./git.nix - ./syncthing.nix ./zsh ]; diff --git a/modules/user/syncthing.nix b/modules/user/syncthing.nix deleted file mode 100644 index e719672..0000000 --- a/modules/user/syncthing.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, ... }: -{ - services.syncthing.settings = { - devices = { - angel = { - addresses = [ "tcp://10.6.6.2:22000" ]; - id = "DN6TIYA-X4BUO4M-4VQKZFO-NP2QYNY-NRNXE4S-QT6WTNK-FW4ZASY-2GJ3QAZ"; - }; - }; - - folders = { - "/home/rosa/Documents/Security" = { - devices = [ "angel" ]; - id = "passwords_and_such"; - }; - }; - }; -} |