From 1ad10fb4dfafcd7dd189a25ca69f6961985484d2 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Wed, 10 Mar 2021 21:13:58 +0100 Subject: Updates to color scheme, fzf sourcing, vim pydocstring --- .config/alacritty/alacritty.yml | 70 ++++++-------- .config/nvim/general/settings.vim | 2 +- .config/nvim/init.vim | 3 +- .config/nvim/lua/statusline.lua | 136 ++++++++++++--------------- .config/nvim/plug-config/vim-pydocstring.vim | 1 + .config/nvim/themes/base16.vim | 17 ++++ .config/nvim/themes/nord.vim | 1 + .config/nvim/vim-plug/plugins.vim | 7 +- .config/rofi/config.rasi | 8 +- .config/tmux/.tmux.conf | 5 +- .config/zsh/fzf.zsh | 2 + 11 files changed, 120 insertions(+), 132 deletions(-) create mode 100644 .config/nvim/plug-config/vim-pydocstring.vim create mode 100644 .config/nvim/themes/base16.vim create mode 100644 .config/zsh/fzf.zsh (limited to '.config') diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index b1400ea..3d1f644 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -3,53 +3,37 @@ # alt_send_esc: false colors: + # Default colors primary: - background: '#07090b' - foreground: '#d8dee9' - dim_foreground: '#a5abb6' + background: '#0A0A0A' + foreground: '#d8d8d8' + + # Colors the cursor will use if `custom_cursor_colors` is true cursor: - text: '#2e3440' - cursor: '#d8dee9' - vi_mode_cursor: - text: '#2e3440' - cursor: '#d8dee9' - selection: - text: CellForeground - background: '#4c566a' - search: - matches: - foreground: CellBackground - background: '#88c0d0' - bar: - background: '#434c5e' - foreground: '#d8dee9' + text: '#181818' + cursor: '#d8d8d8' + + # Normal colors normal: - black: '#3b4252' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#88c0d0' - white: '#e5e9f0' + black: '#181818' + red: '#ab4642' + green: '#a1b56c' + yellow: '#f7ca88' + blue: '#7cafc2' + magenta: '#ba8baf' + cyan: '#86c1b9' + white: '#d8d8d8' + + # Bright colors bright: - black: '#4c566a' - red: '#bf616a' - green: '#a3be8c' - yellow: '#ebcb8b' - blue: '#81a1c1' - magenta: '#b48ead' - cyan: '#8fbcbb' - white: '#eceff4' - dim: - black: '#373e4d' - red: '#94545d' - green: '#809575' - yellow: '#b29e75' - blue: '#68809a' - magenta: '#8c738c' - cyan: '#6d96a5' - white: '#aeb3bb' + black: '#585858' + red: '#ab4642' + green: '#a1b56c' + yellow: '#f7ca88' + blue: '#7cafc2' + magenta: '#ba8baf' + cyan: '#86c1b9' + white: '#f8f8f8' background_opacity: 1.0 diff --git a/.config/nvim/general/settings.vim b/.config/nvim/general/settings.vim index b348267..1f0b858 100644 --- a/.config/nvim/general/settings.vim +++ b/.config/nvim/general/settings.vim @@ -33,7 +33,7 @@ set updatetime=300 " Faster completion set timeoutlen=500 " By default timeoutlen is 1000 ms set formatoptions-=cro " Stop newline continution of comments set clipboard=unnamedplus " Copy paste between vim and everything else -"set autochdir " Your working directory will always be the same as your working directory +set autochdir " Your working directory will always be the same as your working directory au! BufWritePost $MYVIMRC source % " auto source when writing to init.vm alternatively you can run :source $MYVIMRC diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index ed7a0b6..f81df36 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -34,8 +34,9 @@ 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-pydocstring.vim +source $HOME/.config/nvim/plug-config/vim-rooter.vim source $HOME/.config/nvim/plug-config/vimwiki.vim " Theme -source $HOME/.config/nvim/themes/githubsy.vim +source $HOME/.config/nvim/themes/base16.vim " source $HOME/.config/nvim/themes/nord.vim diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua index 5e88ec0..a745a8e 100644 --- a/.config/nvim/lua/statusline.lua +++ b/.config/nvim/lua/statusline.lua @@ -4,38 +4,22 @@ local gl = require("galaxyline") local section = gl.section gl.short_line_list = {"LuaTree", "packager", "Floaterm", "coc-eplorer"} -local one_dark_colors = { - bg = "#2e3440", - fg = "#81a1c1", - line_bg = "#2e3440", - fg_green = "#6d96a5", - yellow = "#fabd2f", - cyan = "#008080", - darkblue = "#081633", - green = "#608B4E", - orange = "#FF8800", - purple = "#5d4d7a", - magenta = "#d16d9e", - grey = "#c0c0c0", - blue = "#569CD6", - red = "#D16969" -} -local nord_colors = { - bg = "#2E3440", - fg = "#81A1C1", - line_bg = "#2E3440", - fg_green = "#8FBCBB", - yellow = "#EBCB8B", - cyan = "#A3BE8C", - darkblue = "#81A1C1", - green = "#8FBCBB", +local colors = { + bg = "#0A0A0A", + fg = "#d0d0d0", + line_bg = "#0A0A0A", + fg_green = "#90a959", + yellow = "#f4bf75", + cyan = "#75b5aa", + darkblue = "#6a9fb5", + green = "#90a959", orange = "#D08770", purple = "#B48EAD", - magenta = "#BF616A", - gray = "#616E88", - blue = "#5E81AC", - red = "#BF616A" + magenta = "#aa759f", + gray = "#505050", + blue = "#6a9fb5", + red = "#ac4142" } local buffer_not_empty = function() @@ -51,7 +35,7 @@ section.left[1] = { provider = function() return " " end, - highlight = {nord_colors.blue, nord_colors.line_bg} + highlight = {colors.blue, colors.line_bg} } } section.left[2] = { @@ -59,38 +43,38 @@ section.left[2] = { provider = function() -- auto change color according the vim mode local mode_color = { - n = nord_colors.magenta, - i = nord_colors.green, - v = nord_colors.blue, - [""] = nord_colors.blue, - V = nord_colors.blue, - c = nord_colors.red, - no = nord_colors.magenta, - s = nord_colors.orange, - S = nord_colors.orange, - [""] = nord_colors.orange, - ic = nord_colors.yellow, - R = nord_colors.purple, - Rv = nord_colors.purple, - cv = nord_colors.red, - ce = nord_colors.red, - r = nord_colors.cyan, - rm = nord_colors.cyan, - ["r?"] = nord_colors.cyan, - ["!"] = nord_colors.red, - t = nord_colors.red + n = colors.magenta, + i = colors.green, + v = colors.blue, + [""] = colors.blue, + V = colors.blue, + c = colors.red, + no = colors.magenta, + s = colors.orange, + S = colors.orange, + [""] = colors.orange, + ic = colors.yellow, + R = colors.purple, + Rv = colors.purple, + cv = colors.red, + ce = colors.red, + r = colors.cyan, + rm = colors.cyan, + ["r?"] = colors.cyan, + ["!"] = colors.red, + t = colors.red } cmd("hi GalaxyViMode guifg=" .. mode_color[fn.mode()]) return "  " end, - highlight = {nord_colors.red, nord_colors.line_bg, "bold"} + highlight = {colors.red, colors.line_bg, "bold"} } } section.left[3] = { FileIcon = { provider = "FileIcon", condition = buffer_not_empty, - highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, nord_colors.line_bg} + highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg} } } section.left[4] = { @@ -101,8 +85,8 @@ section.left[4] = { end, condition = buffer_not_empty, separator = " ", - separator_highlight = {nord_colors.purple, nord_colors.bg}, - highlight = {nord_colors.purple, nord_colors.line_bg, "bold"} + separator_highlight = {colors.purple, colors.bg}, + highlight = {colors.purple, colors.line_bg, "bold"} } } @@ -112,7 +96,7 @@ section.right[1] = { return " " end, condition = require("galaxyline.provider_vcs").check_git_workspace, - highlight = {nord_colors.orange, nord_colors.line_bg} + highlight = {colors.orange, colors.line_bg} } } section.right[2] = { @@ -120,8 +104,8 @@ section.right[2] = { provider = "GitBranch", condition = require("galaxyline.provider_vcs").check_git_workspace, separator = "", - separator_highlight = {nord_colors.purple, nord_colors.bg}, - highlight = {nord_colors.orange, nord_colors.line_bg, "bold"} + separator_highlight = {colors.purple, colors.bg}, + highlight = {colors.orange, colors.line_bg, "bold"} } } @@ -138,7 +122,7 @@ section.right[3] = { provider = "DiffAdd", condition = checkwidth, icon = " ", - highlight = {nord_colors.green, nord_colors.line_bg} + highlight = {colors.green, colors.line_bg} } } section.right[4] = { @@ -146,7 +130,7 @@ section.right[4] = { provider = "DiffModified", condition = checkwidth, icon = "柳", - highlight = {nord_colors.yellow, nord_colors.line_bg} + highlight = {colors.yellow, colors.line_bg} } } section.right[5] = { @@ -154,7 +138,7 @@ section.right[5] = { provider = "DiffRemove", condition = checkwidth, icon = " ", - highlight = {nord_colors.red, nord_colors.line_bg} + highlight = {colors.red, colors.line_bg} } } @@ -162,8 +146,8 @@ section.right[6] = { LineInfo = { provider = "LineColumn", separator = "", - separator_highlight = {nord_colors.blue, nord_colors.line_bg}, - highlight = {nord_colors.gray, nord_colors.line_bg} + separator_highlight = {colors.blue, colors.line_bg}, + highlight = {colors.gray, colors.line_bg} } } -- section.right[7] = { @@ -171,8 +155,8 @@ section.right[6] = { -- provider = "FileSize", -- separator = " ", -- condition = buffer_not_empty, --- separator_highlight = {nord_colors.blue, nord_colors.line_bg}, --- highlight = {nord_colors.fg, nord_colors.line_bg} +-- separator_highlight = {colors.blue, colors.line_bg}, +-- highlight = {colors.fg, colors.line_bg} -- } -- } @@ -181,8 +165,8 @@ section.right[8] = { provider = "DiagnosticError", separator = " ", icon = " ", - highlight = {nord_colors.red, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.red, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } section.right[9] = { @@ -190,8 +174,8 @@ section.right[9] = { provider = "DiagnosticWarn", -- separator = " ", icon = " ", - highlight = {nord_colors.yellow, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.yellow, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -200,8 +184,8 @@ section.right[10] = { -- separator = " ", provider = "DiagnosticInfo", icon = " ", - highlight = {nord_colors.green, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.green, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -210,8 +194,8 @@ section.right[11] = { provider = "DiagnosticHint", -- separator = " ", icon = " ", - highlight = {nord_colors.blue, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.blue, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -219,8 +203,8 @@ section.short_line_left[1] = { BufferType = { provider = 'FileTypeName', separator = ' ', - separator_highlight = {'NONE',nord_colors.bg}, - highlight = {nord_colors.blue,nord_colors.bg,'bold'} + separator_highlight = {'NONE',colors.bg}, + highlight = {colors.blue,colors.bg,'bold'} } } @@ -237,13 +221,13 @@ section.short_line_left[2] = { return fname end, condition = buffer_not_empty, - highlight = {nord_colors.white,nord_colors.bg,'bold'} + highlight = {colors.white,colors.bg,'bold'} } } section.short_line_right[1] = { BufferIcon = { provider= 'BufferIcon', - highlight = {nord_colors.fg,nord_colors.bg} + highlight = {colors.fg,colors.bg} } } diff --git a/.config/nvim/plug-config/vim-pydocstring.vim b/.config/nvim/plug-config/vim-pydocstring.vim new file mode 100644 index 0000000..e3d5311 --- /dev/null +++ b/.config/nvim/plug-config/vim-pydocstring.vim @@ -0,0 +1 @@ +let g:pydocstring_formatter = 'google' diff --git a/.config/nvim/themes/base16.vim b/.config/nvim/themes/base16.vim new file mode 100644 index 0000000..d9d3971 --- /dev/null +++ b/.config/nvim/themes/base16.vim @@ -0,0 +1,17 @@ +" Prevents the colorscheme from loading a custom bg color. +autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE + +hi Comment cterm=italic + +syntax on +colorscheme base16-default-dark + +" checks if your terminal has 24-bit color support +if (has("termguicolors")) + let base16colorspace=256 " Access colors present in 256 colorspace + let &t_8f="\[38;2;%lu;%lu;%lum" + let &t_8b="\[48;2;%lu;%lu;%lum" + set termguicolors + hi LineNr ctermbg=NONE guibg=NONE + hi SignColumn ctermbg=NONE guibg=NONE +endif diff --git a/.config/nvim/themes/nord.vim b/.config/nvim/themes/nord.vim index dc301c8..a9c980f 100644 --- a/.config/nvim/themes/nord.vim +++ b/.config/nvim/themes/nord.vim @@ -13,4 +13,5 @@ if (has("termguicolors")) let &t_8b="\[48;2;%lu;%lu;%lum" set termguicolors hi LineNr ctermbg=NONE guibg=NONE + hi SignColumn ctermbg=NONE guibg=NONE endif diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim index 6a05ad7..0a75669 100644 --- a/.config/nvim/vim-plug/plugins.vim +++ b/.config/nvim/vim-plug/plugins.vim @@ -32,19 +32,16 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'gavinok/spaceway.vim' Plug 'rakr/vim-two-firewatch' Plug 'chriskempson/base16-vim' + Plug 'sff1019/hogwarts.vim' " Color hex codes Plug 'ap/vim-css-color' - " FZF - "Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } - "Plug 'junegunn/fzf.vim' - " Skim fuzzy finder Plug 'lotabout/skim', { 'dir': '~/.skim', 'do': './install' } " Rooter changes the working directory to the project root when you open a file or directory. - "Plug 'airblade/vim-rooter' + Plug 'airblade/vim-rooter' " Telescope a fuzzy finder Plug 'nvim-lua/popup.nvim' diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index be88f37..a5f5c94 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -161,17 +161,17 @@ configuration { //---------------------- * { - nord0: #2E3440; + nord0: #0A0A0A; nord1: #3B4252; nord2: #434C5E; - nord3: #4C566A; - nord4: #D8DEE9; + nord3: #585858; + nord4: #d8d8d8; nord5: #E5E9F0; nord6: #ECEFF4; nord7: #8FBCBB; nord8: #88C0D0; nord9: #81A1C1; - nord10: #5E81AC; + nord10: #181818; nord11: #BF616A; nord12: #D08770; nord13: #EBCB8B; diff --git a/.config/tmux/.tmux.conf b/.config/tmux/.tmux.conf index b9ee7b5..1eb463e 100644 --- a/.config/tmux/.tmux.conf +++ b/.config/tmux/.tmux.conf @@ -1,5 +1,6 @@ # show session, window, pane in left status bar set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin "arcticicestudio/nord-tmux" # Allows vim to display colors correctly. @@ -89,8 +90,8 @@ setw -g mouse on #setw -g alternate-screen on # split panes using | and - -bind v split-window -h -bind h split-window -v +bind | split-window -h +bind - split-window -v unbind '"' unbind % diff --git a/.config/zsh/fzf.zsh b/.config/zsh/fzf.zsh new file mode 100644 index 0000000..b88c5ab --- /dev/null +++ b/.config/zsh/fzf.zsh @@ -0,0 +1,2 @@ +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh -- cgit v1.2.3-70-g09d2