Merge branch 'master' of git.tovijaeschke.xyz:tovi/dotfiles

.config/alacritty/alacritty.toml

@@ -1,5 +1,5 @@
 import = [
-    "~/.config/alacritty/themes/flow.toml"
+    "~/.config/alacritty/themes/kanagawa_wave.toml"
 ]
 
 [env]

.config/nvim/lua/tovi/plugins/colorscheme.lua

@@ -69,7 +69,7 @@ return {
 
     {
         "rebelot/kanagawa.nvim",
-        enabled = false,
+        enabled = true,
         priority = 1000 ,
         config = function ()
             -- Default options:
@@ -131,7 +131,7 @@ return {
 
     {
         "0xstepit/flow.nvim",
-        enabled = true,
+        enabled = false,
         lazy = false,
         priority = 1000,
         opts = {},

.config/nvim/lua/tovi/plugins/lualine.lua

@@ -19,7 +19,7 @@ return {
 
 		lualine.setup({
 			options = {
-				theme = "flow",
+				theme = "kanagawa",
 				component_separators = { left = "", right = "" },
 				section_separators = { left = "", right = "" },
                 globalstatus = true,

.tmux.conf

@@ -63,32 +63,26 @@ bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
 
 # Flow colorscheme | Tmux
 # https://github.com/0xstepit/flow.nvim
-
 ## Statusbar style
-
-set -g status-position top
-set -g status-right-length "100"
-set -g status-left-length "100"
-set -g status-style bg=#141A1F,fg=#3D4F5C
-set -g window-status-style fg=#3D4F5C,bg=#141A1F
-setw -g window-status-separator " "
-set -g window-status-current-style fg=colour198
-set -g window-status-format "(#I) #W"
-set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0D0D0D,bg=#75BDF0] #S #[bg=#3D4F5C,fg=#75BDF0] #h #[bg=#141A1F] "
-set -g status-right "#[bg=#3D4F5C,fg=#75BDF0] %H:%M #[fg=#0D0D0D,bg=#75BDF0] %A %d. %b %Y "
-
-set -g message-command-style fg=#FF007C
-set -g message-style "fg=#FF007C, bg=#141A1F" # color used in the message popup.
-
-set -g mode-style "fg=#FF007C"
-
-## Borders
-set -g pane-border-style "fg=#3D4F5C"
-set -g pane-active-border-style "fg=#3D4F5C"
-
-# Set below the rest of your config
-# ...
+# set -g status-position top
+# set -g status-right-length "100"
+# set -g status-left-length "100"
+# set -g status-style bg=#141A1F,fg=#3D4F5C
+# set -g window-status-style fg=#3D4F5C,bg=#141A1F
+# setw -g window-status-separator " "
+# set -g window-status-current-style fg=colour198
+# set -g window-status-format "(#I) #W"
+# set -g window-status-current-format "(#I) #W"
+# set -g status-left "#[fg=#0D0D0D,bg=#75BDF0] #S #[bg=#3D4F5C,fg=#75BDF0] #h #[bg=#141A1F] "
+# set -g status-right "#[bg=#3D4F5C,fg=#75BDF0] %H:%M #[fg=#0D0D0D,bg=#75BDF0] %A %d. %b %Y "
+#
+# set -g message-command-style fg=#FF007C
+# set -g message-style "fg=#FF007C, bg=#141A1F" # color used in the message popup.
+#
+# set -g mode-style "fg=#FF007C"
+# ## Borders
+# set -g pane-border-style "fg=#3D4F5C"
+# set -g pane-active-border-style "fg=#3D4F5C"
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
@@ -97,9 +91,9 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 # set -g @plugin "janoamaral/tokyo-night-tmux"
 # set -g @tokyo-night-tmux_window_id_style digital
 
-# set -g @plugin 'Nybkox/tmux-kanagawa'
-# set -g @kanagawa-show-powerline true
-# set -g @kanagawa-theme 'wave'
+set -g @plugin 'Nybkox/tmux-kanagawa'
+set -g @kanagawa-show-powerline true
+set -g @kanagawa-theme 'wave'
 
 # set -g @plugin 'jibingeo/tmux-colors-ayu'