Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dotfiles
vim
Commits
021716b8
Commit
021716b8
authored
4 years ago
by
Henrik Tjäder
Browse files
Options
Downloads
Patches
Plain Diff
Fix rg and diff colors
parent
fba8acbc
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.vim/coc-settings.json
+0
-1
0 additions, 1 deletion
.vim/coc-settings.json
.vim/spell/sv.utf-8.add
+7
-0
7 additions, 0 deletions
.vim/spell/sv.utf-8.add
.vimrc
+35
-2
35 additions, 2 deletions
.vimrc
with
42 additions
and
3 deletions
.vim/coc-settings.json
+
0
−
1
View file @
021716b8
{
{
"rust-analyzer.cargo.features"
:
[
"klee-replay"
],
"languageserver"
:
{
"languageserver"
:
{
"clangd"
:
{
"clangd"
:
{
"command"
:
"clangd"
,
"command"
:
"clangd"
,
...
...
This diff is collapsed.
Click to expand it.
.vim/spell/sv.utf-8.add
+
7
−
0
View file @
021716b8
...
@@ -280,3 +280,10 @@ CStr
...
@@ -280,3 +280,10 @@ CStr
Preemptions
Preemptions
preemptions
preemptions
schedulable
schedulable
STM32
WSL
v0
RTIC
STM32F103C8
Bluepill
STM32F103
This diff is collapsed.
Click to expand it.
.vimrc
+
35
−
2
View file @
021716b8
...
@@ -23,6 +23,8 @@ else
...
@@ -23,6 +23,8 @@ else
Plug
'scrooloose/nerdtree'
Plug
'scrooloose/nerdtree'
Plug
'Xuyuanp/nerdtree-git-plugin'
Plug
'Xuyuanp/nerdtree-git-plugin'
" Filetype and other icons
" Filetype and other icons
" Requires a Nerd Font-patched font
" yay nerd-fonts-fira-code
Plug
'ryanoasis/vim-devicons'
Plug
'ryanoasis/vim-devicons'
" Syntax checker
" Syntax checker
Plug
'scrooloose/syntastic'
Plug
'scrooloose/syntastic'
...
@@ -36,6 +38,8 @@ else
...
@@ -36,6 +38,8 @@ else
Plug
'spf13/vim-colors'
Plug
'spf13/vim-colors'
" PaperColor theme
" PaperColor theme
Plug
'NLKNguyen/papercolor-theme'
Plug
'NLKNguyen/papercolor-theme'
" vim-sol theme for diffs
Plug
'kshenoy/vim-sol'
endif
endif
" Ack, similar like grep
" Ack, similar like grep
...
@@ -139,6 +143,9 @@ else
...
@@ -139,6 +143,9 @@ else
" Fugitive, deep git integration
" Fugitive, deep git integration
Plug
'tpope/vim-fugitive'
Plug
'tpope/vim-fugitive'
" Git diff and staging
Plug
'jreybert/vimagit'
" Git-gutter, shows git diffs in the gutter
" Git-gutter, shows git diffs in the gutter
Plug
'airblade/vim-gitgutter'
Plug
'airblade/vim-gitgutter'
...
@@ -258,6 +265,10 @@ let g:PaperColor_Theme_Options = {
...
@@ -258,6 +265,10 @@ let g:PaperColor_Theme_Options = {
"colorscheme molokai
"colorscheme molokai
"colorscheme wikipedia
"colorscheme wikipedia
colorscheme
PaperColor
colorscheme
PaperColor
if
&
diff
colorscheme
sol
endif
" Molokai attempt to use 256-color
" Molokai attempt to use 256-color
let
g:rehash256
=
1
let
g:rehash256
=
1
...
@@ -401,7 +412,7 @@ set nospell
...
@@ -401,7 +412,7 @@ set nospell
set
spelllang
=
sv
,
en
set
spelllang
=
sv
,
en
" Set default encoding, specifically for youcompleteme
" Set default encoding, specifically for youcompleteme
set
encoding
=
utf
-8
set
encoding
=
UTF
-8
" Make F3 retur the number of printed words in latex
" Make F3 retur the number of printed words in latex
map
<
F3
>
:
w
!
detex \
|
wc
-
w
<
CR
>
map
<
F3
>
:
w
!
detex \
|
wc
-
w
<
CR
>
...
@@ -742,6 +753,7 @@ let g:coc_global_extensions = [
...
@@ -742,6 +753,7 @@ let g:coc_global_extensions = [
" requires xdotool
" requires xdotool
let
g:vimtex_view_method
=
'zathura'
let
g:vimtex_view_method
=
'zathura'
let
g:vimtex_compiler_method
=
'latexmk'
let
g:vimtex_compiler_method
=
'latexmk'
let
g:tex_flavor
=
'latex'
let
g:vimtex_compiler_latexmk
=
{
let
g:vimtex_compiler_latexmk
=
{
\
'backend'
:
'jobs'
,
\
'backend'
:
'jobs'
,
\
'build_dir'
:
'build'
,
\
'build_dir'
:
'build'
,
...
@@ -857,13 +869,34 @@ map <C-g> <Esc><Esc>:BCommits!<CR>
...
@@ -857,13 +869,34 @@ map <C-g> <Esc><Esc>:BCommits!<CR>
"<C-x> new split
"<C-x> new split
"<C-v> new vertical split
"<C-v> new vertical split
" Customize fzf colors to match your color scheme
let
g:skim_colors
=
\
{
'fg'
:
[
'fg'
,
'Normal'
],
\
'bg'
:
[
'bg'
,
'Normal'
],
\
'hl'
:
[
'fg'
,
'Comment'
],
\
'fg+'
:
[
'fg'
,
'CursorLine'
,
'CursorColumn'
,
'Normal'
],
\
'bg+'
:
[
'bg'
,
'CursorLine'
,
'CursorColumn'
],
\
'hl+'
:
[
'fg'
,
'Statement'
],
\
'info'
:
[
'fg'
,
'PreProc'
],
\
'border'
:
[
'fg'
,
'Ignore'
],
\
'prompt'
:
[
'fg'
,
'Conditional'
],
\
'pointer'
:
[
'fg'
,
'Exception'
],
\
'marker'
:
[
'fg'
,
'Keyword'
],
\
'spinner'
:
[
'fg'
,
'Label'
],
\
'header'
:
[
'fg'
,
'Comment'
]
}
" Enable Ag and Rg for skim plugin
" Enable Ag and Rg for skim plugin
command
!
-
bang
-
nargs
=
* Ag
call
fzf#
vim
#ag_interactive
(<
q
-
args
>,
fzf#
vim
#with_preview
(
'right:50%:hidden'
,
'alt-h'
))
command
!
-
bang
-
nargs
=
* Ag
call
fzf#
vim
#ag_interactive
(<
q
-
args
>,
fzf#
vim
#with_preview
(
'right:50%:hidden'
,
'alt-h'
))
"command! -bang -nargs=* Rg call fzf#vim#rg_interactive(<q-args>, fzf#vim#with_preview('right:50%:hidden', 'alt-h'))
"command! -bang -nargs=* Rg call fzf#vim#rg_interactive(<q-args>, fzf#vim#with_preview('right:50%:hidden', 'alt-h'))
"command! -bang -nargs=* Rg call fzf#vim#rg_interactive(<q-args>, fzf#vim#with_preview())
"command! -bang -nargs=* Rg call fzf#vim#rg_interactive(<q-args>, fzf#vim#with_preview())
command
!
-
bang
-
nargs
=
* RG
\
call
fzf#
vim
#
grep
(
\
"rg -g!target --column --line-number --no-heading --color=always --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold' --smart-case -- "
.
shellescape
(<
q
-
args
>),
1
,
\
fzf#
vim
#with_preview
(),
<
bang
>
0
)
command
!
-
bang
-
nargs
=
* Rg
command
!
-
bang
-
nargs
=
* Rg
\
call
fzf#
vim
#
grep
(
\
call
fzf#
vim
#
grep
(
\
'rg --column --line-number --no-heading
--color=always
--smart-case -- '
.
shellescape
(<
q
-
args
>),
1
,
\
'rg
-g!target -g!book -g!docs
--column --line-number --no-heading --smart-case -- '
.
shellescape
(<
q
-
args
>),
1
,
\
fzf#
vim
#with_preview
(),
<
bang
>
0
)
\
fzf#
vim
#with_preview
(),
<
bang
>
0
)
" Mapping selecting mappings
" Mapping selecting mappings
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment