From bd542366f5c878a636f3533c5d3cace1bc806905 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 5 Oct 2023 09:45:18 -0500
Subject: [PATCH] Colors

---
 home/default.nix                    |  29 +--
 home/fish/interactiveShellInit.fish |   4 +
 home/linux.nix                      | 353 ++++++++++++++--------------
 3 files changed, 183 insertions(+), 203 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index eb6a915..c3de5b7 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -26,28 +26,6 @@ in {
     # nix-colors.homeManagerModules.default
   ];
 
-  # copied here for easy lookups:
-  # https://github.com/tinted-theming/base16-schemes/blob/main/catppuccin-mocha.yaml
-
-  /*
-  base00: "1e1e2e" # base
-  base01: "181825" # mantle
-  base02: "313244" # surface0
-  base03: "45475a" # surface1
-  base04: "585b70" # surface2
-  base05: "cdd6f4" # text
-  base06: "f5e0dc" # rosewater
-  base07: "b4befe" # lavender
-  base08: "f38ba8" # red
-  base09: "fab387" # peach
-  base0A: "f9e2af" # yellow
-  base0B: "a6e3a1" # green
-  base0C: "94e2d5" # teal
-  base0D: "89b4fa" # blue
-  base0E: "cba6f7" # mauve
-  base0F: "f2cdcd" # flamingo
-  */
-
   home = {
     username = lib.mkDefault "daniel";
     homeDirectory = lib.mkDefault "/home/daniel/.home";
@@ -543,7 +521,7 @@ in {
         "ui.text.inactive" = {fg = fg2;};
 
         "ui.virtual" = fg2;
-        "ui.virtual.ruler" = {bg = bg2;};
+        "ui.virtual.ruler" = {bg = bg3;};
         "ui.virtual.indent-guide" = bg3;
         "ui.virtual.inlay-hint" = {
           fg = bg3;
@@ -641,9 +619,8 @@ in {
 
         # "ui.cursorline.primary" = { bg = "default" }
         # "ui.cursorline.secondary" = { bg = "default" }
-        # "ui.cursorcolumn.primary" = { bg = "default" }
-        # "ui.cursorcolumn.secondary" = { bg = "default" }
-        # "ui.virtual.ruler" = { bg = "default" }
+        "ui.cursorcolumn.primary" = {bg = bg3;};
+        "ui.cursorcolumn.secondary" = {bg = bg3;};
 
         "ui.bufferline.active" = {
           fg = primary;
diff --git a/home/fish/interactiveShellInit.fish b/home/fish/interactiveShellInit.fish
index 92cbdff..8e72c46 100644
--- a/home/fish/interactiveShellInit.fish
+++ b/home/fish/interactiveShellInit.fish
@@ -151,3 +151,7 @@ bind -M insert \ca beginning-of-line
 
 bind -M insert \cv edit_command_buffer
 bind -M default \cv edit_command_buffer
+
+test $PWD = $HOME && begin
+	cd $NICE_HOME || cd
+end
diff --git a/home/linux.nix b/home/linux.nix
index 1294495..4ffa3c3 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -742,16 +742,6 @@
         "sway/workspaces" = {
           "disable-scroll" = false;
           "persistent_workspaces" = {
-            "1" = [];
-            "2" = [];
-            "3" = [];
-            "4" = [];
-            "5" = [];
-            "6" = [];
-            "7" = [];
-            "8" = [];
-            "9" = [];
-            # "10" = [;
           };
           "all-outputs" = true;
           "format" = "{name}";
@@ -840,210 +830,219 @@
         };
       };
     };
-    style = with colors.withHashPrefix; ''
-      * {
-      	border-radius: 0;
-      	font-family: "${font.name}", "Symbols Nerd Font Mono", sans-serif;
-      	font-size: 16px;
-      }
+    style = let
+      border-width = "0px";
+    in
+      with colors.withHashPrefix; ''
+        * {
+        	border-radius: 0;
+        	font-family: "${font.name}", "Symbols Nerd Font Mono", sans-serif;
+        	font-size: 16px;
+        }
 
-      window#waybar {
-      	min-height: 32px;
-      	background-color: ${bg};
-      	color: ${text};
-      	border-top: solid ${blue} 1px;
-      	transition: none;
-      }
+        window#waybar {
+        	min-height: 32px;
+        	background-color: ${bg};
+        	color: ${text};
+        	border-top: solid ${blue} ${border-width};
+        	transition: none;
+        }
 
-      window#waybar.hidden {
-      	/* opacity: 0.2; */
-      }
+        window#waybar.hidden {
+        	/* opacity: 0.2; */
+        }
 
-      window#waybar.empty {
-      	/* opacity: 0.2; */
-      }
+        window#waybar.empty {
+        	/* opacity: 0.2; */
+        }
 
-      #workspaces button {
-      	padding: 0 0.75em;
-      	background-color: transparent;
-      	border-top: solid ${primary} 1px;
-        transition: none;
-      }
+        #workspaces button {
+        	padding: 0 0.75em;
+        	background-color: transparent;
+        	border-top: solid ${primary} ${border-width};
+          transition: none;
+          color: ${fgdim};
+        	background-color: ${bg};
+        }
 
-      #workspaces button:hover {
-      	/*
-      	 * background: rgba(0, 0, 0, 0.2);
-      	 * box-shadow: inherit;
-      	 */
-      }
+        #workspaces button:hover {
+          background: rgba(0, 0, 0, 0.2);
+        }
 
-      #workspaces button.visible {
-      	background-color: ${bg};
-      }
+        #workspaces button.active {
+          color: ${text};
+        	background-color: ${bg};
+        }
 
-      #workspaces button.focused {
-      	color: ${bg};
-      	background-color: ${blue};
-      }
+        #workspaces button.visible {
+          color: ${fgdim};
+        	background-color: ${bg};
+        }
 
-      #workspaces button.persistent {
-      	color: ${text};
-      }
+        /* A workspace that is persistent but has windows in it */
+        #workspaces button.persistent {
+        	color: ${fgdim};
+        }
 
-      #workspaces button.urgent {
-      	background-color: ${urgent};
-      	color: ${bg};
-      	border-top: solid ${urgent} 1px;
-      }
+        #workspaces button.focused {
+        	color: ${bg};
+        	background-color: ${primary};
+        }
 
-      #mode {
-      	background-color: transparent;
-      }
+        #workspaces button.urgent {
+        	background-color: ${urgent};
+        	color: ${bg};
+        	border-top: solid ${urgent} ${border-width};
+        }
 
-      #clock,
-      #battery,
-      #cpu,
-      #memory,
-      #temperature,
-      #backlight,
-      #network,
-      #pulseaudio,
-      #custom-media,
-      #tray,
-      #mode,
-      #idle_inhibitor,
-      #mpris,
-      #window,
-      #mpd {
-      	margin-top: 1px;
-      	padding: 0 0.75em;
-      	background-color: inherit;
-      	color: ${text};
-      }
+        #mode {
+        	background-color: transparent;
+        }
 
-      #clock {}
+        #clock,
+        #battery,
+        #cpu,
+        #memory,
+        #temperature,
+        #backlight,
+        #network,
+        #pulseaudio,
+        #custom-media,
+        #tray,
+        #mode,
+        #idle_inhibitor,
+        #mpris,
+        #window,
+        #mpd {
+        	margin-top: 1px;
+        	padding: 0 0.75em;
+        	background-color: inherit;
+        	color: ${text};
+        }
 
-      #battery {
-      	/* background-color: #ffffff; */
-      	/* color: #000000; */
-      }
+        #clock {}
 
-      #battery.charging {
-      	/* color: #ffffff; */
-      	/* background-color: #26A65B; */
-      }
+        #battery {
+        	/* background-color: #ffffff; */
+        	/* color: #000000; */
+        }
 
-      @keyframes blink {
-      	to {
-      		background-color: #ffffff;
-      		color: #000000;
-      	}
-      }
+        #battery.charging {
+        	/* color: #ffffff; */
+        	/* background-color: #26A65B; */
+        }
 
-      #battery.critical:not(.charging) {
-      	background-color: ${red};
-      	animation-name: blink;
-      	animation-duration: 0.5s;
-      	animation-timing-function: linear;
-      	animation-iteration-count: infinite;
-      	animation-direction: alternate;
-      }
+        @keyframes blink {
+        	to {
+        		background-color: #ffffff;
+        		color: #000000;
+        	}
+        }
 
-      #bluetooth,
-      #bluetooth.connected-battery,
-      #bluetooth.connected.battery,
-      #bluetooth.connected {
-      	color: ${text};
-      }
+        #battery.critical:not(.charging) {
+        	background-color: ${red};
+        	animation-name: blink;
+        	animation-duration: 0.5s;
+        	animation-timing-function: linear;
+        	animation-iteration-count: infinite;
+        	animation-direction: alternate;
+        }
 
-      label:focus {
-      	/* background-color: #000000; */
-      }
+        #bluetooth,
+        #bluetooth.connected-battery,
+        #bluetooth.connected.battery,
+        #bluetooth.connected {
+        	color: ${text};
+        }
 
-      #cpu {
-      	/* background-color: #2ecc71; */
-      	/* color: #000000; */
-      }
+        label:focus {
+        	/* background-color: #000000; */
+        }
 
-      #memory {
-      	/* background-color: #9b59b6; */
-      }
+        #cpu {
+        	/* background-color: #2ecc71; */
+        	/* color: #000000; */
+        }
 
-      #backlight {
-      	/* background-color: #90b1b1; */
-      }
+        #memory {
+        	/* background-color: #9b59b6; */
+        }
 
-      #network {
-      	/* background-color: #2980b9; */
-      }
+        #backlight {
+        	/* background-color: #90b1b1; */
+        }
 
-      #network.disconnected {
-      	/* background-color: #f53c3c; */
-      }
+        #network {
+        	/* background-color: #2980b9; */
+        }
 
-      #pulseaudio {
-      	color: ${red};
-      	/* background-color: #f1c40f; */
-      	/* color: #000000; */
-      }
+        #network.disconnected {
+        	/* background-color: #f53c3c; */
+        }
 
-      #pulseaudio.source-muted {
-      	/* background-color: #90b1b1; */
-      	color: ${text};
-      }
+        #pulseaudio {
+        	color: ${red};
+        	/* background-color: #f1c40f; */
+        	/* color: #000000; */
+        }
 
-      #custom-media {
-      	/* background-color: #66cc99; */
-      	/* color: #2a5c45; */
-      	/* min-width: 100px; */
-      }
+        #pulseaudio.source-muted {
+        	/* background-color: #90b1b1; */
+        	color: ${text};
+        }
 
-      #custom-media.custom-spotify {
-      	/* background-color: #66cc99; */
-      }
+        #custom-media {
+        	/* background-color: #66cc99; */
+        	/* color: #2a5c45; */
+        	/* min-width: 100px; */
+        }
 
-      #custom-media.custom-vlc {
-      	/* background-color: #ffa000; */
-      }
+        #custom-media.custom-spotify {
+        	/* background-color: #66cc99; */
+        }
 
-      #temperature {
-      	/* background-color: #f0932b; */
-      }
+        #custom-media.custom-vlc {
+        	/* background-color: #ffa000; */
+        }
 
-      #temperature.critical {
-      	/* background-color: #eb4d4b; */
-      }
+        #temperature {
+        	/* background-color: #f0932b; */
+        }
 
-      #tray {
-      	/* background-color: #2980b9; */
-      }
+        #temperature.critical {
+        	/* background-color: #eb4d4b; */
+        }
 
-      #idle_inhibitor {
-      	/* background-color: #2d3436; */
-      }
+        #tray {
+        	/* background-color: #2980b9; */
+        }
 
-      #idle_inhibitor.activated {
-      	/* background-color: #ecf0f1; */
-      	/* color: #2d3436; */
-      }
+        #idle_inhibitor {
+        	/* background-color: #2d3436; */
+        }
 
-      #mpd {
-      	/* background-color: #66cc99; */
-      	/* color: #2a5c45; */
-      }
+        #idle_inhibitor.activated {
+        	/* background-color: #ecf0f1; */
+        	/* color: #2d3436; */
+        }
 
-      #mpd.disconnected {
-      	/* background-color: #f53c3c; */
-      }
+        #mpd {
+        	/* background-color: #66cc99; */
+        	/* color: #2a5c45; */
+        }
 
-      #mpd.stopped {
-      	/* background-color: #90b1b1; */
-      }
+        #mpd.disconnected {
+        	/* background-color: #f53c3c; */
+        }
 
-      #mpd.paused {
-      	/* background-color: #51a37a; */
-      }
-    '';
+        #mpd.stopped {
+        	/* background-color: #90b1b1; */
+        }
+
+        #mpd.paused {
+        	/* background-color: #51a37a; */
+        }
+      '';
     systemd = {
       enable = true;
     };