summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authoraktersnurra <grydholm@kth.se>2021-02-11 21:40:56 +0100
committeraktersnurra <grydholm@kth.se>2021-02-11 21:40:56 +0100
commit5e8681f8e9db4614e4512d0ecff910d6e0a629a3 (patch)
tree9fb7708cf0fbd89b06e55bccecd791bf8eb4ffbb /.config
parentb12967a20478efdcf11da722fbf440626abbfa8f (diff)
updates
Diffstat (limited to '.config')
-rw-r--r--.config/nvim/plug-config/sneak.vim4
-rw-r--r--.config/nvim/vim-plug/plugins.vim3
-rw-r--r--.config/tmux/.tmux.conf52
-rw-r--r--.config/zsh/keybindings.zsh1
4 files changed, 48 insertions, 12 deletions
diff --git a/.config/nvim/plug-config/sneak.vim b/.config/nvim/plug-config/sneak.vim
index 2641dc9..febad68 100644
--- a/.config/nvim/plug-config/sneak.vim
+++ b/.config/nvim/plug-config/sneak.vim
@@ -15,8 +15,8 @@ highlight Sneak guifg=black guibg=#00C7DF ctermfg=black ctermbg=cyan
highlight SneakScope guifg=red guibg=yellow ctermfg=red ctermbg=yellow
" Cool prompts
-" let g:sneak#prompt = '๐Ÿ•ต๏ธ'
-let g:sneak#prompt = '๐Ÿ”Ž '
+let g:sneak#prompt = '๐Ÿ•ต๏ธ'
+" let g:sneak#prompt = '๐Ÿ”Ž '
" I like quickscope better for this since it keeps me in the scope of a single line
" map f <Plug>Sneak_f
diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim
index 30d14a4..9ec7883 100644
--- a/.config/nvim/vim-plug/plugins.vim
+++ b/.config/nvim/vim-plug/plugins.vim
@@ -22,6 +22,9 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'synul/githubsy'
Plug 'dylanaraps/wal.vim'
Plug 'richtan/pywal.vim'
+
+ Plug 'ap/vim-css-color'
+
" FZF
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
diff --git a/.config/tmux/.tmux.conf b/.config/tmux/.tmux.conf
index 2c25fb0..41070f7 100644
--- a/.config/tmux/.tmux.conf
+++ b/.config/tmux/.tmux.conf
@@ -56,13 +56,45 @@ set -sg escape-time 0
# Reload tmux config
bind r source-file ~/.config/tmux/.tmux.conf
-# THEME
-set -g status-bg black
-set -g status-fg white
-set -g window-status-current-bg white
-set -g window-status-current-fg black
-set -g window-status-current-attr bold
-set -g status-interval 60
-set -g status-left-length 30
-set -g status-left '#[fg=green](#S) #(whoami)'
-set -g status-right '#[fg=yellow]#(cut -d " " -f 1-3 /proc/loadavg)#[default] #[fg=white]%H:%M#[default]'
+
+# Nord Theme
+NORD_TMUX_COLOR_THEME_FILE=src/nord.conf
+NORD_TMUX_VERSION=0.3.0
+NORD_TMUX_STATUS_CONTENT_FILE="src/nord-status-content.conf"
+NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE="src/nord-status-content-no-patched-font.conf"
+NORD_TMUX_STATUS_CONTENT_OPTION="@nord_tmux_show_status_content"
+NORD_TMUX_NO_PATCHED_FONT_OPTION="@nord_tmux_no_patched_font"
+_current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+__cleanup() {
+ unset -v NORD_TMUX_COLOR_THEME_FILE NORD_TMUX_VERSION
+ unset -v NORD_TMUX_STATUS_CONTENT_FILE NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE
+ unset -v NORD_TMUX_STATUS_CONTENT_OPTION NORD_TMUX_NO_PATCHED_FONT_OPTION
+ unset -v _current_dir
+ unset -f __load __cleanup
+ tmux set-environment -gu NORD_TMUX_STATUS_TIME_FORMAT
+}
+
+__load() {
+ tmux source-file "$_current_dir/$NORD_TMUX_COLOR_THEME_FILE"
+
+ local status_content=$(tmux show-option -gqv "$NORD_TMUX_STATUS_CONTENT_OPTION")
+ local no_patched_font=$(tmux show-option -gqv "$NORD_TMUX_NO_PATCHED_FONT_OPTION")
+
+ if [ "$(tmux show-option -gqv "clock-mode-style")" == '12' ]; then
+ tmux set-environment -g NORD_TMUX_STATUS_TIME_FORMAT "%I:%M %p"
+ else
+ tmux set-environment -g NORD_TMUX_STATUS_TIME_FORMAT "%H:%M"
+ fi
+
+ if [ "$status_content" != "0" ]; then
+ if [ "$no_patched_font" != "1" ]; then
+ tmux source-file "$_current_dir/$NORD_TMUX_STATUS_CONTENT_FILE"
+ else
+ tmux source-file "$_current_dir/$NORD_TMUX_STATUS_CONTENT_NO_PATCHED_FONT_FILE"
+ fi
+ fi
+}
+
+__load
+__cleanup
diff --git a/.config/zsh/keybindings.zsh b/.config/zsh/keybindings.zsh
new file mode 100644
index 0000000..a436eb3
--- /dev/null
+++ b/.config/zsh/keybindings.zsh
@@ -0,0 +1 @@
+bindkey "รง" fzf-cd-widget