Wed Jun 5 06:34:54 PM CEST 2024

This commit is contained in:
Thomas Avé 2024-06-05 18:34:54 +02:00
parent 162e9d0ce1
commit 7a629c251d
4 changed files with 15 additions and 26 deletions

View File

@ -53,7 +53,7 @@
output = "eDP-1"; output = "eDP-1";
height = 28; height = 28;
margin = "0 0 5 0"; 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; programs.alacritty.settings.font.size = 13;

View File

@ -31,7 +31,7 @@
}; };
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
output = "DP-2"; 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 = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [

View File

@ -19,7 +19,7 @@
"cpu#cpu2" "cpu#cpu2"
"cpu" "cpu"
"memory" "memory"
"temperature" "custom/temperature"
"clock" "clock"
"clock#clock2" "clock#clock2"
]; ];
@ -67,12 +67,9 @@
interval = 5; interval = 5;
format = "{used:0.2f}G"; format = "{used:0.2f}G";
}; };
temperature = { "custom/temperature" = {
# Override with client-specific value
# hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
interval = 5; interval = 5;
critical-threshold = 80; exec = pkgs.lib.mkDefault "echo TODO";
format = "{temperatureC}°C";
}; };
battery = { battery = {
states = { states = {
@ -141,7 +138,7 @@
#clock, #clock,
#memory, #memory,
#disk, #disk,
#temperature, #custom-temperature,
#backlight, #backlight,
#network, #network,
#pulseaudio, #pulseaudio,
@ -163,7 +160,7 @@
#tray, #tray,
#cpu, #cpu,
#battery, #battery,
#temperature { #custom-temperature {
background-color: #023269; background-color: #023269;
} }
@ -222,20 +219,6 @@
background-color: #000000; 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 { #tray > .passive {
-gtk-icon-effect: dim; -gtk-icon-effect: dim;
} }

View File

@ -108,10 +108,10 @@ in
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
wg0 = { wg0 = {
address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ]; 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"; privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
listenPort = 51820; 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 = [{ peers = [{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ]; allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ];
@ -128,7 +128,13 @@ in
]; ];
profiles = pkgs.lib.mapAttrs mkConnection connections; 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" = { fileSystems."/home/server" = {