ui changes, keypair rename

home/modules/git.nix

@@ -113,18 +113,12 @@
       "github.com" = {
         identityFile = "~/.ssh/id_ed25519";
       };
-      "git-server" = {
-        hostname = "git.barrettruth.com";
-        user = "ec2-user";
-        identityFile = "~/.ssh/git-keypair-old.pem";
-      };
       "lightsail" = {
         hostname = "52.87.124.139";
         user = "ec2-user";
-        identityFile = "~/.ssh/git-keypair.pem";
+        identityFile = "~/.ssh/lightsail-keypair.pem";
         extraOptions = {
           SetEnv = "TERM=xterm-256color";
-          KexAlgorithms = "+curve25519-sha256";
         };
       };
       "uva-portal" = {

home/modules/theme.nix

@@ -50,12 +50,18 @@ in
     default = "midnight";
   };
 
+  options.palettes = lib.mkOption {
+    type = lib.types.attrsOf (lib.types.attrsOf lib.types.str);
+    readOnly = true;
+  };
+
   options.colors = lib.mkOption {
     type = lib.types.attrsOf lib.types.str;
     readOnly = true;
   };
 
   config = {
+    palettes = palettes;
     colors = palettes.${config.theme};
 
     home.pointerCursor = {

home/modules/ui.nix

@@ -11,6 +11,16 @@ let
 
   nvidia = true;
   backlightDevice = "intel_backlight";
+
+  mkWaybarTheme = palette: ''
+    * { color: ${palette.fg}; }
+    #waybar { background: ${palette.bg}; }
+    #workspaces button { color: ${palette.fg}; }
+    #workspaces button.focused,
+    #workspaces button.active { background: ${palette.bgAlt}; color: ${palette.fg}; }
+    tooltip { color: ${palette.fg}; background-color: ${palette.bgAlt}; }
+    tooltip * { color: ${palette.fg}; }
+  '';
 in
 {
   home.sessionVariables = {
@@ -385,10 +395,11 @@ in
     };
 
     style = ''
+      @import url("${config.xdg.configHome}/waybar/themes/theme.css");
+
       * {
         font-family: "Berkeley Mono", monospace;
         font-size: 15px;
-        color: ${c.fg};
       }
 
       button {
@@ -396,29 +407,15 @@ in
         border-radius: 0;
       }
 
-      #waybar {
-        background: ${c.bg};
-      }
-
       #workspaces button {
         padding: 0 10px;
-        color: ${c.fg};
-      }
-
-      #workspaces button.focused,
-      #workspaces button.active {
-        background: ${c.bgAlt};
-        color: ${c.fg};
       }
 
       tooltip {
-        color: ${c.fg};
-        background-color: ${c.bgAlt};
         text-shadow: none;
       }
 
       tooltip * {
-        color: ${c.fg};
         text-shadow: none;
       }
     '';
@@ -535,6 +532,14 @@ in
       };
     };
   };
+  xdg.configFile."waybar/themes/midnight.css".text = mkWaybarTheme config.palettes.midnight;
+  xdg.configFile."waybar/themes/daylight.css".text = mkWaybarTheme config.palettes.daylight;
+
+  home.activation.linkWaybarTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    target="${config.xdg.configHome}/waybar/themes/theme.css"
+    [ -L "$target" ] || $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/waybar/themes/${config.theme}.css" "$target"
+  '';
+
   xdg.configFile."X11".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/config/X11";
 }