diff --git a/config/profiles/kat/home/vim/default.nix b/config/profiles/kat/home/vim/default.nix index 539e9beb..ac67a67e 100644 --- a/config/profiles/kat/home/vim/default.nix +++ b/config/profiles/kat/home/vim/default.nix @@ -18,6 +18,7 @@ coc-git vim-fugitive vim-startify + base16-vim ]; #extraPackages = with pkgs; # [ (python3.withPackages (ps: with ps; [ black flake8 ])) ]; diff --git a/config/profiles/kat/home/vim/vimrc.nix b/config/profiles/kat/home/vim/vimrc.nix index 06f4f308..25c5669b 100644 --- a/config/profiles/kat/home/vim/vimrc.nix +++ b/config/profiles/kat/home/vim/vimrc.nix @@ -4,6 +4,10 @@ " Enable mouse set mouse=a + " colors + let base16colorspace=256 + colorscheme base16-rebecca + " notmuch! let g:notmuch_config_file='${config.xdg.configHome}/notmuch/notmuchrc' let g:notmuch_folders_count_threads=0 diff --git a/config/profiles/sway/home/sway.nix b/config/profiles/sway/home/sway.nix index b8906f9b..64da4fc2 100644 --- a/config/profiles/sway/home/sway.nix +++ b/config/profiles/sway/home/sway.nix @@ -182,14 +182,14 @@ colors = { focused = { border = witch.style.base16.color8; - background = witch.style.base16.color13; + background = witch.style.base16.color3; text = witch.style.base16.color0; indicator = witch.style.base16.color2; childBorder = witch.style.base16.color8; }; focusedInactive = { border = witch.style.base16.color0; - background = witch.style.base16.color10; + background = witch.style.base16.color15; text = witch.style.base16.color13; indicator = witch.style.base16.color2; childBorder = witch.style.base16.color8; @@ -197,7 +197,7 @@ unfocused = { border = witch.style.base16.color0; background = witch.style.base16.color8; - text = witch.style.base16.color12; + text = witch.style.base16.color7; indicator = witch.style.base16.color8; childBorder = witch.style.base16.color8; }; diff --git a/config/profiles/sway/home/waybar/waybar.css.nix b/config/profiles/sway/home/waybar/waybar.css.nix index 4819dd91..ab812d4f 100644 --- a/config/profiles/sway/home/waybar/waybar.css.nix +++ b/config/profiles/sway/home/waybar/waybar.css.nix @@ -30,8 +30,8 @@ #workspaces { padding: 0px 4px 0px 4px } #workspaces button { - color: ${style.base16.color13}; - background: ${hextorgba style.base16.color10}; + color: ${style.base16.color7}; + background: ${hextorgba style.base16.color8}; font-size: 16px; margin: 0px 4px 0px 4px; border-bottom: 2px solid transparent; @@ -57,7 +57,7 @@ #mpd { border-color: #5af78e } #mpd.disconnected, #mpd.stopped { border-color: #282a36 } #network { border-color: ${style.base16.color3} } - #custom-weather { border-color: ${style.base16.color15} } + #custom-weather { border-color: ${style.base16.color14} } #pulseaudio { border-color: ${style.base16.color2} } #temperature { border-color: ${style.base16.color4} } #battery { border-color: ${style.base16.color6} } diff --git a/lib/style.nix b/lib/style.nix index 3e7acac2..7f5d627f 100644 --- a/lib/style.nix +++ b/lib/style.nix @@ -1,29 +1,29 @@ rec { base16 = { - color0 = "#181818"; - color1 = "#ab4642"; - color2 = "#a1b56c"; - color3 = "#f7ca88"; - color4 = "#7cafc2"; - color5 = "#ba8baf"; - color6 = "#86c1b9"; - color7 = "#d8d8d8"; + color0 = "#292a44"; + color1 = "#a0a0c5"; + color2 = "#6dfedf"; + color3 = "#ae81ff"; + color4 = "#2de0a7"; + color5 = "#7aa5ff"; + color6 = "#8eaee0"; + color7 = "#f1eff8"; - color8 = "#585858"; - color9 = "#dc9656"; - color10 = "#282828"; - color11 = "#383838"; - color12 = "#b8b8b8"; - color13 = "#e8e8e8"; - color14 = "#a16946"; - color15 = "#f8f8f8"; + color8 = "#666699"; + color9 = "#a0a0c5"; + color10 = "#6dfedf"; + color11 = "#ae81ff"; + color12 = "#2de0a7"; + color13 = "#7aa5ff"; + color14 = "#8eaee0"; + color15 = "#53495d"; - color16 = "#fd971f"; - color17 = "#cc6633"; - color18 = "#383830"; - color19 = "#49483e"; - color20 = "#a59f85"; - color21 = "#f5f4f1"; + color16 = "#efe4a1"; + color17 = "#ff79c6"; + color18 = "#663399"; + color19 = "#383a62"; + color20 = "#a0a0c5"; + color21 = "#ccccff"; ## Nord