From 7a629c251d2951fb63917138875a1d4d828b0abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Wed, 5 Jun 2024 18:34:54 +0200
Subject: [PATCH] Wed Jun  5 06:34:54 PM CEST 2024

---
 home/Aloria.nix          |  2 +-
 home/Kell.nix            |  2 +-
 home/waybar/default.nix  | 27 +++++----------------------
 hosts/Aloria/default.nix | 10 ++++++++--
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/home/Aloria.nix b/home/Aloria.nix
index ffeb7fb..bec2283 100644
--- a/home/Aloria.nix
+++ b/home/Aloria.nix
@@ -53,7 +53,7 @@
       output = "eDP-1";
       height = 28;
       margin = "0 0 5 0";
-      temperature.hwmon-path = "/sys/class/hwmon/hwmon4/temp1_input";
+      "custom/temperature".exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gnugrep}/bin/grep Package | cut -c17-23";
   };
 
   programs.alacritty.settings.font.size = 13;
diff --git a/home/Kell.nix b/home/Kell.nix
index 9178a08..3ab52b4 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -31,7 +31,7 @@
   };
   programs.waybar.settings.mainBar = {
       output = "DP-2";
-      temperature.hwmon-path = "/sys/class/hwmon/hwmon3/temp2_input";
+      # temperature.hwmon-path = "/sys/class/hwmon/hwmon3/temp2_input";
   };
   wayland.windowManager.hyprland.settings = {
       monitor = [
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index d23ccf0..8316f02 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -19,7 +19,7 @@
           "cpu#cpu2"
           "cpu"
           "memory"
-          "temperature"
+          "custom/temperature"
           "clock"
           "clock#clock2"
         ];
@@ -67,12 +67,9 @@
           interval = 5;
           format = "{used:0.2f}G";
         };
-        temperature = {
-          # Override with client-specific value
-          # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
+        "custom/temperature" = {
           interval = 5;
-          critical-threshold = 80;
-          format = "{temperatureC}°C";
+          exec = pkgs.lib.mkDefault "echo TODO";
         };
         battery = {
           states = {
@@ -141,7 +138,7 @@
       #clock,
       #memory,
       #disk,
-      #temperature,
+      #custom-temperature,
       #backlight,
       #network,
       #pulseaudio,
@@ -163,7 +160,7 @@
       #tray,
       #cpu,
       #battery,
-      #temperature {
+      #custom-temperature {
           background-color: #023269;
       }
 
@@ -222,20 +219,6 @@
           background-color: #000000;
       }
 
-      #custom-media {
-          background-color: #66cc99;
-          color: #2a5c45;
-          min-width: 100px;
-      }
-
-      #custom-media.custom-spotify {
-          background-color: #66cc99;
-      }
-
-      #custom-media.custom-vlc {
-          background-color: #ffa000;
-      }
-
       #tray > .passive {
           -gtk-icon-effect: dim;
       }
diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index 02cf823..d95735c 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -108,10 +108,10 @@ in
   networking.wg-quick.interfaces = {
     wg0 = {
       address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
-      dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
+      # dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
       privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
       listenPort = 51820;
-      # postUp = "resolvectl dns wg0 10.0.0.1; resolvectl domain wg0 ~thomasave.be;";
+      postUp = "resolvectl dns wg0 10.0.0.1; resolvectl domain wg0 ~thomasave.be;";
       peers = [{
         publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
         allowedIPs = [ "10.0.0.1/8"  "192.168.1.2/32" ];
@@ -128,7 +128,13 @@ in
         ];
         profiles = pkgs.lib.mapAttrs mkConnection connections;
       };
+      dns = "systemd-resolved";
   };
+  services.resolved = {
+      enable = true;
+      fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
+  };
+
 
 
   fileSystems."/home/server" = {