diff options
| author | Vasil Zlatanov <v@skozl.com> | 2019-04-03 00:56:11 +0100 |
|---|---|---|
| committer | Vasil Zlatanov <v@skozl.com> | 2019-04-03 00:56:11 +0100 |
| commit | 2df2d13c153dbb69098053fa6aa3a5aaa7fed331 (patch) | |
| tree | 87f65095a52e9b47f4b71e4768ef5a0bf03fd94e /Xinit | |
| parent | b1dbf62ab9dcad03138a52a8596dccdf9286d958 (diff) | |
| parent | 8ced63b35c8b011ff29a79856165cc748d430a11 (diff) | |
| download | dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.tar.gz dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.tar.bz2 dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.zip | |
Resolve conflicts
Diffstat (limited to 'Xinit')
| -rw-r--r-- | Xinit/Xdefaults | 11 | ||||
| -rw-r--r-- | Xinit/Xresources | 2 | ||||
| -rwxr-xr-x | Xinit/xinitrc | 12 |
3 files changed, 15 insertions, 10 deletions
diff --git a/Xinit/Xdefaults b/Xinit/Xdefaults index 0f56be6..e84e05f 100644 --- a/Xinit/Xdefaults +++ b/Xinit/Xdefaults @@ -2,7 +2,7 @@ ! Xft settings !------------------------------------------------------------------------------- -Xft.dpi: 96 +Xft.dpi: 161 Xft.antialias: true Xft.rgba: rgb Xft.hinting: true @@ -18,10 +18,10 @@ URxvt.lineSpace: 0 ! Fonts URxvt.allow_bold: true -URxvt.font: xft:DejaVu Sans Mono:pixelsize=11 +URxvt.font: xft:DejaVu Sans Mono:pixelsize=22 ! Fix font space -URxvt*letterSpace: -1 +URxvt*letterSpace: -2 ! Scrollbar URxvt.scrollStyle: rxvt @@ -33,7 +33,7 @@ URxvt.matcher.button: 1 URxvt.urlLauncher: vimb ! Cursor -URxvt.cursorBlink: true +URxvt.cursorBlink: false URxvt.cursorColor: #657b83 URxvt.cursorUnderline: false @@ -48,5 +48,4 @@ URxvt.keysym.M-s: perl:keyboard-select:search ! M-u to select open copy links !URxvt.perl-ext-common: ...,url-select URxvt.keysym.M-u: perl:url-select:select_next -URxvt.url-select.launcher: /home/vasko/.tools/firesend - +URxvt.url-select.launcher: chromium-dev diff --git a/Xinit/Xresources b/Xinit/Xresources index 3fa2ad8..fe0210e 100644 --- a/Xinit/Xresources +++ b/Xinit/Xresources @@ -13,7 +13,7 @@ urxvt.scrollBar :false xterm.scrollBar :false xterm*faceName: DejaVu Sans Mono Book -xterm*faceSize: 11 +xterm*faceSize: 16 ! Enable copy paste xterm*metaSendsEscape: true diff --git a/Xinit/xinitrc b/Xinit/xinitrc index 5b6cec9..ccad526 100755 --- a/Xinit/xinitrc +++ b/Xinit/xinitrc @@ -15,7 +15,7 @@ fi xsetroot -cursor_name left_ptr # An2linux -~/bin/an2linux.py & +#~/bin/an2linux.py & statnot ~/dotfiles/Panel/statnot/config & # Background @@ -24,6 +24,10 @@ statnot ~/dotfiles/Panel/statnot/config & # Init clipboard ~/.tools/clipboard init +# Toutchpad config +xinput --set-prop 12 "libinput Natural Scrolling Enabled" 1 +xinput --set-prop 12 "libinput Tapping Enabled" 1 + # Keyboard bindings xset r 64 xset r 133 @@ -32,13 +36,15 @@ xset m 0 0 xset -b # Launch locking program -xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 & +#xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 & # Load xterm colors xrdb -merge ~/.Xresources xrdb -merge ~/.Xdefaults # Automount -#udiskie -N & +udiskie -N -T -q --no-appindicator -a & +xrandr --dpi 161 +compton --no-fading-openclose --daemon ratpoison |