Add ef-dream theme and integrate with vim/polybar configs

Amp-Thread-ID: https://ampcode.com/threads/T-019b479a-0995-731e-8d63-ed185a1ab54a
Co-authored-by: Amp <amp@ampcode.com>

1 files changed, 20 insertions, 32 deletions

diff --git a/lib/common.nix b/lib/common.nix
index d0d51fc..5675a23 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -312,20 +312,28 @@ in {
       # select buffer to paste from
       bind Space choose-buffer
       # status line text
-      set -g status-left-length 30
-      set -g status-left '#S | #(whoami)@#(hostname) | '
-      set -g status-right '~%Y.%m.%d..%H.%M'
+      set -g status-left-length 50
+      set -g status-left '  #[fg=#f3c09a,bold]#S #[fg=#8f8886]│ #[fg=#efd5c5]#(whoami)@#h #[fg=#8f8886]│ '
+      set -g status-right '#[fg=#6fb3c0]%a %Y.%m.%d #[fg=#8f8886]│ #[fg=#f3c09a]%H:%M  '
       set -g renumber-windows on
+
       # ef-dream colors
       set -g status-style bg='#232025',fg='#efd5c5'
-      # highlight current window with magenta-cooler
-      set -g window-status-current-style fg='#232025',bg='#d0b0ff'
-      set -g window-status-format '#I) #W '
-      set -g window-status-current-format '#I) #W '
+      set -g message-style bg='#3b393e',fg='#ffaacf'
+      set -g message-command-style bg='#3b393e',fg='#57b0ff'
+
+      # window tabs
+      set -g window-status-format '#[fg=#8f8886] #I:#W '
+      set -g window-status-current-format '#[fg=#232025,bg=#f3c09a,bold] #I:#W '
+      set -g window-status-separator '#[fg=#3b393e]│'
+
       # pane borders
       set -g pane-border-style fg='#3b393e'
       set -g pane-active-border-style fg='#d0b0ff'
-      #
+
+      # copy mode
+      set -g mode-style bg='#3b393e',fg='#ffaacf'
+
       set-option -g allow-passthrough on
     '';
   };
@@ -342,38 +350,18 @@ in {
     #viAlias = true;
     #vimdiffAlias = true;
     plugins = with pkgs.vimPlugins; [
-      base16-vim
-      catppuccin-vim
       editorconfig-vim
       vim-sensible
       vim-fugitive
       vim-sexp-mappings-for-regular-people
-      # vim-ripgrep # not in nixpkgs :(
       rainbow_parentheses
-      vim-plug # just in case
+      vim-plug
       vim-addon-local-vimrc
       fzf-vim
       (pkgs.vimUtils.buildVimPlugin {
-        pname = "photon.vim";
-        version = "2022.03.14";
-        src = pkgs.fetchFromGitHub {
-          owner = "axvr";
-          repo = "photon.vim";
-          rev = "32b42c8a12bf9588259b76f3df6807960e0d7386";
-          sha256 = "sha256-kM7WP03uE20yr0nCusB3ncHzgtEYxqNzoNoQGen9p+o=";
-        };
-        meta.homepage = "https://github.com/axvr/photon.vim";
-      })
-      (pkgs.vimUtils.buildVimPlugin {
-        pname = "skull-vim";
-        version = "2022.03.14";
-        src = pkgs.fetchFromGitHub {
-          owner = "kadekillary";
-          repo = "skull-vim";
-          rev = "abb9d7120c63aad6f9acc26d31c948a93f352e94";
-          sha256 = "sha256-tu5aDRjHZtXKoyQBbMEhzjGrRl4GZD121ybs7oNylvs=";
-        };
-        meta.homepage = "https://github.com/kadekillary/skull-vim";
+        pname = "ef-dream-vim";
+        version = "2024.12.22";
+        src = pkgs.writeTextDir "colors/ef-dream.vim" (builtins.readFile ./ef-dream.vim);
       })
     ];
     extraConfig = builtins.readFile ./vimrc;