Theme stuff

6 files changed, 215 insertions, 133 deletions

diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix
index 28f4745..1329922 100644
--- a/nix/programs/bash.nix
+++ b/nix/programs/bash.nix
@@ -37,6 +37,12 @@
       historyFile = "${homeDir}/.bash_history";
       historyFileSize = 100000;
       initExtra = ''
+        bind 'set completion-query-items 0'
+        bind 'set show-all-if-ambiguous on'
+        bind 'set show-all-if-unmodified on'
+        bind 'set menu-complete-display-prefix on'
+        bind '"\t": menu-complete'
+        bind '"\e[Z": menu-complete-backward'
         RESET="\001\017\002"
         NORMAL="\001\033[0m\002"
         RED="\001\033[0;31m\002"
@@ -50,7 +56,7 @@
             printf "(″ロ゛) > $RED$?"
           fi
         }
-        export PS1="$RESET$YELLOW\u$RED@\H$CYAN:\w\$(exit_code_guy)$NORMAL "
+        export PS1="$RESET$CYAN\u@$YELLOW\H$CYAN:\w\$(exit_code_guy)$NORMAL "
       '';
     };
   };
diff --git a/nix/programs/docker.nix b/nix/programs/docker.nix
new file mode 100644
index 0000000..3491a80
--- /dev/null
+++ b/nix/programs/docker.nix
@@ -0,0 +1,4 @@
+{ ... }: {
+  virtualisation.docker.enable = true;
+  users.users.andrew.extraGroups = [ "docker" ];
+}
diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix
index 9aa94f5..f0f6e22 100644
--- a/nix/programs/firefox.nix
+++ b/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "1ddcd160fd349130aa71473adc217de304d673ee";
-        hash = "sha256-2TzbuzEZ+pSBKZgtTcIDVnB1FXVKHX3bgOolgWsqerM=";
+        rev = "6cbc3b6eceb4195edab67daecc8daa7347c84c27";
+        hash = "sha256-8yoUFYBtD86J2ddq1yMU0oCILp9u35/dmYi9iwiysi8=";
       });
     };
     home.file."customChrome.css" = {
@@ -28,24 +28,24 @@ in {
       source = pkgs.writeText "customChrome.css" ''
         @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-        @media (prefers-color-scheme: dark) {
+        @media (prefers-color-scheme: ${s.scheme.lightness}) {
           :root {
             /* Accent */
-            --gnome-accent-bg: var(--gnome-palette-blue-3);
-            --gnome-accent: #${s.scheme.color1};
+            --gnome-accent-bg: #${s.scheme.color3};
+            --gnome-accent: #${s.scheme.color2};
 
-            --gnome-toolbar-star-button: var(--gnome-palette-yellow-1);
+            --gnome-toolbar-star-button: #${s.scheme.color2};
 
             /* Window */
             --gnome-window-background: #${s.scheme.background};
             --gnome-window-color: #${s.scheme.foreground};
             --gnome-view-background: #${s.scheme.background};
             --gnome-sidebar-background: #${s.scheme.color1};
-            --gnome-secondary-sidebar-background: #${s.scheme.color3};
+            --gnome-secondary-sidebar-background: #${s.scheme.color2};
 
             /* Card */
             --gnome-card-background: #${s.scheme.background};
-            --gnome-card-shade-color: #${s.scheme.color5};
+            --gnome-card-shade-color: #${s.scheme.color2};
 
             /* Menu */
             --gnome-menu-background: #${s.scheme.background};
@@ -58,10 +58,10 @@ in {
             --gnome-toolbar-icon-fill: #${s.scheme.foreground};
 
             /* Tabs */
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color3};
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color6};
             --gnome-tabbar-tab-active-background: #${s.scheme.color2};
-            --gnome-tabbar-tab-active-background-contrast: #${s.scheme.background};
-            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color3};
+            --gnome-tabbar-tab-active-background-contrast: #${s.scheme.color2};
+            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color1};
 
             --gnome-tabbar-identity-color-green: var(--gnome-palette-green-1);
             --gnome-tabbar-identity-color-yellow: var(--gnome-palette-yellow-2);
@@ -85,21 +85,21 @@ in {
 
           /* Private colors */
           :root[privatebrowsingmode="temporary"] {
-            --gnome-accent-fg: #${s.scheme.color3};
+            --gnome-accent-fg: #${s.scheme.color2};
             /* Headerbar */
-            --gnome-headerbar-background: #${s.scheme.color4} !important;
+            --gnome-headerbar-background: #${s.scheme.color1} !important;
             /* Tabs */
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color4};
-            --gnome-tabbar-tab-active-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-active-background: #${s.scheme.background};
             --gnome-tabbar-tab-active-background-contrast: #${s.scheme.background};
-            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color1};
           }
 
           /* Private and backdrop colors */
           :root[privatebrowsingmode="temporary"]:-moz-window-inactive {
-            --gnome-headerbar-background: #${s.scheme.color4} !important;
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color4};
-            --gnome-tabbar-tab-active-background: #${s.scheme.color4};
+            --gnome-headerbar-background: #${s.scheme.color1} !important;
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color1};
+            --gnome-tabbar-tab-active-background: #${s.scheme.color1};
           }
         }
       '';
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 5868b7d..149d751 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -34,7 +34,9 @@ in {
         cursor_shape block
         cursor_blink_interval -1 linear ease-out
         cursor_stop_blinking_after 20.0
-        cursor_trail 16
+        cursor_trail 25
+        cursor_trail_decay 0.1 0.5
+        cursor_trail_start_threshold 2
         foreground #${s.scheme.foreground}
         background #${s.scheme.background}
         color0 #${s.scheme.color0}
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index cdc30d9..78b1b6b 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -1,92 +1,159 @@
 { config, pkgs, ... }:
 let
   s = config.local;
+  colo = s.scheme;
   local = pkgs.vimUtils.buildVimPlugin {
     pname = "local";
     version = "0.2";
     src = ../../files/nvim/local;
   };
-  # https://github.com/neovim/neovim/blob/879d17ea8d62c199ea0c91c5f37a4f25495be7ce/src/nvim/highlight_group.c#L414
   wal = pkgs.vimUtils.buildVimPlugin {
+    # https://github.com/neovim/neovim/blob/909b18d05a8d472b12c156e1663282bf6f5ce307/src/nvim/highlight_group.c#L425
+    # s/NvimLightGrey2/#${colo.foreground}/g
+    # s/NvimDarkGrey2/#${colo.background}/g
+    # s/NvimLightGreen/#${colo.color4}/g
+    # s/NvimLightCyan/#${colo.color2}/g
+    # s/NvimDarkGrey4/#${colo.color6}/g
+    # s/NvimDarkGrey1/#${colo.color0}/g
+    # s/NvimLightYellow/#${colo.color4}/g
+    # s/NvimDarkGrey3/#${colo.color6}/g
+    # s/NvimLightGrey1/#${colo.color4}/g
+    # s/NvimDarkGreen/#${colo.background}/g
+    # s/NvimLightRed/#${colo.color3}/g
+    # s/NvimDarkCyan/#${colo.background}/g
+    # s/NvimDarkYellow/#${colo.color2}/g
+    # s/NvimDarkRed/#${colo.color3}/g
+    # s/NvimLightGrey3/#${colo.background}/g
+    # s/NvimLightBlue/#${colo.foreground}/g
+    # s/NvimLightGrey4/#${colo.color5}/g
+    # Then edited as needed.
     pname = "wal";
-    version = "3.1";
+    version = "3.2";
     src = pkgs.writeTextDir "colors/wal-gui.vim" ''
       let g:colors_name = "wal-gui"
-      hi Normal guifg=#${s.scheme.foreground} guibg=#${s.scheme.background}
-      hi Added guifg=#${s.scheme.color4}
-      hi Changed guifg=#${s.scheme.color2}
-      hi ColorColumn guibg=#${s.scheme.color6}
-      hi Conceal guifg=#${s.scheme.color6}
-      hi CurSearch guifg=#${s.scheme.color0} guibg=#${s.scheme.color4}
-      hi CursorColumn guibg=#${s.scheme.color6}
-      hi CursorLine guibg=#${s.scheme.color2}
-      hi DiffAdd guifg=#${s.scheme.color4} guibg=#${s.scheme.background}
-      hi DiffChange guifg=#${s.scheme.color4} guibg=#${s.scheme.background}
-      hi DiffDelete guifg=#${s.scheme.color3} guibg=#${s.scheme.background} gui=bold
-      hi DiffText guifg=#${s.scheme.color6} guibg=#${s.scheme.background}
-      hi Directory guifg=#${s.scheme.color2}
-      hi ErrorMsg guifg=#${s.scheme.color4}
-      hi FloatShadow guibg=#${s.scheme.color6} blend=80
-      hi FloatShadowThrough guibg=#${s.scheme.color6} blend=100
-      hi Folded guifg=#${s.scheme.color5} guibg=#${s.scheme.color6}
-      hi LineNr guifg=#${s.scheme.color6}
-      hi MatchParen guifg=#${s.scheme.color3} guibg=#${s.scheme.background} gui=bold
-      hi ModeMsg guifg=#${s.scheme.color4}
-      hi MoreMsg guifg=#${s.scheme.color2}
-      hi NonText guifg=#${s.scheme.color6}
-      hi NormalFloat guibg=#${s.scheme.color6}
-      hi Pmenu guibg=#${s.scheme.color6}
-      hi PmenuSel guifg=#${s.scheme.color6} guibg=#${s.scheme.foreground} blend=0
-      hi PmenuThumb guibg=#${s.scheme.color6}
-      hi Question guifg=#${s.scheme.color2}
-      hi QuickFixLine guifg=#${s.scheme.color2}
-      hi RedrawDebugClear guibg=#${s.scheme.color2}
-      hi RedrawDebugComposed guibg=#${s.scheme.color4}
-      hi RedrawDebugRecompose guibg=#${s.scheme.color3}
-      hi Removed guifg=#${s.scheme.color4}
-      hi Search guifg=#${s.scheme.color0} guibg=#${s.scheme.color6}
-      hi SignColumn guifg=#${s.scheme.color6} guibg=NONE gui=NONE
-      hi SpecialKey guifg=#${s.scheme.color6}
-      hi SpellBad guisp=#${s.scheme.color4} gui=undercurl
-      hi SpellCap guisp=#${s.scheme.color3} gui=undercurl
-      hi SpellLocal guisp=#${s.scheme.color4} gui=undercurl
-      hi SpellRare guisp=#${s.scheme.color2} gui=undercurl
-      hi StatusLine guifg=#${s.scheme.background} guibg=#${s.scheme.color6}
-      hi StatusLineNC guifg=#${s.scheme.background} guibg=#${s.scheme.color2}
-      hi Title guifg=#${s.scheme.color2} gui=bold
-      hi Visual guibg=#${s.scheme.color6}
-      hi WarningMsg guifg=#${s.scheme.color4}
-      hi WinBar guifg=#${s.scheme.color5} guibg=#${s.scheme.color0} gui=bold
-      hi WinBarNC guifg=#${s.scheme.color5} guibg=#${s.scheme.color0}
-      hi Constant guifg=#${s.scheme.color6}
-      hi Operator guifg=#${s.scheme.foreground}
-      hi PreProc guifg=#${s.scheme.foreground}
-      hi Type guifg=#${s.scheme.color3}
-      hi Delimiter guifg=#${s.scheme.color2}
-      hi Comment guifg=#${s.scheme.color5} gui=italic
-      hi String guifg=#${s.scheme.color4}
-      hi Identifier guifg=#${s.scheme.foreground}
-      hi Function guifg=#${s.scheme.color2}
-      hi Statement guifg=#${s.scheme.color6} gui=bold
-      hi Special guifg=#${s.scheme.color2}
-      hi Error guifg=#${s.scheme.color5} guibg=#${s.scheme.color3}
-      hi Todo guifg=#${s.scheme.foreground} gui=bold
-      hi DiagnosticError guifg=#${s.scheme.color5}
-      hi DiagnosticWarn guifg=#${s.scheme.color4}
-      hi DiagnosticInfo guifg=#${s.scheme.color2}
-      hi DiagnosticHint guifg=#${s.scheme.color1}
-      hi DiagnosticOk guifg=#${s.scheme.color4}
-      hi DiagnosticUnderlineError guisp=#${s.scheme.color4} gui=underline
-      hi DiagnosticUnderlineWarn guisp=#${s.scheme.color3} gui=underline
-      hi DiagnosticUnderlineInfo guisp=#${s.scheme.color2} gui=underline
-      hi DiagnosticUnderlineHint guisp=#${s.scheme.color1} gui=underline
-      hi DiagnosticUnderlineOk guisp=#${s.scheme.color4} gui=underline
-      hi DiagnosticDeprecated guisp=#${s.scheme.color4} gui=strikethrough
-      hi @variable guifg=#${s.scheme.foreground}
-      hi ExtraWhitespace guibg=#${s.scheme.color4}
-      hi MiniStarterInactive guifg=#${s.scheme.foreground}
-      hi MiniStarterQuery guifg=#${s.scheme.color3}
-      hi MiniStarterItemPrefix guifg=#${s.scheme.color4}
+
+      set background=${colo.lightness}
+      set pumblend=10
+
+      hi Normal guifg=#${colo.foreground} guibg=#${colo.background}
+
+      " UI
+      hi Added                guifg=#${colo.color2}
+      hi Changed              guifg=#${colo.color4}
+      hi ColorColumn                                    guibg=#${colo.color6}
+      hi Conceal              guifg=#${colo.color6}
+      hi CurSearch            guifg=#${colo.color0}     guibg=#${colo.color4}
+      hi CursorColumn                                   guibg=#${colo.color6}
+      hi CursorLine                                     guibg=#${colo.color6}
+      hi DiffAdd              guifg=#${colo.color2}     guibg=#${colo.background}
+      hi DiffChange           guifg=#${colo.color4}     guibg=#${colo.background}
+      hi DiffDelete           guifg=#${colo.color3}     guibg=#${colo.background} gui=bold
+      hi DiffText             guifg=#${colo.color6}     guibg=#${colo.background}
+      hi Directory            guifg=#${colo.color2}
+      hi ErrorMsg             guifg=#${colo.color3}
+      hi FloatShadow                                    guibg=#${colo.color6}
+      hi FloatShadowThrough                             guibg=#${colo.color6}
+      hi Folded               guifg=#${colo.color5}     guibg=#${colo.color6}
+      hi LineNr               guifg=#${colo.color6}
+      hi MatchParen                                     guibg=#${colo.color6}     gui=bold
+      hi ModeMsg              guifg=#${colo.color4}
+      hi MoreMsg              guifg=#${colo.color2}
+      hi NonText              guifg=#${colo.color6}
+      hi NormalFloat                                    guibg=#${colo.color1}
+      hi Pmenu                                          guibg=#${colo.color1}
+      hi PmenuSel                                       guibg=#${colo.color2}
+      hi PmenuSbar                                      guibg=#${colo.color1}
+      hi PmenuThumb                                     guibg=#${colo.color1}
+      hi Question             guifg=#${colo.color2}
+      hi QuickFixLine         guifg=#${colo.color2}
+      hi RedrawDebugClear                               guibg=#${colo.color2}
+      hi RedrawDebugComposed                            guibg=#${colo.background}
+      hi RedrawDebugRecompose                           guibg=#${colo.color3}
+      hi Removed              guifg=#${colo.color3}
+      hi Search               guifg=#${colo.foreground} guibg=#${colo.color2}
+      hi SignColumn           guifg=#${colo.color6}
+      hi SpecialKey           guifg=#${colo.color6}
+      hi SpellBad             guisp=#${colo.color3}                               gui=undercurl
+      hi SpellCap             guisp=#${colo.color4}                               gui=undercurl
+      hi SpellLocal           guisp=#${colo.color4}                               gui=undercurl
+      hi SpellRare            guisp=#${colo.color2}                               gui=undercurl
+      hi StatusLine           guifg=#${colo.color4}     guibg=#${colo.background}
+      hi StatusLineNC         guifg=#${colo.color6}     guibg=#${colo.background}
+      hi Title                guifg=#${colo.foreground}                           gui=bold
+      hi Visual                                         guibg=#${colo.color6}
+      hi WarningMsg           guifg=#${colo.color4}
+      hi WinBar               guifg=#${colo.color5}     guibg=#${colo.color0}     gui=bold
+      hi WinBarNC             guifg=#${colo.color5}     guibg=#${colo.color0}
+
+      " // Syntax
+      " "default link Character      Constant",
+      " "default link Number         Constant",
+      " "default link Boolean        Constant",
+      " "default link Float          Number",
+      " "default link Conditional    Statement",
+      " "default link Repeat         Statement",
+      " "default link Label          Statement",
+      " "default link Keyword        Statement",
+      " "default link Exception      Statement",
+      " "default link Include        PreProc",
+      " "default link Define         PreProc",
+      " "default link Macro          PreProc",
+      " "default link PreCondit      PreProc",
+      " "default link StorageClass   Type",
+      " "default link Structure      Type",
+      " "default link Typedef        Type",
+      " "default link Tag            Special",
+      " "default link SpecialChar    Special",
+      " "default link SpecialComment Special",
+      " "default link Debug          Special",
+      " "default link Ignore         Normal",
+
+      " Syntax
+      hi Constant   guifg=#${colo.foreground}  " Use only `Normal` foreground to be usable on different background
+      hi Operator   guifg=#${colo.foreground}
+      hi PreProc    guifg=#${colo.foreground}
+      hi Type       guifg=#${colo.foreground}
+      hi Delimiter  guifg=#${colo.foreground}
+
+      hi Comment    guifg=#${colo.color5}                           gui=italic
+      hi String     guifg=#${colo.color2}
+      hi Identifier guifg=#${colo.foreground}
+      hi Function   guifg=#${colo.color4}
+      hi Statement  guifg=#${colo.foreground}                       gui=bold
+      hi Special    guifg=#${colo.color4}
+      hi Error      guifg=#${colo.foreground} guibg=#${colo.color4}
+      hi Todo       guifg=#${colo.foreground}                       gui=bold
+
+      " Diagnostic
+      hi DiagnosticError          guifg=#${colo.color3}
+      hi DiagnosticWarn           guifg=#${colo.color4}
+      hi DiagnosticInfo           guifg=#${colo.color2}
+      hi DiagnosticHint           guifg=#${colo.foreground}
+      hi DiagnosticOk             guifg=#${colo.color4}
+      hi DiagnosticUnderlineError guisp=#${colo.color3}     gui=underline
+      hi DiagnosticUnderlineWarn  guisp=#${colo.color4}     gui=underline
+      hi DiagnosticUnderlineInfo  guisp=#${colo.color2}     gui=underline
+      hi DiagnosticUnderlineHint  guisp=#${colo.foreground} gui=underline
+      hi DiagnosticUnderlineOk    guisp=#${colo.color4}     gui=underline
+      hi DiagnosticDeprecated     guisp=#${colo.color3}     gui=strikethrough
+
+      hi @variable guifg=#${colo.foreground}
+
+      " Plugins
+      hi MiniStarterInactive   guifg=#${colo.foreground}
+      hi MiniStarterQuery      guifg=#${colo.color3}
+      hi MiniStarterItemPrefix guifg=#${colo.color4}
+
+      " https://github.com/NeogitOrg/neogit/blob/nightly/lua/neogit/lib/hl.lua
+      hi link NeogitDiffContext Normal
+      hi link NeogitDiffContextHighlight Normal
+      hi link NeogitDiffContextCursor Normal
+      hi link NeogitHunkHeader NeogitHunkHeaderHighlight
+
+      " Custom
+      hi ExtraWhitespace guibg=#${colo.color4}
+
+      " Lag Fix
       hi! link CurSearch Search
     '';
   };
@@ -142,6 +209,17 @@ in {
         ripgrep
         xxd
       ];
+      #(pkgs.vimUtils.buildVimPlugin {
+      #  pname = "";
+      #  version = "";
+      #  src = pkgs.fetchFromGitHub {
+      #    owner = "";
+      #    repo = "";
+      #    rev = "";
+      #    hash = "";
+      #  };
+      #  meta.homepage = "";
+      #})
       plugins = with pkgs.vimPlugins; [
         local
         wal
@@ -152,24 +230,13 @@ in {
         nvim-lspconfig
         lsp-status-nvim
         inc-rename-nvim
-        (nvim-treesitter.withPlugins (plugins: with plugins; [ c cpp lua bash python nix ]))
+        (nvim-treesitter.withPlugins (plugins: with plugins; [ c cpp bash python lua nix ]))
         fzfWrapper
         fzf-vim
         mini-nvim
         neogit
         plenary-nvim
         diffview-nvim
-        (pkgs.vimUtils.buildVimPlugin {
-          pname = "vim-stay";
-          version = "v1.4.3";
-          src = pkgs.fetchFromGitHub {
-            owner = "zhimsel";
-            repo = "vim-stay";
-            rev = "af6141815b88de1d84f92709f42cb98b0af5f3b1";
-            hash = "sha256-Vg6gV3UefIqkIC24jZdDgeXIEdSDWIhF3DpW4D6nAHU=";
-          };
-          meta.homepage = "https://github.com/zhimsel/vim-stay/";
-        })
       ];
     };
   };
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 31bc9d0..58db6d3 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -73,22 +73,27 @@ in {
       "*color15" = "#${s.scheme.color15}";
     };
     gtk = let
+      # *_shade_color is adjusted from black by default.
       extraCss3 = ''
         @define-color window_bg_color #${s.scheme.background};
         @define-color window_fg_color #${s.scheme.foreground};
         @define-color view_bg_color #${s.scheme.background};
         @define-color view_fg_color #${s.scheme.foreground};
-        @define-color accent_bg_color #${s.scheme.color1};
+        @define-color accent_bg_color #${s.scheme.color2};
         @define-color accent_fg_color #${s.scheme.background};
-        @define-color accent_color #${s.scheme.color1};
+        @define-color accent_color #${s.scheme.color2};
         @define-color headerbar_bg_color #${s.scheme.background};
         @define-color headerbar_fg_color #${s.scheme.foreground};
         @define-color headerbar_backdrop_color #${s.scheme.background};
         @define-color headerbar_border_color #${s.scheme.color6};
-        @define-color headerbar_shade_color #${s.scheme.color6};
+        @define-color secondary_headerbar_bg_color #${s.scheme.background};
+        @define-color secondary_headerbar_fg_color #${s.scheme.foreground};
+        @define-color secondary_headerbar_backdrop_color #${s.scheme.background};
+        @define-color secondary_headerbar_border_color #${s.scheme.color5};
+        @define-color thumbnail_bg_color #${s.scheme.background};
+        @define-color thumbnail_fg_color #${s.scheme.foreground};
         @define-color card_bg_color #${s.scheme.background};
         @define-color card_fg_color #${s.scheme.foreground};
-        @define-color card_shade_color #${s.scheme.color6};
         @define-color popover_bg_color #${s.scheme.background};
         @define-color popover_fg_color #${s.scheme.foreground};
         @define-color dialog_bg_color #${s.scheme.background};
@@ -98,17 +103,15 @@ in {
         @define-color sidebar_bg_color #${s.scheme.background};
         @define-color sidebar_fg_color #${s.scheme.foreground};
         @define-color sidebar_backdrop_color #${s.scheme.background};
-        @define-color sidebar_shade_color #${s.scheme.color6};
-        @define-color incognito_bg_color #${s.scheme.color5};
-        @define-color warning_bg_color #${s.scheme.color3};
+        @define-color warning_bg_color #${s.scheme.color4};
         @define-color warning_fg_color #${s.scheme.foreground};
-        @define-color warning_color #${s.scheme.color3};
-        @define-color error_bg_color #${s.scheme.color4};
+        @define-color warning_color #${s.scheme.color4};
+        @define-color error_bg_color #${s.scheme.color3};
         @define-color error_fg_color #${s.scheme.foreground};
-        @define-color error_color #${s.scheme.color4};
-        @define-color success_bg_color #${s.scheme.color1};
+        @define-color error_color #${s.scheme.color3};
+        @define-color success_bg_color #${s.scheme.color2};
         @define-color success_fg_color #${s.scheme.background};
-        @define-color success_color #${s.scheme.color1};
+        @define-color success_color #${s.scheme.color2};
         @define-color destructive_bg_color #${s.scheme.color5};
         @define-color destructive_fg_color #${s.scheme.background};
         @define-color destructive_color #${s.scheme.color5};
@@ -118,16 +121,16 @@ in {
     in {
       enable = true;
       theme = {
-        name = "adw-gtk3-dark";
+        name = "adw-gtk3" + (if s.scheme.lightness == "light" then "" else "-dark");
         package = pkgs.adw-gtk3;
       };
       cursorTheme = {
         name = "WhiteSur-cursors";
       };
-#      iconTheme = {
-#        name = "suru";
-#        package = pkgs.ubuntu-themes;
-#      };
+      #iconTheme = {
+      #  name = "suru";
+      #  package = pkgs.ubuntu-themes;
+      #};
       gtk3.extraCss = extraCss3;
       gtk4.extraCss = extraCss3;
     };
@@ -150,7 +153,7 @@ in {
             border = "${s.scheme.background}";
             text = "${s.scheme.foreground}";
             button-text = "${s.scheme.foreground}";
-            button-background = "${s.scheme.color2}";
+            button-background = "${s.scheme.color6}";
             message-padding = 5;
             border-bottom-size = 1;
             details-border-size = 1;
@@ -259,7 +262,7 @@ in {
           commands = [
             { command = "move to scratchpad"; criteria.app_id = "kitty-server"; }
             { command = "max_render_time 1"; criteria.app_id = "kitty"; }
-            { command = "floating enable; max_render_time 1"; criteria.app_id = "cmv"; }
+            { command = "inhibit_idle fullscreen; floating enable; max_render_time 1"; criteria.app_id = "cmv"; }
             { command = "floating enable"; criteria.class = "cmv.exe"; }
             { command = "floating enable"; criteria.app_id = "mauri"; }
             { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; }
@@ -280,8 +283,8 @@ in {
         colors = let
           bg = "#${s.scheme.background}";
           fg = "#${s.scheme.foreground}";
-          c2 = "#${s.scheme.color1}";
-          urgent = "#${s.scheme.color3}";
+          c2 = "#${s.scheme.color6}";
+          urgent = "#${s.scheme.color2}";
         in {
           background = bg;
           focused = { background = bg; border = c2; childBorder = c2; indicator = c2; text = fg; };
@@ -293,7 +296,7 @@ in {
         startup = let
           gnome-schema = "org.gnome.desktop.interface";
         in [
-          { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-dark'\""; always = true; }
+          { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-${s.scheme.lightness}'\""; always = true; }
           { command = "dbus-sway-environment"; }
           { command = "swaymsg 'seat * hide_cursor 4000'"; always = true; }
           { command = "kitty -1 --class=\"kitty-server\""; }
@@ -317,7 +320,7 @@ in {
       font = "${s.font.name} ${toString s.ui-font.size}";
       backgroundColor = "#${s.scheme.background}";
       textColor = "#${s.scheme.foreground}";
-      borderColor = "#${s.scheme.color2}";
+      borderColor = "#${s.scheme.color6}";
     };
   };
 }