misc update
This commit is contained in:
parent
beff711346
commit
d6e546958e
10 changed files with 57 additions and 14 deletions
22
bin/.local/bin/doc
Normal file
22
bin/.local/bin/doc
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
#!/usr/bin/env fish
|
||||
|
||||
usage() {
|
||||
|
||||
|
||||
switch $argv[1]
|
||||
case new
|
||||
echo "ERROR: Not Implemented"
|
||||
case new-letter
|
||||
echo "ERROR: Not Implemented"
|
||||
case build
|
||||
echo "ERROR: Not Implemented"
|
||||
case '*'
|
||||
usage
|
||||
end
|
||||
|
||||
# doc new-letter file.md
|
||||
# doc new file.md
|
||||
# doc build file.md
|
||||
|
||||
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl
|
|||
SETUVAR fish_color_status:red
|
||||
SETUVAR fish_color_user:brgreen
|
||||
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
||||
SETUVAR fish_key_bindings:fish_default_key_bindings
|
||||
SETUVAR fish_key_bindings:fish_vi_key_bindings
|
||||
SETUVAR fish_pager_color_completion:\x1d
|
||||
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
|
||||
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
pushmerge = push -o merge_request.merge_when_pipeline_succeeds
|
||||
pushmr = push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds
|
||||
uncommit = reset --soft HEAD^
|
||||
copr = "!f() { git fetch origin pull/$1/head:pr/$1 && git co pr/$1;}; f"
|
||||
comr = "!f() { git fetch origin merge-requests/$1/head:mr/$1 && git co mr/$1;}; f"
|
||||
[url "ssh://git@code.waarp.fr:2222"]
|
||||
insteadOf = https://code.waarp.fr
|
||||
[core]
|
||||
|
|
|
|||
|
|
@ -122,6 +122,9 @@ bindsym Mod4+7 workspace 7
|
|||
bindsym Mod4+8 workspace 8
|
||||
bindsym Mod4+9 workspace 9
|
||||
bindsym Mod4+0 workspace 10
|
||||
bindsym Mod4+Tab workspace next
|
||||
bindsym Mod4+Sift+Tab workspace prev
|
||||
bindsym Mod4+z workspace back_and_forth
|
||||
|
||||
# move focused container to workspace
|
||||
bindsym Mod4+Shift+1 move container to workspace 1
|
||||
|
|
@ -229,7 +232,8 @@ workspace_auto_back_and_forth yes
|
|||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
status_command i3status
|
||||
#status_command i3status
|
||||
status_command statusbar
|
||||
tray_output primary
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
image/*; feh %s
|
||||
video/*; mpv %s
|
||||
application/pdf; zathura %s
|
||||
text/html; w3m -I %{charset} -T text/html; copiousoutput;
|
||||
text/calendar; mutt-ics; copiousoutput
|
||||
application/ics; mutt-ics; copiousoutput
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
set editor=vim
|
||||
set editor=nvim
|
||||
set send_charset="utf-8"
|
||||
set sig_on_top=yes
|
||||
|
||||
|
|
@ -6,12 +6,14 @@ set index_format="%4C %Z %8{%b %d} %-15.15L %y [%E] %s"
|
|||
set sort=threads
|
||||
set sort_aux=last-date-received
|
||||
|
||||
set display_filter="exec sed -r \"s/^Date:\\s*(([F-Wa-u]{3},\\s*)?[[:digit:]]{1,2}\\s+[A-Sa-y]{3}\\s+[[:digit:]]{4}\\s+[[:digit:]]{1,2}:[[:digit:]]{1,2}(:[[:digit:]]{1,2})?\\s+[+-][[:digit:]]{4}).*/date +'Date: %a, %d %b %Y %H:%M:%S %z' -d '\\1'/e\""
|
||||
|
||||
## accounts
|
||||
source $EMAIL_ACCOUNT
|
||||
|
||||
# Misc options
|
||||
set edit_headers=yes
|
||||
set envelope_from # which from?
|
||||
set use_envelope_from # which from?
|
||||
set sig_dashes # dashes before sig
|
||||
set reply_to # reply to Reply to: field
|
||||
set reverse_name=yes # reply as whomever it was to
|
||||
|
|
@ -25,9 +27,9 @@ set menu_scroll # scroll in menus
|
|||
unset wait_key
|
||||
|
||||
## other
|
||||
source mutt-color-solarized.muttrc
|
||||
source muttrc.forgotten-attachment
|
||||
source muttrc.sidebar
|
||||
source ~/.config/mutt/mutt-color-solarized.muttrc
|
||||
source ~/.config/mutt/muttrc.forgotten-attachment
|
||||
source ~/.config/mutt/muttrc.sidebar
|
||||
|
||||
|
||||
## Sidebar customization
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ set abort_noattach = yes
|
|||
# Search for the following regular expression in the body of the email
|
||||
|
||||
# English: attach, attached, attachment, attachments
|
||||
set attach_keyword = "\\<(attach|attached|attachments?)\\>"
|
||||
set abort_noattach_regex = "\\<(attach|attached|attachments?)\\>"
|
||||
|
||||
# Nederlands:
|
||||
# set attach_keyword = "\\<(bijvoegen|bijgevoegd|bijlage|bijlagen)\\>"
|
||||
|
|
@ -25,6 +25,6 @@ set attach_keyword = "\\<(attach|attached|attachments?)\\>"
|
|||
# set attach_keyword = "\\<(anhängen|angehängt|anhang|anhänge|hängt an)\\>"
|
||||
|
||||
# Français:
|
||||
set attach_keyword = "\\<(attaché|attachés|attache|attachons|joint|jointe|joints|jointes|joins|joignons|PJ)\\>"
|
||||
set abort_noattach_regex = "\\<(attaché|attachés|attache|attachons|joint|jointe|joints|jointes|joins|joignons|PJ)\\>"
|
||||
|
||||
# vim: syntax=muttrc
|
||||
|
|
|
|||
|
|
@ -15,5 +15,6 @@
|
|||
"filetypes": ["sh"],
|
||||
"ignoredRootPaths": ["~"]
|
||||
}
|
||||
}
|
||||
},
|
||||
"java.errors.incompleteClasspath.severity": "ignore"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -247,8 +247,10 @@ filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm,*.svg
|
|||
\ gpicview %c,
|
||||
\ {View in shotwell}
|
||||
\ shotwell,
|
||||
fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm
|
||||
fileviewer *.bmp,*.jpg,*.jpeg,*.gif,*.xpm
|
||||
\ convert -identify %f -verbose /dev/null
|
||||
fileviewer *.png
|
||||
\ termview %d/%c
|
||||
|
||||
" OpenRaster
|
||||
filextype *.ora
|
||||
|
|
|
|||
15
vim/.vimrc
15
vim/.vimrc
|
|
@ -45,6 +45,7 @@ set directory=~/.vim/swap//
|
|||
set undodir=~/.vim/undo//
|
||||
set splitright
|
||||
set cursorline
|
||||
set concealcursor=nc
|
||||
|
||||
" flag lines wider than 80 char
|
||||
highlight ColorColumn ctermbg=magenta
|
||||
|
|
@ -66,6 +67,13 @@ if has("autocmd")
|
|||
autocmd FileType md setlocal tw=80 ts=2 sts=2 sw=2 expandtab
|
||||
autocmd FileType vimwiki setlocal tw=80 ts=2 sts=2 sw=2 expandtab
|
||||
autocmd FileType sh setlocal tw=80 ts=2 sts=2 sw=2 expandtab
|
||||
autocmd FileType java setlocal tw=80 ts=2 sts=2 sw=2 expandtab
|
||||
|
||||
autocmd BufNewFile,BufRead neomutt-* set spell spelllang=fr
|
||||
endif
|
||||
|
||||
if executable('rg')
|
||||
set grepprg=rg\ --vimgrep\ --hidden\ --glob\ '!.git'
|
||||
endif
|
||||
|
||||
" Airline options
|
||||
|
|
@ -81,7 +89,8 @@ let g:airline#extensions#tabline#enabled = 1
|
|||
" autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
|
||||
|
||||
" Vim-go options
|
||||
let g:go_fmt_command = "goimports"
|
||||
"let g:go_fmt_command = "goimports"
|
||||
let g:go_fmt_command = "gofumports"
|
||||
let g:go_fmt_autosave = 1
|
||||
let g:go_metalinter_enabled = ['govet', 'golint', 'errcheck', 'staticcheck', 'gosimple', 'structcheck', 'varcheck', 'ineffassign', 'deadcode', 'gosec', 'unconvert', 'dupl', 'goconst', 'gocyclo', 'misspell', 'unparam', 'lll', 'interfacer', 'nakedret', 'scopelint']
|
||||
let g:go_metalinter_autosave = 0
|
||||
|
|
@ -136,7 +145,7 @@ let g:indentLine_char = '▏'
|
|||
let g:ale_completion_enabled = 0
|
||||
let g:ale_open_list = 1
|
||||
let g:ale_linters = {
|
||||
\ 'go': ['gofmt', 'golint', 'gopls', 'golangci-lint']
|
||||
\ 'go': ['gofmt', 'gopls', 'golangci-lint']
|
||||
\}
|
||||
let g:ale_go_golangci_lint_options = ''
|
||||
let g:ale_go_golangci_lint_executable = 'golangci-lintw'
|
||||
|
|
@ -204,6 +213,8 @@ call plug#end()
|
|||
""
|
||||
|
||||
nmap <silent> <space>w<space>w :call mkdir(strftime("diary/%Y/%m"), "p", 0755) \| exec "edit " . strftime("diary/%Y/%m/%Y-%m-%d.md")<CR>
|
||||
nmap <silent> <space>dt :execute ":normal! a" . strftime("%H:%M ")<CR>
|
||||
nmap <silent> <space>dn :execute ":normal! o* " . strftime("%H:%M ")<CR>
|
||||
|
||||
""
|
||||
"" Keymappings
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue