From 058ead65c32bcdbc261b7926a54c94254a078db9 Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Mon, 5 Sep 2022 21:43:40 +1000
Subject: [PATCH 1/3] netmaker update

---
 system/configuration.nix | 2 +-
 system/wollomi.nix       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/configuration.nix b/system/configuration.nix
index 41fb4e3..f3e9f55 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -6,7 +6,7 @@
 
   imports = [
     # where are we ?
-    ./wollomi.nix
+    # ./wollomi.nix
     # ./adrift.nix
 
     # home manager should exist for users
diff --git a/system/wollomi.nix b/system/wollomi.nix
index ea012b5..dac597d 100644
--- a/system/wollomi.nix
+++ b/system/wollomi.nix
@@ -27,14 +27,14 @@
     enable = true;
     interfaces = {
       pond = {
-        ips = [ "10.4.20.2/32" ];
-        listenPort = 51820;
+        ips = [ "10.4.20.1/32" ];
+        listenPort = 51821;
         privateKeyFile = "/root/pond.priv";
         peers = [
           {
-            publicKey = "ll0/+7bbaAFgCuUOj0s0twHalXLxcXOtkxJbtw/egV4=";
+            publicKey = "GzLoJ99BrmF4X4DKHtBOskIB2SsApkZ2jzPigSYkaX8=";
             allowedIPs = [ "10.4.20.0/24" ];
-            endpoint = "141.164.52.106:51821";
+            endpoint = "45.76.121.195:51821";
             persistentKeepalive = 20;
           }
         ];

From 58907953dfd9a7878a450be4dbca0adbb01cdebe Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Wed, 14 Sep 2022 10:08:52 +1000
Subject: [PATCH 2/3] netmaker to tailscale

---
 system/configuration.nix |  8 +++++++-
 system/wollomi.nix       | 19 -------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/system/configuration.nix b/system/configuration.nix
index f3e9f55..2f8b3a9 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -85,6 +85,8 @@
 
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;
+  
+  services.tailscale.enable = true;
 
   # rust
   nixpkgs.overlays = [
@@ -99,6 +101,8 @@
       "rustfmt"
     ])
     
+    tailscale
+    
     cachix
 
     helix
@@ -116,8 +120,10 @@
   
   
   networking.firewall = {
-      allowedUDPPorts = [ 51820 ];
+      allowedUDPPorts = [ 41641 ];
+      checkReversePath = "loose";
   };
+  
 
   system.stateVersion = "22.05"; # Did you read the comment?
 
diff --git a/system/wollomi.nix b/system/wollomi.nix
index dac597d..c9f4520 100644
--- a/system/wollomi.nix
+++ b/system/wollomi.nix
@@ -23,25 +23,6 @@
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  networking.wireguard = {
-    enable = true;
-    interfaces = {
-      pond = {
-        ips = [ "10.4.20.1/32" ];
-        listenPort = 51821;
-        privateKeyFile = "/root/pond.priv";
-        peers = [
-          {
-            publicKey = "GzLoJ99BrmF4X4DKHtBOskIB2SsApkZ2jzPigSYkaX8=";
-            allowedIPs = [ "10.4.20.0/24" ];
-            endpoint = "45.76.121.195:51821";
-            persistentKeepalive = 20;
-          }
-        ];
-      };  
-    };
-  };
-
   # dlna
   services.minidlna = {
     enable = true;

From 6043e6ce73ed6f940f1086f32e2b47ff046ab46f Mon Sep 17 00:00:00 2001
From: atagen <atagen@boss.co>
Date: Sun, 25 Sep 2022 00:50:11 +1000
Subject: [PATCH 3/3] fix colours, mpv, office, n+

---
 home/fossil.nix |  1 +
 home/home.nix   | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/home/fossil.nix b/home/fossil.nix
index f488b15..c7b2d0a 100644
--- a/home/fossil.nix
+++ b/home/fossil.nix
@@ -10,6 +10,7 @@
     zellij    
     steam
     xonotic
+    nicotine-plus
   ];
 
 }
diff --git a/home/home.nix b/home/home.nix
index 5ede64c..9ac2297 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -33,19 +33,23 @@
 
     kdeconnect
     keepassxc
+    
+    mpv
 
     syncthing
 
     zoxide
     meslo-lgs-nf
 
+    libreoffice-qt
+
     libsForQt5.ark
     libsForQt5.qtstyleplugin-kvantum
 
     gtk-engine-murrine
 
     plasma-browser-integration
-
+    
     (callPackage ./homepkgs/git-credential-keepassxc.nix { })
     (callPackage ./homepkgs/culr.nix { })
     (libsForQt5.callPackage ./homepkgs/bismuth.nix { })
@@ -77,6 +81,8 @@
         sidebery
         plasma-integration
         keepassxc-browser
+        user-agent-string-switcher
+        # happy-bonobo-disable-webrtc
         # arc-dark-theme-we
       ];
       profiles.default = {
@@ -129,7 +135,7 @@
       color6 = "#3daee9";
       color14 = "#5294e2";
       color7 = "#a1a9b1";
-      color15 = "#a1a9b1";
+      color15 = "#656a73";
     };
   };
 
@@ -192,6 +198,7 @@ alias p=\"ps_culr\"
 alias mnt=\"mount | column -t | culr\"
 fresh
 ";
+
     plugins = [
       {
         name = "powerlevel10k";