hosts/koishi: v330-14arr -> x270

config/users/kat/dev/emacs.nix

@@ -15,7 +15,7 @@ let
     };
   };
 in
-optionalAttrs (builtins.getEnv "CI_PLATFORM" == "") {
+optionalAttrs (builtins.getEnv "CI_PLATFORM" == "impure") {
     home.packages = [ doom-emacs pkgs.sqlite ];
 
     home.file.".emacs.d/init.el".text = ''

config/users/kat/gui/gtk.nix

@@ -4,8 +4,8 @@
   gtk = {
     enable = true;
     iconTheme = {
-      name = "Numix-Square";
-      package = pkgs.numix-icon-theme-square;
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
     };
     theme = {
       name = "Adementary-dark";

config/users/kat/sway/gammastep.nix

@@ -3,6 +3,7 @@
 {
   services.gammastep = {
     enable = true;
+    tray = true;
     latitude = "51.5074";
     longitude = "0.1278";
   };

config/users/kat/sway/sway.nix

@@ -90,7 +90,8 @@ let lockCommand = config.programs.swaylock.script; in
                 "Escape" = "mode default";
               };
           };
-          bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
+          # bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
+          bars = [];
 
           input = {
             "*" = {

config/users/kat/sway/waybar/default.nix

@@ -1,19 +1,24 @@
-{ config, lib, pkgs, kw, ... }:
+{ config, lib, pkgs, kw, ... }: with lib;
 
 {
   xdg.configFile."waybar/style.css" = { inherit (kw.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; };
 
+  systemd.user.services.waybar.Service.Environment = singleton "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}";
+
   programs.waybar = {
     enable = true;
+    systemd.enable = true;
     settings = [{
       modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
       modules-center = [ "clock" "clock#s" "clock#arc" "clock#miku" "clock#hex" ];
       modules-right = [
         "pulseaudio"
+        "custom/mail"
         "cpu"
         "memory"
         "temperature"
         "battery"
+        "backlight"
         "network"
         "idle_inhibitor"
         "custom/konawall"
@@ -30,6 +35,10 @@
           icon-size = 12;
           spacing = 2;
         };
+        backlight = {
+          format = "{icon} {percent}%";
+          format-icons = ["" ""];
+        };
         "custom/gpg-status" = {
           format = "{}";
           interval = 300;
@@ -41,20 +50,26 @@
           interval = "once";
           return-type = "json";
           exec = "${pkgs.waybar-konawall}/bin/konawall-status";
-          exec-on-event = true;
           on-click = "${pkgs.waybar-konawall}/bin/konawall-toggle";
           on-click-right = "systemctl --user restart konawall";
+          signal = 8;
+        };
+        "custom/mail" = {
+          format = " {}";
+          interval = 30;
+          exec = "${pkgs.notmuch-arc}/bin/notmuch count tag:flagged OR tag:inbox AND NOT tag:killed";
         };
         cpu = { format = " {usage}%"; };
         memory = { format = " {percentage}%"; };
         temperature = {
-          format = " {temperatureC}°C";
-          hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
+          format = "{icon} {temperatureC}°C";
+          format-icons = ["" "" ""];
+          critical-threshold = 80;
         };
         idle_inhibitor = {
           format = "{icon}";
           format-icons = {
-            activated = "";
+            activated = "";
             deactivated = "";
           };
         };
@@ -65,8 +80,8 @@
             critical = 15;
           };
           format = "{icon} {capacity}%";
-          format-charging = " {capacity}%";
-          format-plugged = " {capacity}%";
+          format-charging = " {capacity}%";
+          format-plugged = " {capacity}%";
           format-alt = "{icon} {time}";
           format-icons = [ "" "" "" "" "" ];
         };
@@ -96,9 +111,6 @@
           tooltip-format = "{:%A, %F %T %z (%Z)}";
           timezones = [
             "Europe/London"
-            "America/Vancouver"
-            "Europe/Berlin"
-            "Pacific/Auckland"
           ];
           interval = 1;
         };

config/users/kat/sway/waybar/waybar.sass

@@ -13,6 +13,12 @@
   text-shadow: none
   box-shadow: none
 
+tooltip
+  background: $base00t
+  border-radius: 1em
+  label
+    color: $base07
+
 #mode
   color: $base06
   padding: 0 4px
@@ -66,9 +72,9 @@
   @extend %extend_1
   background: $base0Ct
 
-#custom-weather
+#custom-mail
   @extend %extend_1
-  background: $base00t
+  background: $base0Ft
 
 #custom-konawall
   @extend %extend_1
@@ -103,6 +109,8 @@
   menu
     background: $base00t
     border-radius: 1em
+    color: $base07
+
 
 .modules-left
   margin: 2px 4px
@@ -173,11 +181,5 @@
   color: $base06
   border-bottom: 2px solid transparent
 
-tooltip
-  background: $base00t
-  border-radius: 1em
-  label
-    color: $base07
-
 window#waybar.empty #window
   opacity: 0