System update

5 files changed, 16 insertions, 11 deletions

diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 7b21c7d..4a8c7dd 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -70,7 +70,7 @@ in {
             msmtp
             notmuch
             astroid
-            taskwarrior
+            taskwarrior3
             vdirsyncer
             khal
             khard
@@ -79,7 +79,7 @@ in {
             pinentry-curses
             (pass.withExtensions (exts: [
               exts.pass-otp
-              #exts.pass-audit
+              exts.pass-audit
             ]))
 
             chromium
@@ -113,7 +113,7 @@ in {
             adwaita-icon-theme
             vanilla-dmz
             sound-theme-freedesktop
-            gnome.gnome-characters
+            gnome-characters
             gucharmap
 
             (sdcv.withDictionaries [stardict-en-cz stardict-de-cz stardict-cz])
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 971d219..446d205 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -21,6 +21,7 @@ in {
       # Tools
       gitlint
       tig
+      gitg
       gource
       glab
       github-cli
diff --git a/nixos/modules/router.nix b/nixos/modules/router.nix
index cd37d8b..224037b 100644
--- a/nixos/modules/router.nix
+++ b/nixos/modules/router.nix
@@ -56,6 +56,8 @@ in {
   };
 
   config = mkIf cnf.enable {
+    boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+
     networking = {
       useNetworkd = true;
       firewall = {
@@ -114,9 +116,10 @@ in {
           matchConfig.Name = "home";
           networkConfig = {
             Address = "${cnf.lanIP}/${toString cnf.lanPrefix}";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
             DHCPServer = "yes";
             DHCPPrefixDelegation = "yes";
+            IPv6Forwarding = "yes";
             IPv6SendRA = "yes";
             IPv6AcceptRA = "no";
           };
@@ -143,9 +146,10 @@ in {
           matchConfig.Name = "guest";
           networkConfig = {
             Address = "192.168.1.1/24";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
             DHCPServer = "yes";
             DHCPPrefixDelegation = "yes";
+            IPv6Forwarding = "yes";
             IPv6SendRA = "yes";
             IPv6AcceptRA = "no";
           };
diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix
index d098ec7..1c143bb 100644
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -64,10 +64,13 @@ in {
       syntaxHighlighting.enable = isNative;
     };
     shellrc = true;
-    vim.defaultEditor = isArm;
+    vim = {
+      enable = isArm;
+      defaultEditor = isArm;
+    };
     neovim = {
       enable = !isArm;
-      defaultEditor = true;
+      defaultEditor = !isArm;
       withNodeJs = true;
     };
 
diff --git a/nixos/modules/wireguad.nix b/nixos/modules/wireguad.nix
index 69e1ccd..1b1db90 100644
--- a/nixos/modules/wireguad.nix
+++ b/nixos/modules/wireguad.nix
@@ -66,10 +66,7 @@ in {
         matchConfig.Name = "wg";
         networkConfig = {
           Address = "${config.cynerd.hosts.wg."${hostName}"}/24";
-          IPForward = is_endpoint;
-          #DNS = mkIf (hostName != "dean") ["10.0.20.30" "10.0.20.31"];
-          #DNSSEC = false;
-          #Domains = mkIf (hostName != "dean") "~elektroline.cz";
+          IPv4Forwarding = "yes";
         };
         routes =
           (optional (hostName != "lipwig") {