From 4ba9281dd32c1046881def55da71e3f091d6d9d7 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Tue, 10 Oct 2017 14:14:23 +0200 Subject: [PATCH] cleanup xinitrc --- .gitmodules | 3 --- config/base16-shell | 1 - xinitrc | 31 ------------------------------- 3 files changed, 35 deletions(-) delete mode 100644 .gitmodules delete mode 160000 config/base16-shell diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8940773..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "config/base16-shell"] - path = config/base16-shell - url = https://github.com/chriskempson/base16-shell.git diff --git a/config/base16-shell b/config/base16-shell deleted file mode 160000 index 5acf562..0000000 --- a/config/base16-shell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5acf5629a8bd186399a378c37c10507675525514 diff --git a/xinitrc b/xinitrc index f20443c..973855f 100644 --- a/xinitrc +++ b/xinitrc @@ -1,36 +1,5 @@ #!/bin/sh -userresources=$HOME/.config/Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - # My lovely bar bar() { while sleep 1; do