From e73dd814b8c53ce1fe13ca05186fbfad2ef40426 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 4 Feb 2018 09:46:11 -0500
Subject: vpn client

---
 config/vpn-client.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 config/vpn-client.nix

(limited to 'config')

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"];
+	  }
+	];
+      };
+    };
+  };
+}
+
-- 
cgit v1.2.3


From 317ff34db4fcef827eaaffa26a8752dd61a2478c Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 4 Feb 2018 09:46:24 -0500
Subject: console setup

---
 config/desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

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 ];
   };
 }
-- 
cgit v1.2.3


From cb758d6ac3428a13e236aa7b4f76904c30000df5 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Sun, 4 Feb 2018 15:17:33 -0500
Subject: =?UTF-8?q?shell:=20fish=E2=86=92zsh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/common.nix | 2 +-
 config/users.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

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/users.nix b/config/users.nix
index 8e2ac22..ae20194 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;
-- 
cgit v1.2.3