summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authoraktersnurra <gustaf.rydholm@gmail.com>2021-02-24 20:32:07 +0100
committeraktersnurra <gustaf.rydholm@gmail.com>2021-02-24 20:32:07 +0100
commit9f04894dfc7871282a07d8471887935edc3ccd94 (patch)
tree6f98aca473242ad8d0364d610d84e9fd8da2ad2f /.config
parent5476b0486125087c74fcdb0457d58ee5dc0e954e (diff)
fixed tmux again..
Diffstat (limited to '.config')
-rw-r--r--.config/nvim/init.vim9
-rw-r--r--.config/nvim/themes/nord.vim5
-rw-r--r--.config/tmux/.tmux.conf6
3 files changed, 8 insertions, 12 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 14edfd1..c7d5662 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -5,14 +5,14 @@
"/___/_/ /_/_/\__(_)___/_/_/ /_/ /_/
-"Has to be called first.
+" Has to be called first.
source $HOME/.config/nvim/plug-config/polyglot.vim
-"General Neovim settings.
+" General Neovim settings.
source $HOME/.config/nvim/vim-plug/plugins.vim
source $HOME/.config/nvim/general/settings.vim
-"Keybindings.
+" Keybindings.
source $HOME/.config/nvim/keys/mappings.vim
source $HOME/.config/nvim/keys/which-key.vim
@@ -21,7 +21,6 @@ source $HOME/.config/nvim/plug-config/barbar.vim
source $HOME/.config/nvim/plug-config/coc.vim
source $HOME/.config/nvim/plug-config/far.vim
source $HOME/.config/nvim/plug-config/floaterm.vim
-"source $HOME/.config/nvim/plug-config/fzf.vim
source $HOME/.config/nvim/plug-config/goyo.vim
source $HOME/.config/nvim/plug-config/highlightedyank.vim
source $HOME/.config/nvim/plug-config/quickscope.vim
@@ -34,9 +33,7 @@ source $HOME/.config/nvim/plug-config/telescope.vim
luafile $HOME/.config/nvim/lua/statusline.lua
source $HOME/.config/nvim/plug-config/vim-bbye.vim
source $HOME/.config/nvim/plug-config/vim-commentary.vim
-"source $HOME/.config/nvim/plug-config/vim-rooter.vim
" Theme
source $HOME/.config/nvim/themes/nord.vim
-" source $HOME/.config/nvim/themes/spaceway.vim
diff --git a/.config/nvim/themes/nord.vim b/.config/nvim/themes/nord.vim
index 47c38ec..dc301c8 100644
--- a/.config/nvim/themes/nord.vim
+++ b/.config/nvim/themes/nord.vim
@@ -2,9 +2,6 @@
autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE
-let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
-let &t_8b = "\<Esc>[48:2:%lu:%lu:%lum"
-
hi Comment cterm=italic
syntax on
@@ -12,6 +9,8 @@ colorscheme nord
" checks if your terminal has 24-bit color support
if (has("termguicolors"))
+ let &t_8f="\<Esc>[38;2;%lu;%lu;%lum"
+ let &t_8b="\<Esc>[48;2;%lu;%lu;%lum"
set termguicolors
hi LineNr ctermbg=NONE guibg=NONE
endif
diff --git a/.config/tmux/.tmux.conf b/.config/tmux/.tmux.conf
index 435420b..f323387 100644
--- a/.config/tmux/.tmux.conf
+++ b/.config/tmux/.tmux.conf
@@ -3,8 +3,8 @@ set -g @plugin 'tmux-plugins/tpm'
set -g @plugin "arcticicestudio/nord-tmux"
# Allows vim to display colors correctly.
-set -g default-terminal "tmux-256color"
-set -ag terminal-overrides ",alacritty:RGB"
+set -g default-terminal 'screen-256color'
+set -ga terminal-overrides ',*256col*:Tc'
set -g status-position top # statusbar position
set -g status-interval 1
@@ -60,7 +60,7 @@ set -g @prefix_highlight_copy_mode_attr "fg=black,bg=brightcyan"
#+--------+
#+--- Bars ---+
set -g status-left "#[fg=black,bg=blue,bold] #S "
-set -g status-right "#{prefix_highlight}#[fg=white,bg=black] %a %d %b %H:%M:%S #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${NORD_TMUX_STATUS_TIME_FORMAT}#[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack, bold] #(whoami)@#(hostname -s) "
+set -g status-right "#{prefix_highlight}#[fg=white,bg=black] %a %d %b %H:%M:%S #[fg=white,bg=black,nobold,noitalics,nounderscore]${NORD_TMUX_STATUS_TIME_FORMAT}#[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack, bold] #(whoami)@#(hostname -s) "
#+--- Windows ---+
set -g window-status-format "#[fg=white,bg=black] #I #[fg=white,bg=black]#W #F "