summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jonas Gunz <himself@jonasgunz.de> 2019-10-15 10:23:00 +0200
committerGravatar Jonas Gunz <himself@jonasgunz.de> 2019-10-15 10:23:00 +0200
commitc45fd444fef5b99263c4fe311ff9bead2605ea72 (patch)
treecb20e77f34c65a6a902c498f42a2091c816f5eb7
parentff234cc890fdf1fe778d390de62b9df41d480d5f (diff)
parent4b4dabcf2e4e7c056dedabcf6ac92d265deaa5ab (diff)
downloaddotfiles-c45fd444fef5b99263c4fe311ff9bead2605ea72.tar.gz
Merge branch 'master' of github.com:kompetenzbolzen/vimconfig
m---------.vim/bundle/nerdtree0
m---------.vim/bundle/vim-airline0
m---------.vim/bundle/vim-airline-themes0
m---------.vim/bundle/vim-signify0
m---------.vim/bundle/vimagit0
-rw-r--r--.xinitrc15
-rw-r--r--termite/config2
7 files changed, 14 insertions, 3 deletions
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
-Subproject 2d639b70e73ecf3f62884a578fe5e5937e6d8a9
+Subproject 1c803b36f632c151c755456b68101153f407ec5
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
-Subproject 62f2dc02f01da7cfa16e45a9f8ce7036a03c342
+Subproject 2db9b27e39bfd84cb432e001b4a3f41f633b3b7
diff --git a/.vim/bundle/vim-airline-themes b/.vim/bundle/vim-airline-themes
-Subproject 0d5c5c1e2995126e76606a628316c8e3f5efb37
+Subproject e6f233231b232b6027cde6aebeeb18d9138e532
diff --git a/.vim/bundle/vim-signify b/.vim/bundle/vim-signify
-Subproject 13ba32ae556b1d6e4e354f5647f6f1ab91d10e5
+Subproject ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46
diff --git a/.vim/bundle/vimagit b/.vim/bundle/vimagit
-Subproject 94762b1356ebdcb8ec486a86f45e69ef77a6946
+Subproject 91b947cceb7f1c7d005f6b1941478802c4b096d
diff --git a/.xinitrc b/.xinitrc
index 0acdb87..66d1b5d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,7 +11,15 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
unset f
fi
-#Select random background image
+# turn off Display Power Management Service (DPMS)
+xset -dpms
+setterm -blank 0 -powerdown 0
+
+# turn off black Screensaver
+xset s off
+
+#Screen background feh
+>>>>>>> Stashed changes
shopt -s nullglob
pics=(~/vimconfig/pictures/b_*)
@@ -25,6 +33,9 @@ xrdb .Xresources
setxkbmap -layout de
compton &
-lxqt-policykit-agent &
+
+if [ $DISPLAY -e ":0" ]; then
+ lxqt-policykit-agent &
+fi
exec i3
diff --git a/termite/config b/termite/config
index a332f1b..83b56bc 100644
--- a/termite/config
+++ b/termite/config
@@ -3,4 +3,4 @@ foreground = #ffffff
background = rgba (0,0,0,0.4)
[options]
-font = DejaVu Sans Mono for Powerline 12
+font = DejaVu Sans Mono for Powerline 10