diff options
| -rw-r--r-- | .Xresources | 3 | ||||
| -rw-r--r-- | .config/i3status/config | 53 | ||||
| -rw-r--r-- | .config/sway/config | 7 | ||||
| -rw-r--r-- | .profile | 1 | ||||
| -rw-r--r-- | .shrc | 2 | ||||
| -rw-r--r-- | .vimrc | 115 | ||||
| -rw-r--r-- | .xinitrc | 1 |
7 files changed, 178 insertions, 4 deletions
diff --git a/.Xresources b/.Xresources index 6cef873..5aa4167 100644 --- a/.Xresources +++ b/.Xresources @@ -20,7 +20,8 @@ xterm*termName: xterm-256color xterm*VT100.Translations: #override \ <Key> F11: fullscreen(toggle) \n\ Ctrl <Key> minus: smaller-vt-font() \n\ - Ctrl <Key> equal: larger-vt-font() \n + Ctrl <Key> equal: larger-vt-font() \n\ + Ctrl <Key> agrave: set-vt-font(d) \n xterm*cursorColor: red !xterm*visualBell: true !xterm*geometry: 100x32 diff --git a/.config/i3status/config b/.config/i3status/config new file mode 100644 index 0000000..2d5b443 --- /dev/null +++ b/.config/i3status/config @@ -0,0 +1,53 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 5 +} + +#order += "ipv6" +order += "wireless _first_" +#order += "ethernet _first_" +order += "battery all" +order += "disk /" +order += "load" +order += "memory" +order += "tztime local" + +wireless _first_ { + format_up = "W: (%quality at %essid) %ip" + format_down = "W: down" +} + +ethernet _first_ { + format_up = "E: %ip (%speed)" + format_down = "E: down" +} + +battery all { + format = "%status %percentage %remaining" +} + +disk "/" { + format = "%avail" +} + +load { + format = "%1min" +} + +memory { + format = "%used | %available" + threshold_degraded = "1G" + format_degraded = "MEMORY < %available" +} + +tztime local { + format = "%Y-%m-%d %H:%M:%S" +} diff --git a/.config/sway/config b/.config/sway/config index 93caf4d..6b67de0 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -63,7 +63,7 @@ input type:keyboard { xkb_layout "fr" } -input "1739:52544:SYNA7DAB:00_06CB:CD40_Touchpad" { +input type:touchpad { tap enabled natural_scroll enabled } @@ -216,11 +216,12 @@ bindsym $mod+r mode "resize" # # Read `man 5 sway-bar` for more information about this section. bar { - position top + position bottom # When the status_command prints a new line to stdout, swaybar updates. # The default just shows the current date and time. - status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done + # status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done + status_command i3status colors { statusline #ffffff @@ -1,3 +1,4 @@ export PATH=~/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:~/go/bin +export XDG_RUNTIME_DIR=/run/user/1000 [ "$SHELL" = /bin/ash ] && export ENV=~/.shrc @@ -7,5 +7,7 @@ alias sudo=doas alias sup='doas apk upgrade' alias apk='doas apk' alias dotfiles='git --git-dir=$HOME/dotfiles --work-tree=$HOME' +alias vi=vim +alias ww='vim ~/Wiki/home_page.md' mkcd() { mkdir -p "$1" && cd "$1"; } @@ -0,0 +1,115 @@ +" General vim defaults +" set background= +"set t_te= t_ti= +set ls=1 ruler +set ai ts=4 sw=4 noet +"set mouse=a +syntax off +filetype on +filetype plugin on +filetype plugin indent on +let mapleader = "," + +"set rtp+=/opt/homebrew/opt/fzf +let g:fzf_preview = 'cat {}' + +" vimki plugin +autocmd filetype vimki syntax on +autocmd filetype vimki set autowrite +" autocmd filetype vimki setlocal spell spelllang=fr +autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR> + +" vim-go plugin +"let g:go_def_mode = "gopls" +"let g:go_info_mode = "gopls" +"let g:go_list_type = "quickfix" +"let g:go_fmt_command = "gopls" +"let g:go_gopls_gofumpt = 1 + +let g:go_gopls_enabled = 0 +let g:go_def_mode = "godef" +let g:go_fmt_command = "goimports" +let g:go_metalinter_command = "golangci-lint" +"autocmd FileType go syntax on +autocmd FileType go nmap <leader>b <Plug>(go-build) +autocmd FileType go nmap <leader>i <Plug>(go-info) +autocmd FileType go nmap <leader>r <Plug>(go-run) +autocmd FileType go nmap <leader>t <Plug>(go-test) +autocmd FileType go nmap <leader>f <Plug>(go-test-func) +autocmd FileType go nmap <leader>v <Plug>(go-referrers) +autocmd FileType go nmap <leader>n :cnext<CR> +autocmd FileType go nmap <leader>p :cprevious<CR> +autocmd FileType go nmap <leader>a :cclose<CR> +" autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 + +let g:netrw_browsex_viewer = "xdg-open" +let g:netrw_gx = "<cWORD>" +let g:netrw_banner = 0 + +" python and yaml formatting: +autocmd filetype python,yaml set ts=2 sts=2 sw=2 et + +:set wrap +:set linebreak +:set nolist +:set formatoptions-=t +" noremap <M-v> :!cscope -1 <cword>
+" noremap <M-a> :!cscope -0 <cword>
+" noremap <M-f> :!cscope -7 <cfile>
+ +" Paragraph format / unformat +noremap <leader>f !}fmt
+noremap <leader>F !}fmt -c -w 2048
+ +" noremap <buffer> K :s,^,//,
+" noremap <buffer> <C-K> :s,^//,,
+noremap <buffer> # :s,^,#,
+noremap <buffer> @ :s,^#,,
+"hi MatchParen term=reverse ctermbg=magenta ctermfg=none +" hi MatchParen cterm=reverse term=reverse ctermfg=white +" + +" Fix spell highlighting +hi clear SpellBad +hi SpellBad cterm=underline +hi SpellBad gui=undercurl + +noremap <leader>n :bn<cr> +noremap <leader><leader> :bd<cr> +noremap <leader>o :!xdg-open <cWORD>&<cr><cr> +noremap <C-g> :tag <c-r><c-w><cr> +noremap <C-p> :Files<cr> + +""""""""""""" My cscope/vim key mappings + " + " The following maps all invoke one of the following cscope search types: + " + " 's' symbol: find all references to the token under cursor + " 'g' global: find global definition(s) of the token under cursor + " 'c' calls: find all calls to the function name under cursor + " 't' text: find all instances of the text under cursor + " 'e' egrep: egrep search for the word under cursor + " 'f' file: open the filename under cursor + " 'i' includes: find files that include the filename under cursor + " 'd' called: find functions that function under cursor calls + +if has("cscope") + set csto=0 + set cst + set nocsverb + if filereadable("cscope.out") + cs add cscope.out + elseif $CSCOPE_DB + cs add $CSCOPE_DB + endif + set csverb +endif + +nmap <leader>cs :cs find s <C-R>=expand("<cword>")<CR><CR> +nmap <leader>cg :cs find g <C-R>=expand("<cword>")<CR><CR> +nmap <leader>cc :cs find c <C-R>=expand("<cword>")<CR><CR> +nmap <leader>ct :cs find t <C-R>=expand("<cword>")<CR><CR> +nmap <leader>ce :cs find e <C-R>=expand("<cword>")<CR><CR> +nmap <leader>ci :cs find i <C-R>=expand("<cfile>")<CR><CR> +nmap <leader>cf :cs find f <C-R>=expand("<cfile>")<CR><CR> +nmap <leader>cd :cs find d <C-R>=expand("<cword>")<CR><CR> @@ -1,4 +1,5 @@ #!/bin/sh +xhost + local: xrdb .Xresources xsetroot -solid rgb:1/3/4 exec i3 |