Wed Jun 5 02:31:58 PM CEST 2024

home/Aloria.nix

@@ -50,15 +50,8 @@
       output = "eDP-1";
       height = 28;
       margin = "0 0 5 0";
+      temperature.hwmon-path = "/sys/class/hwmon/hwmon4/temp1_input";
   };
 
   programs.alacritty.settings.font.size = 13;
-  programs.waybar.style = ''
-      #wireplumber {
-          background-color: #023269;
-      }
-      #tray {
-          background-color: #1f2430;
-      }
-  '';
 }

home/Kell.nix

@@ -29,7 +29,10 @@
     name = "Papirus";
     gtk.iconTheme.package = pkgs.papirus-icon-theme;
   };
-  programs.waybar.settings.mainBar = { output = "DP-2"; };
+  programs.waybar.settings.mainBar = {
+      output = "DP-2";
+      temperature.hwmon-path = "/sys/class/hwmon/hwmon3/temp2_input";
+  };
   wayland.windowManager.hyprland.settings = {
       monitor = [
         "DP-3,preferred,0x550,1"
@@ -53,5 +56,11 @@
       #workspaces {
           margin: 4px 9px;
       }
+      #wireplumber {
+          background-color: #1f2430;
+      }
+      #tray {
+          background-color: #023269;
+      }
   '';
 }

home/waybar/default.nix

@@ -68,8 +68,8 @@
           format = "{used:0.2f}G";
         };
         temperature = {
-          hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
-          thermal-zone = 6;
+          # Override with client-specific value
+          # hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
           interval = 5;
           critical-threshold = 80;
           format = "{temperatureC}°C";
@@ -138,8 +138,6 @@
 
       #window,
       #clock,
-      #battery,
-      #cpu,
       #memory,
       #disk,
       #temperature,
@@ -147,6 +145,8 @@
       #network,
       #pulseaudio,
       #wireplumber,
+      #cpu.cpu2,
+      #memory,
       #tray {
           padding: 0 12px;
           border-radius: 7px;
@@ -157,9 +157,9 @@
       }
 
       #clock.clock2,
-      #cpu.cpu2,
-      #memory,
       #tray,
+      #cpu,
+      #battery,
       #temperature {
           background-color: #023269;
       }

hosts/Aloria/default.nix

@@ -73,7 +73,7 @@ in
       serviceConfig.ExecStart = "${pkgs.linuxPackages.nvidia_x11.bin}/bin/nvidia-smi";
   };
   specialisation = {
-      on-the-go.configuration = {
+      docked.configuration = {
           system.nixos.tags = [ "docked" ];
           hardware.nvidia = {
               powerManagement.finegrained = pkgs.lib.mkForce false;
@@ -84,6 +84,7 @@ in
       };
   };
   services.udev.packages = [ pkgs.yubikey-personalization ];
+  services.logind.extraConfig = ''HandlePowerKey=ignore'';
 
   # Calendar
   programs.dconf.enable = true;

hosts/Kell/default.nix

@@ -10,10 +10,7 @@
   boot.initrd.kernelModules = [ "amdgpu" ];
   services.pcscd.enable = true;
   services.udev.packages = [ pkgs.yubikey-personalization ];
-  services.logind.extraConfig = ''
-    # don’t shutdown when power button is short-pressed
-    HandlePowerKey=suspend
-  '';
+  services.logind.extraConfig = ''HandlePowerKey=suspend'';
 
   # Calendar
   programs.dconf.enable = true;