From 0ac085e153c30b4adfdce546ba17d4ea9ef3f88d Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 13 Feb 2023 08:27:46 +0100
Subject: [PATCH] Cleanup and minor tweaks

---
 machines/eitri/configuration.nix |  2 +-
 machines/loki/configuration.nix  | 31 ++-----------------------------
 machines/mimir/configuration.nix | 11 +++++++++++
 users/erwin/home.nix             |  3 ++-
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/machines/eitri/configuration.nix b/machines/eitri/configuration.nix
index 2332f43..67e6fd0 100644
--- a/machines/eitri/configuration.nix
+++ b/machines/eitri/configuration.nix
@@ -58,5 +58,5 @@ in
     raspberrypi-eeprom
   ];
 
-  system.stateVersion = "22.11";
+  system.stateVersion = "23.05";
 }
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 5d8f384..c458812 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -133,33 +133,6 @@
         { from = 47998; to = 48000; }
       ];
     };
-
-    # wg-quick.interfaces = {
-    #   wghorus = {
-    #     address = [ "10.10.4.2/24" ];
-    #     autostart = false;
-    #     dns = [ "192.168.4.1" ];
-    #     listenPort = 51820;
-
-    #     privateKeyFile = config.sops.secrets.wireguard-horus-privkey.path;
-
-    #     postUp = ''
-    #       ${pkgs.systemd}/bin/resolvectl domain wghorus bedum.horus.nu internal.horus.nu
-    #     '';
-    #     postDown = ''
-    #       ${pkgs.systemd}/bin/resolvectl domain wghorus ""
-    #     '';
-
-    #     peers = [
-    #       {
-    #         publicKey = "6faxlUG8+F7uVrKk/OJqqy5k2+OzrhXc/cV6Zsfbl0c=";
-    #         allowedIPs = [ "192.168.4.0/23" "192.168.6.0/24" "192.168.7.0/24" "192.168.8.0/24" ];
-    #         endpoint = "212.45.34.195:51820";
-    #         persistentKeepalive = 25;
-    #       }
-    #     ];
-    #   };
-    # };
   };
 
   systemd.network = {
@@ -273,8 +246,8 @@
   powerManagement = {
     powerUpCommands = ''
       ${pkgs.powertop}/bin/powertop --auto-tune
-      ${pkgs.coreutils}/bin/echo 'on' > /sys/bus/usb/devices/5-4.2/power/control # Logitech G502 HERO SE
-      ${pkgs.coreutils}/bin/echo 'on' > /sys/bus/usb/devices/5-4.1/power/control # splitkb Kyria rev1
+      ${pkgs.coreutils}/bin/echo 'on' > /sys/bus/usb/devices/5-3.2/power/control # Logitech G502 HERO SE
+      ${pkgs.coreutils}/bin/echo 'on' > /sys/bus/usb/devices/5-3.1/power/control # splitkb Kyria rev1
     '';
     cpuFreqGovernor = "ondemand";
   };
diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index d1e4bed..9d62d91 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -117,6 +117,17 @@
 
     wait-online.extraArgs = [ "--interface=enp4s0" ];
 
+    links = {
+      "40-enp4s0" = {
+        matchConfig = {
+          Name = "enp4s0";
+        };
+        linkConfig = {
+          WakeOnLan = "magic";
+        };
+      };
+    };
+
     netdevs = {
       "10-microvm" = {
         netdevConfig = {
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 41e50de..7687a82 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -118,7 +118,7 @@ in
             bitwarden
             blink1-tool
             bottom
-            commitgpt
+            dbeaver
             fd
             ffmpeg_5-full
             git
@@ -140,6 +140,7 @@ in
             quintom-cursor-theme
             procs
             prusa-slicer
+            qgis
             ripgrep
             signal-desktop
             solo2-cli