From 32fef7f5ffae1e2b676f1fdbd1d6192805ff434d Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Sat, 11 Feb 2017 12:16:49 +0100 Subject: [PATCH] Move xinitrc and use https for submodules --- .gitmodules | 4 ++-- gui/x11/xinitrc | 15 +++++++++++++++ shells/xinitrc | 5 ----- 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 gui/x11/xinitrc delete mode 100644 shells/xinitrc diff --git a/.gitmodules b/.gitmodules index 449e169..cdc7541 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "editors/vim/bundle/Vundle.vim"] path = editors/vim/bundle/Vundle.vim - url = git@github.com:VundleVim/Vundle.vim.git + url = https://github.com/VundleVim/Vundle.vim.git branch = master [submodule "terminals/colors/base16-shell"] path = terminals/colors/base16-shell - url = git@github.com:chriskempson/base16-shell.git + url = https://github.com/chriskempson/base16-shell.git branch = master diff --git a/gui/x11/xinitrc b/gui/x11/xinitrc new file mode 100644 index 0000000..e8bbf35 --- /dev/null +++ b/gui/x11/xinitrc @@ -0,0 +1,15 @@ +#!/bin/bash +# ~/.xinitrc + +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 + +[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources + +start-pulseaudio-x11 +# exec startxfce4 +exec i3 diff --git a/shells/xinitrc b/shells/xinitrc deleted file mode 100644 index 9a72d18..0000000 --- a/shells/xinitrc +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# ~/.xinitrc - -# exec startxfce4 -exec i3