waybar config, add calufrax (laptop), etc

home/default.nix

@@ -118,7 +118,17 @@
   wayland.windowManager.sway.package = pkgs.swayfx;
   wayland.windowManager.sway.config = null;
 
-  wayland.windowManager.sway.extraConfigEarly = (if osConfig.var.username == "alyx" then ''set $mod Mod1'' else ''set $mod Mod4'');
+  #wayland.windowManager.sway.extraConfigEarly = (if osConfig.var.username == "alyx" then ''set $mod Mod1'' else ''set $mod Mod4'');
+
+  wayland.windowManager.sway.extraConfigEarly = 
+    (if osConfig.var.username == "alyx" then ''set $mod Mod1
+    '' else ''set $mod Mod4
+    '') + (if osConfig.var.hostname == "calufrax" then ''
+    input 1:1:AT_Translated_Set_2_keyboard {
+      xkb_layout "gb"
+      xkb_variant "colemak"
+    }
+    '' else '''');
 
   wayland.windowManager.sway.extraConfig = ''
     include ~/.config/nixos/home/wms/sway

home/waybar/cyberhack

@@ -1,8 +1,8 @@
 [{
 "position": "top",
-"modules-left": ["group/traydrawer", "custom/weather"],
+"modules-left": ["group/traydrawer", "custom/weather", "battery", "power-profiles-daemon"],
 "modules-center": ["cpu", "group/mpdcontrols", "cpu#frequency"],
-"modules-right": ["clock", "wireplumber", "battery", "memory", "disk", "group/poweroptions"],
+"modules-right": ["clock", "wireplumber", "memory", "disk", "group/poweroptions"],
 "margin-top": 8,
 "margin-left": 8,
 "margin-right": 8,
@@ -26,6 +26,18 @@
    "tooltip-format": "BAT0, {power}W",
 },
 
+"power-profiles-daemon": {
+  "format": "{icon} {profile}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": " ",
+    "power-saver": " "
+  }
+},
+
 "group/mpdcontrols": {
    "orientation": "inherit",
    "drawer": {
@@ -68,6 +80,11 @@
    "format": " "
 },
 
+"tray": {
+   "icon-size": 15,
+   "spacing": 10,
+},
+
 "custom/systemadvisory": {
    "format": "󱖫 "
 },
@@ -91,7 +108,7 @@
 },
 
 "custom/weather": {
-    "format": "{}°",
+    "format": " {}° ",
     "tooltip": true,
     "interval": 3600,
     "exec": "wttrbar --nerd --location edinburgh",

home/waybar/cyberhack.css

@@ -10,6 +10,7 @@
 #cpu,
 #cpu-frequency,
 #battery,
+#power-profiles-daemon,
 #clock,
 #memory,
 #disk,

home/wms/sway

@@ -149,7 +149,7 @@ exec "/nix/store/pb9dhpk6qxjybb8p7prvs18ls2vxk51a-dbus-1.14.10/bin/dbus-update-a
 
 blur enable
 corner_radius 10
-shadows enable - not using this because of flicker
+shadows enable
 default_dim_inactive 0.3
 client.focused 000000 00ffff 000000 00ffff
 for_window [title="Picture-in-Picture"] dim_inactive 0.0