Commit ac7a591e6eb55db845ca81e1ac1fa0ee2d17556c Parent: b28bab83882adbba11441a443d284d28d4af18db Author: Matt Colligan <matthewcolligan@improbable.io> Date: 2024-07-05 15:38:17 +0100 Committer: Matt Colligan <matthewcolligan@improbable.io> Committed: 2024-07-05 15:38:17 +0100 update theme with nvim
start/self/plugin/theme.vim Modified
@@ -2,63 +2,63 @@ " Ricing " "------------------------------------------------------------------" -" statusline -set laststatus=2 " always show status bar -set statusline = -if $USER == 'root' - let hostname = hostname() - exec 'set statusline +=%7*\ ' . $USER . '@' . hostname . '\ %*' -endif -if ! empty($TMUX) - set statusline +=%6*%* -endif +"" statusline +"set laststatus=2 " always show status bar +"set statusline = +"if $USER == 'root' +" let hostname = hostname() +" exec 'set statusline +=%7*\ ' . $USER . '@' . hostname . '\ %*' +"endif +"if ! empty($TMUX) +" set statusline +=%6*%* +"endif -set statusline +=%1*\ \ %<%F\ \ %* " full path -set statusline +=%2*\ \ %y%* " file type -set statusline +=%2*\ %m\ %* " modified flag -set statusline +=%3*%{noscrollbar#statusline(12,'\ ','-')} -set statusline +=%4*%=%* " centre padding -set statusline +=%5*\ \ %l\ /\ %L\ \ %* " current / total lines -set statusline +=%1*\ %n\ %* " buffer number +"set statusline +=%1*\ \ %<%F\ \ %* " full path +"set statusline +=%2*\ \ %y%* " file type +"set statusline +=%2*\ %m\ %* " modified flag +"set statusline +=%3*%{noscrollbar#statusline(12,'\ ','-')} +"set statusline +=%4*%=%* " centre padding +"set statusline +=%5*\ \ %l\ /\ %L\ \ %* " current / total lines +"set statusline +=%1*\ %n\ %* " buffer number -hi User1 ctermfg=0 ctermbg=5 cterm=none -hi User2 ctermfg=0 ctermbg=4 cterm=none -hi User3 ctermfg=0 ctermbg=14 cterm=none -hi User4 ctermfg=0 ctermbg=2 cterm=none -hi User5 ctermfg=0 ctermbg=3 cterm=none -hi User6 ctermfg=3 ctermbg=5 cterm=none -hi User7 ctermfg=0 ctermbg=9 cterm=none +"hi User1 ctermfg=0 ctermbg=5 cterm=none +"hi User2 ctermfg=0 ctermbg=4 cterm=none +"hi User3 ctermfg=0 ctermbg=14 cterm=none +"hi User4 ctermfg=0 ctermbg=2 cterm=none +"hi User5 ctermfg=0 ctermbg=3 cterm=none +"hi User6 ctermfg=3 ctermbg=5 cterm=none +"hi User7 ctermfg=0 ctermbg=9 cterm=none -" tab bar -hi TabLineFill ctermfg=0 ctermbg=1 -hi TabLine ctermfg=0 ctermbg=13 -hi TabLineSel ctermfg=0 ctermbg=12 -hi Title ctermfg=0 ctermbg=12 +"" tab bar +"hi TabLineFill ctermfg=0 ctermbg=1 +"hi TabLine ctermfg=0 ctermbg=13 +"hi TabLineSel ctermfg=0 ctermbg=12 +"hi Title ctermfg=0 ctermbg=12 -" vimdiff " commented out as it was disrupting git gutter -"hi DiffAdd cterm=none ctermfg=0 ctermbg=2 -"hi DiffChange cterm=none ctermfg=0 ctermbg=4 -"hi DiffText cterm=none ctermfg=0 ctermbg=6 -"hi DiffDelete cterm=bold ctermfg=0 ctermbg=1 +"" vimdiff " commented out as it was disrupting git gutter +""hi DiffAdd cterm=none ctermfg=0 ctermbg=2 +""hi DiffChange cterm=none ctermfg=0 ctermbg=4 +""hi DiffText cterm=none ctermfg=0 ctermbg=6 +""hi DiffDelete cterm=bold ctermfg=0 ctermbg=1 -" folds -hi Folded ctermbg=8 ctermfg=4 cterm=none +"" folds +"hi Folded ctermbg=8 ctermfg=4 cterm=none -" visual mode highlighting -hi Visual ctermbg=7 ctermfg=0 +"" visual mode highlighting +"hi Visual ctermbg=7 ctermfg=0 -" title highlighting needs changing so that text doesn't go invisible due to cursor line -hi Title ctermfg=3 ctermbg=0 +"" title highlighting needs changing so that text doesn't go invisible due to cursor line +"hi Title ctermfg=3 ctermbg=0 -" matched brackets -hi MatchParen ctermfg=7 cterm=underline ctermbg=0 +"" matched brackets +"hi MatchParen ctermfg=7 cterm=underline ctermbg=0 -" github copilot -hi CopilotSuggestion ctermfg=4 +"" github copilot +"hi CopilotSuggestion ctermfg=4 " line numbers set number relativenumber -hi LineNr ctermfg=5 +"hi LineNr ctermfg=5 " highlight cursor line highlight CursorLine ctermbg=8 cterm=bold @@ -68,14 +68,17 @@ au WinLeave * setlocal nocursorline augroup END -" change cursor shape in insert mode -let &t_SI = "\e[4 q" "underscore -let &t_EI = "\e[2 q" "block -augroup myCmds - au! - autocmd VimEnter * silent !echo -ne "\e[2 q" -augroup END +"" change cursor shape in insert mode +"let &t_SI = "\e[4 q" "underscore +"let &t_EI = "\e[2 q" "block +"augroup myCmds +" au! +" autocmd VimEnter * silent !echo -ne "\e[2 q" +"augroup END + +"" character for split barrier +"set fillchars=vert:\ +"hi VertSplit cterm=bold term=bold ctermbg=12 -" character for split barrier -set fillchars=vert:\ -hi VertSplit cterm=bold term=bold ctermbg=12 +" neovim stuff +colorscheme catppuccin-macchiato
start/self/plugin/init.lua Modified
@@ -1,2 +1,7 @@ +# neovim lua config require("supermaven-nvim").setup({}) + +require('lualine').setup({ + options = { section_separators = '', component_separators = '' } +})
start/lualine.nvim Added
@@ -0,0 +1 @@
+Subproject commit 0a5a66803c7407767b799067986b4dc3036e1983
start/catppuccin Added
@@ -0,0 +1 @@
+Subproject commit 31fcfb02c47952d5c75aec893b93b2878abe5fbb
.gitmodules Modified
@@ -25,3 +25,9 @@ [submodule "start/supermaven-nvim"] path = start/supermaven-nvim url = https://github.com/supermaven-inc/supermaven-nvim +[submodule "start/catppuccin"] + path = start/catppuccin + url = https://github.com/catppuccin/nvim +[submodule "start/lualine.nvim"] + path = start/lualine.nvim + url = https://github.com/nvim-lualine/lualine.nvim