diff options
| -rw-r--r-- | config/common.nix | 2 | ||||
| -rw-r--r-- | config/desktop.nix | 4 | ||||
| -rw-r--r-- | config/users.nix | 2 | ||||
| -rw-r--r-- | config/vpn-client.nix | 24 |
4 files changed, 28 insertions, 4 deletions
diff --git a/config/common.nix b/config/common.nix index 758664f..2da919d 100644 --- a/config/common.nix +++ b/config/common.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { imports = [ ./auto-upgrade.nix ]; - programs.fish.enable = true; + programs.zsh.enable = true; programs.tmux.enable = true; environment.shellAliases = { diff --git a/config/desktop.nix b/config/desktop.nix index 8aa04a4..e0571da 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -86,8 +86,8 @@ }; i18n = { - consoleFont = "ter-132n"; + # consoleFont = "ter-132n"; consoleKeyMap = "dvorak"; - consolePackages = [ pkgs.terminus_font ]; + # consolePackages = [ pkgs.terminus_font ]; }; } diff --git a/config/users.nix b/config/users.nix index 8c110e0..0eb7dcb 100644 --- a/config/users.nix +++ b/config/users.nix @@ -2,7 +2,7 @@ let aliases = import ../data/aliases.nix; in { users = { - defaultUserShell = pkgs.fish; + defaultUserShell = pkgs.zsh; extraUsers = { orbekk = { isNormalUser = true; diff --git a/config/vpn-client.nix b/config/vpn-client.nix new file mode 100644 index 0000000..5c10239 --- /dev/null +++ b/config/vpn-client.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: +let + port = (import ../data/aliases.nix).services.wireguard.port; +in +{ + networking.wireguard = { + interfaces = { + wg0 = { + ips = [ "10.35.190.2/23" ]; + privateKeyFile = "/opt/secret/wireguard/wg0.key"; + listenPort = port; + allowedIPsAsRoutes = false; + peers = [ + { + publicKey = "KT4sWKnlvPebJh0pYhGpiZksn4cCwKreB6fQCJV49F8="; + endpoint = "dragon.orbekk.com:${toString port}"; + allowedIPs = ["0.0.0.0/0" "::/0"]; + } + ]; + }; + }; + }; +} + |