From 35064929f68d5ef8d459ad6d8e5f1f066fbff9fd Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Sun, 20 Jun 2021 14:02:10 +0200 Subject: [PATCH] updates --- fish/functions/fish_user_key_bindings.fish | 2 ++ hjalmar-droneship/onedrive/config | 2 +- hjalmar-mothership/i3/config | 1 + nvim/init.vim | 23 +++++++++++----------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/fish/functions/fish_user_key_bindings.fish b/fish/functions/fish_user_key_bindings.fish index ea11cfc..6b485d5 100644 --- a/fish/functions/fish_user_key_bindings.fish +++ b/fish/functions/fish_user_key_bindings.fish @@ -11,3 +11,5 @@ end function ll --description 'List contents of directory using long format' ls -lha $argv end + +fzf_key_bindings diff --git a/hjalmar-droneship/onedrive/config b/hjalmar-droneship/onedrive/config index 389aad6..11e7686 100644 --- a/hjalmar-droneship/onedrive/config +++ b/hjalmar-droneship/onedrive/config @@ -5,7 +5,7 @@ # When changing a config option below, remove the '#' from the start of the line # For explanations of all config options below see docs/USAGE.md or the man page. # -sync_dir="/mnt/OneDrive" +sync_dir="~/OneDrive" skip_dir="Bilder/Camera Roll|Backup|Datasets|Pictures|Videos" skip_file=".~*|~*|*.tmp" # monitor_interval = "45" diff --git a/hjalmar-mothership/i3/config b/hjalmar-mothership/i3/config index b4f3b70..e4877cd 100644 --- a/hjalmar-mothership/i3/config +++ b/hjalmar-mothership/i3/config @@ -57,6 +57,7 @@ bindsym $mod+w layout stacking bindsym $mod+t layout tabbed bindsym $mod+e layout toggle split bindsym $mod+a focus parent +bindsym $mod+Shift+a focus child bindsym $mod+r reload bindsym $mod+Shift+r restart diff --git a/nvim/init.vim b/nvim/init.vim index 2674f90..b083d74 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -66,10 +66,14 @@ call plug#end() if !&termguicolors set termguicolors endif +if &term =~ '256color' + set t_ut= +endif if !exists('g:colors_name') - " let g:seoul256_background=233 - " silent! colorscheme seoul256 - silent! colorscheme seoul256-light + let g:seoul256_background=236 + silent! colorscheme seoul256 + " silent! colorscheme seoul256-light + " silent! colorscheme base16-material-lighter " silent! colorscheme base16-monokai " silent! colorscheme base16-tomorrow-night " seoul256 theme config: dark 233-239, light 252-256 @@ -120,8 +124,8 @@ set undolevels=500 " Maximum number of changes that can be undone set undoreload=5000 " Maximum number lines to save for undo on a buffer reload " search -set ignorecase " Case insensitive search -set smartcase " ... but case sensitive when uc present +" set ignorecase " Case insensitive search +" set smartcase " ... but case sensitive when uc present " cursor set scrolljump=1 " Line to scroll when cursor leaves screen @@ -402,12 +406,7 @@ let g:mkdp_preview_options={ " ***************************** " BULLETS let g:bullets_outline_levels = ['ROM', 'ABC', 'num', 'abc', 'rom', 'std-', 'std*'] -let g:bullets_enabled_file_types = [ - \ 'markdown', - \ 'text', - \ 'gitcommit', - \ 'scratch' - \] +let g:bullets_enabled_file_types = ['markdown', 'text', 'gitcommit'] " ***************************** " autocmd @@ -422,7 +421,7 @@ augroup myAu " A unique name for the group. DO NOT use the same name twice! autocmd FileType markdown,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Disables automatic commenting on newline autocmd BufEnter * if &filetype == "" | setlocal ft=none | endif " default new file is none - autocmd FileType * RainbowParentheses + " autocmd FileType * RainbowParentheses autocmd BufWritePre * %s/\s\+$//e " Automatically deletes all trailing whitespace on save. autocmd BufReadPost quickfix nmap " quickfix autocmd CompleteDone * if pumvisible() == 0 | pclose | endif " bugfix