diff options
author | Silvino <silvino@bk.ru> | 2019-06-16 05:04:09 +0100 |
---|---|---|
committer | Silvino <silvino@bk.ru> | 2019-06-16 05:04:44 +0100 |
commit | 296be79a3b724db67a37244a67cfb3e4ef6b652f (patch) | |
tree | 6136b7fbe2082b018a6a06f897b7012177cce630 /tools/conf | |
parent | fdc231661647d4ca15ddf312e85b210eabd23e50 (diff) | |
parent | 951a8a84411da6b71cee11d8c9feb993b984acf5 (diff) | |
download | doc-296be79a3b724db67a37244a67cfb3e4ef6b652f.tar.gz |
doc release 0.5.3
Diffstat (limited to 'tools/conf')
-rw-r--r-- | tools/conf/etc/skel/.gitconfig | 2 | ||||
-rw-r--r-- | tools/conf/etc/skel/.vimrc | 6 | ||||
-rw-r--r-- | tools/conf/etc/skel/.xinitrc | 16 |
3 files changed, 14 insertions, 10 deletions
diff --git a/tools/conf/etc/skel/.gitconfig b/tools/conf/etc/skel/.gitconfig index f96ecf7..730d8d9 100644 --- a/tools/conf/etc/skel/.gitconfig +++ b/tools/conf/etc/skel/.gitconfig @@ -1,8 +1,10 @@ [core] pager = less -F -X + editor = vim [diff] tool = vimdiff [merge] tool = vimdiff + conflictstyle = diff3 [difftool] prompt = false diff --git a/tools/conf/etc/skel/.vimrc b/tools/conf/etc/skel/.vimrc index 2a45faf..0a3656d 100644 --- a/tools/conf/etc/skel/.vimrc +++ b/tools/conf/etc/skel/.vimrc @@ -110,7 +110,9 @@ map <F3> :tabprevious<CR> map <F4> :tabnext<CR> " "" Show Line Numbers -set nu +"" set nu +"" Show Relative Line Numbers +set relativenumber "set complete=.,b,u,] "set wildmode=longest,list:longest "set completeopt=menu,preview @@ -145,7 +147,7 @@ autocmd BufWinLeave * call clearmatches() "" Finally, if you want an indent to correspond to a single tab, you should also use: ""set shiftwidth=4 "" For indents that consist of 4 space characters but are entered with the tab key: -set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab +set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab "set list "" set past gives problems with tabs "" set paste diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc index 6ccd340..379a315 100644 --- a/tools/conf/etc/skel/.xinitrc +++ b/tools/conf/etc/skel/.xinitrc @@ -1,13 +1,13 @@ -## Start the window manager - -xrandr -s 1366x768 -#xrandr --dpi 100 -#xrandr --output eDP1 --mode 1366x768 +#xrandr --output eDP1 --mode 1024x768 +#xrandr -s 1366x768 +#xrandr --dpi 73 +#xrandr --dpi 96 #xgamma -gamma 0.8 -#syndaemon -d setxkbmap dvorak +#syndaemon -d +# +## Start the window manager #exec openbox-session -#exec dwm -exec spectrwm #exec start-mate +exec spectrwm |