ft: move to everforest

.gitignore

@@ -1,3 +1,4 @@
 __pycache__/
 __init__.py
 /fonts/.uuid
+plugin/

files/alacritty/.config/alacritty/alacritty.yml

@@ -18,30 +18,53 @@ font:
 
 draw_bold_text_with_bright_colors: false
 
-colors:
+schemes:
-  primary:
+  solarized_light: &solarized_light
-    background: '0xfdf6e3'
+   primary:
-    foreground: '0x657B83'
+     background: '0xfdf6e3'
+     foreground: '0x657B83'
+   normal:
+     black:   '0x073642'
+     red:     '0xdc322f'
+     green:   '0x859900'
+     yellow:  '0xb58900'
+     blue:    '0x268bd2'
+     magenta: '0xd33682'
+     cyan:    '0x2aa198'
+     white:   '0xeee8d5'
+   bright:
+     black:   '0x002b36'
+     red:     '0xcb4b16'
+     green:   '0x586e75'
+     yellow:  '0x657b83'
+     blue:    '0x839496'
+     magenta: '0x6c71c4'
+     cyan:    '0x93a1a1'
+     white:   '0xfdf6e3'
+  everforest_light_hard: &everforest_light_hard
+    primary:
+      background: '#fff9e8'
+      foreground: '#5c6a72'
+    normal:
+      black:   '#5c6a72'
+      red:     '#f85552'
+      green:   '#8da101'
+      yellow:  '#dfa000'
+      blue:    '#3a94c5'
+      magenta: '#df69ba'
+      cyan:    '#35a77c'
+      white:   '#dfddc8'
+    bright:
+      black:   '#5c6a72'
+      red:     '#f85552'
+      green:   '#8da101'
+      yellow:  '#dfa000'
+      blue:    '#3a94c5'
+      magenta: '#df69ba'
+      cyan:    '#35a77c'
+      white:   '#dfddc8'
 
-  normal:
+colors: *everforest_light_hard
-    black:   '0x073642'
-    red:     '0xdc322f'
-    green:   '0x859900'
-    yellow:  '0xb58900'
-    blue:    '0x268bd2'
-    magenta: '0xd33682'
-    cyan:    '0x2aa198'
-    white:   '0xeee8d5'
-
-  bright:
-    black:   '0x002b36'
-    red:     '0xcb4b16'
-    green:   '0x586e75'
-    yellow:  '0x657b83'
-    blue:    '0x839496'
-    magenta: '0x6c71c4'
-    cyan:    '0x93a1a1'
-    white:   '0xfdf6e3'
 
 live_config_reload: true
 

files/sway/.config/sway/config

@@ -12,6 +12,7 @@ set $up k
 set $right l
 
 # Color
+# old solarized
 set $yellow	#b58900
 set $orange	#cb4b16
 set $red	#dc322f
@@ -31,13 +32,16 @@ set $baseB2 #073642
 set $baseB3 #002b36
 set $custom #e1cab3
 
-set $bar_bg   #323232
+# new everforest
+set $bar_bg #323232
+set $green  #93b259
+set $orange #f85551
 
 # clientclass           border  backgr. text    indicator
-client.focused          $green  $green  #ffffff $green
+client.focused          $green  $green  $bar_bg $green
 client.focused_inactive $bar_bg $bar_bg $baseB0 $bar_bg
 client.unfocused        $bar_bg $bar_bg $baseB0 $bar_bg
-client.urgent           $yellow $yellow $baseB3 $orange
+client.urgent           $orange $orange $baseB3 $orange
 
 # Output configuration
 set $laptop eDP-1
@@ -73,7 +77,8 @@ input type:pointer {
 input type:keyboard {
     # Umlauts on RAlt + {a,u,o,s}
     xkb_layout eu
-    # Make Caps Lock an additional Esc - https://man.archlinux.org/man/xkeyboard-config.7
+    # Make Caps Lock an additional Esc
+    # https://man.archlinux.org/man/xkeyboard-config.7
     xkb_options caps:escape
     # Keyboard repeats
     repeat_delay 300
@@ -89,9 +94,21 @@ input type:keyboard {
     bindsym $mod+Shift+Backspace kill
 
     # bemenu
-    set $bemenu bemenu -l 7 --tf "#859900" --hf "#282828" --nb "#282828" --hb "#859900" --tb "#282828" --fb "#282828" --fn "SFMono Nerd Font 13" -i -H 25
+    set $bemenu bemenu \
+        -l 7 \
+        --nb "#282828" \
+        --fb "#282828" \
+        --tf "#93b259" \
+        --tb "#282828" \
+        --hf "#ffffff" \
+        --hb "#393939" \
+        --fn "SFMono Nerd Font 13" -i -H 25 -W 0.35
     set $files fd -I "pdf$" $HOME | cut -f 4- -d "/"
-    set $lock_screen printf "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nshutdown now" | $bemenu -l 3 -p "power" | xargs -d '\n' -r /bin/bash -c
+    set $lock_screen \
+        printf \
+            "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now" \
+        | $bemenu -p "power" \
+        | xargs -d '\n' -r /bin/bash -c
     bindsym $mod+d exec dmenu_path | $bemenu -p 'run' | xargs swaymsg exec --
     bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdf' | xargs -d '\n' -r xdg-open
     bindsym $mod+Ctrl+Backspace exec $lock_screen
@@ -177,7 +194,7 @@ input type:keyboard {
     default_border pixel 0
     default_floating_border pixel 0
     # hide title and border, if only one application open
-    # hide_edge_borders --i3 smart
+    hide_edge_borders --i3 smart
 
     # just show gaps between windows
     # gaps inner 5

files/tmux/.tmux.conf

@@ -53,22 +53,6 @@ setw -g pane-base-index 1
 # styling
 set -g status-position top
 
-# generated, using https://github.com/edkolev/tmuxline.vim
+# using https://github.com/edkolev/tmuxline.vim
-set -g status-justify "left"
+# open vim, `:TmuxLineSnapshot`, save to ~/.tmux.theme
-set -g status "on"
+if-shell "test -f ~/.tmux.theme" "source ~/.tmux.theme"
-set -g status-left-style "none"
-set -g message-command-style "fg=colour7,bg=colour14"
-set -g status-right-style "none"
-set -g pane-active-border-style "fg=#859900"
-set -g status-style "none,bg=colour7"
-set -g message-style "fg=colour7,bg=colour14"
-set -g pane-border-style "fg=colour11"
-set -g status-right-length "100"
-set -g status-left-length "100"
-setw -g window-status-activity-style "none"
-setw -g window-status-separator ""
-setw -g window-status-style "none,fg=colour14,bg=colour7"
-set -g status-left "#[fg=colour7,bg=colour11,bold] #S #[fg=colour11,bg=colour7,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] %Y-%m-%d  %I:%M %p #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #h "
-setw -g window-status-format "#[fg=colour14,bg=colour7] #I #[fg=colour14,bg=colour7] #W "
-setw -g window-status-current-format "#[fg=colour7,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #I #[fg=colour7,bg=colour14] #W #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]"

files/vim/.vimrc

@@ -18,16 +18,21 @@ Plug 'jiangmiao/auto-pairs'             " pair completion
 Plug 'ctrlpvim/ctrlp.vim'               " file finder
 Plug 'djoshea/vim-autoread'             " auto reload file, when changed on disk
 
-Plug 'altercation/vim-colors-solarized' " color scheme
+Plug 'sainnhe/everforest'               " color scheme
 Plug 'vim-airline/vim-airline'          " a nicer status line
 Plug 'vim-airline/vim-airline-themes'   " auto settings theme for airline
+Plug 'edkolev/tmuxline.vim'             " generate a theme for tmux `:TmuxLineSnapshot ~/.tmux.theme`
 
 call plug#end()
 " ============================== Colors
 syntax on
 set background=light
-colorscheme solarized
+let g:everforest_background = 'hard'
-hi Normal guibg=NONE ctermbg=NONE
+let g:everforest_better_performance = 1
+colorscheme everforest
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+set termguicolors
 
 " ============================== General
 filetype indent plugin on
@@ -86,10 +91,6 @@ let g:netrw_banner = 0    " Remove useless banner at the top of netrw
 
 " ============================== Macros and Mappings
 " open fuzzy file browser
-map <C-x><C-f> :CtrlP<CR>
+map <C-f> :CtrlP<CR>
-" open fuzzy file search
-map <C-s> :CtrlPLine<CR>
-" save
-map <C-x><C-s> :w<CR>
 " C-/ to hide search results
 map <C-_> :noh<CR>

files/waybar/.config/waybar/config

@@ -13,7 +13,7 @@
 
     "layer": "bottom",
 
-    "position": "top",
+    "position": "left",
 
     // If height property would be not present, it'd be calculated dynamically
     "height": 37,
@@ -61,7 +61,8 @@
             "critical": 15
         },
         // Connected to AC
-        "format": "{icon}  {capacity}% ", // Icon: bolt
+        //"format": "{icon}  {capacity}%", // Icon: bolt
+        "format": " {capacity}%", // Icon: bolt
         // Not connected to AC
         "format-discharging": "{icon}  {capacity}%",
         "format-icons": [
@@ -76,13 +77,13 @@
 
     "clock#time": {
         "interval": 5,
-        "format": "  {:%I:%M %p}",
+        "format": "{:%I:%M}",
         "tooltip": false
     },
 
     "clock#date": {
       "interval": 10,
-      "format": "  {:%a, %e %b}", // Icon: calendar-alt
+      "format": "{:%a %e}", // Icon: calendar-alt
       "tooltip-format": "{:%A, %e %B %Y}"
     },
 
@@ -130,15 +131,18 @@
     "sway/workspaces": {
         "all-outputs": false,
         "disable-scroll": false,
-        "format": "{icon} {name}",
+        "format": "{icon}",
         "format-icons": {
-            "1": "",
+            "1": "一",
-            "2": "",
+            "2": "二",
-            "3": "‭ﭮ‬",
+            "3": "三",
-            "4": "",
+            "4": "四",
-            "5": "",
+            "5": "五",
-            "8": "",
+            "6": "六",
-            "9": "",
+            "7": "七",
+            "8": "八",
+            "9": "九",
+            "10": "十",
             "urgent": "",
             "focused": "",
             "default": ""

files/waybar/.config/waybar/style.css

@@ -71,11 +71,8 @@
 #tray {
     border-radius: 5px;
     background-color: #282828;
-    margin-top: 5px;
+    margin: 5px;
-    margin-bottom: 5px;
+    padding: 10px
-    margin-left: 5px;
-    padding-left: 10px;
-    padding-right: 10px;
 }
 
 
@@ -180,13 +177,13 @@
 }
 
 #workspaces button.focused {
-    background-color: #859900;
+    background-color: #93b259;
     color: #282828;
     border-bottom: none;
 }
 
 #workspaces button.urgent {
-    background-color: #dc322f;
+    background-color: #f85551;
 }
 
 /* remove weird GTK hover effect */
@@ -198,6 +195,6 @@
 }
 
 #workspaces button.focused:hover {
-    background: #859900;
+    background: #93b259;
-    border: #859900;
+    border: #93b259;
 }

files/zsh/.zshrc

@@ -175,10 +175,10 @@ export FZF_DEFAULT_OPTS='
        --layout=reverse
        --bind=tab:down
        --bind=btab:up
-       --color=fg:#657B83,bg:#FDF6E3,hl:#859900
+       --color=fg:#5c6a72,bg:#fff9e8,hl:#8da101
-       --color=fg+:#657B83,bg+:#eee8d5,hl+:#859900
+       --color=fg+:#5c6a72,bg+:#eee8d5,hl+:#8da101
-       --color=info:#657B83,prompt:#657B83,pointer:#657B83
+       --color=info:#5c6a72,prompt:#5c6a72,pointer:#5c6a72
-       --color=marker:#657B83,spinner:#657B83,header:#657B83'
+       --color=marker:#5c6a72,spinner:#5c6a72,header:#5c6a72'
 
 ## ripgrep-all
 # https://github.com/phiresky/ripgrep-all