From 2171f213d6c7d0443c52b736b12f4394b4e34655 Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Mon, 13 Jan 2020 12:51:33 +0100
Subject: Switched xlaunch system

---
 bspwm/.Xmodmap            |  5 -----
 bspwm/.zprofile           |  3 ---
 i3/.Xmodmap               |  5 -----
 i3/.xinitrc               | 23 ++---------------------
 i3/.zprofile              |  3 ---
 scripts/Scripts/xlaunchrc | 20 --------------------
 xinit/#pre_stow.sh#       |  3 +++
 xinit/.Xmodmap            |  4 ++++
 xinit/.zprofile           |  3 +++
 xinit/Scripts/xlaunchrc   | 31 +++++++++++++++++++++++++++++++
 10 files changed, 43 insertions(+), 57 deletions(-)
 delete mode 100644 bspwm/.Xmodmap
 delete mode 100644 bspwm/.zprofile
 delete mode 100644 i3/.Xmodmap
 delete mode 100644 i3/.zprofile
 delete mode 100755 scripts/Scripts/xlaunchrc
 create mode 100644 xinit/#pre_stow.sh#
 create mode 100644 xinit/.Xmodmap
 create mode 100644 xinit/.zprofile
 create mode 100755 xinit/Scripts/xlaunchrc

diff --git a/bspwm/.Xmodmap b/bspwm/.Xmodmap
deleted file mode 100644
index 08cf429..0000000
--- a/bspwm/.Xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-clear lock
-clear control
-keycode 66 = Control_R
-add control = Control_R Control_L
-
diff --git a/bspwm/.zprofile b/bspwm/.zprofile
deleted file mode 100644
index b78f84a..0000000
--- a/bspwm/.zprofile
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	exec startx
-fi
diff --git a/i3/.Xmodmap b/i3/.Xmodmap
deleted file mode 100644
index 08cf429..0000000
--- a/i3/.Xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-clear lock
-clear control
-keycode 66 = Control_R
-add control = Control_R Control_L
-
diff --git a/i3/.xinitrc b/i3/.xinitrc
index e53275b..d989877 100644
--- a/i3/.xinitrc
+++ b/i3/.xinitrc
@@ -1,24 +1,5 @@
-setxkbmap -layout us -variant altgr-intl
-export _JAVA_AWT_WM_NONREPARENTING=1
-feh --bg-tile /home/julian/Pictures/defaultWall.*
-export TERM=xfce4-terminal
-export TERMINAL=xfce4-terminal
 
-dbus-update-activation-environment --systemd DISPLAY
-
-export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
-
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets)
-
-xmodmap .Xmodmap
-xcape -e "Control_R=Escape"
-dunst &
-
-nm-applet &
-xscreensaver &
-xss-lock -- xscreensaver-command --lock &
-xcompmgr &
-
-play ~/Winsounds/login.wav -q &
+# Launch other stuff
+source ~/Scripts/xlaunchrc
 
 exec i3
diff --git a/i3/.zprofile b/i3/.zprofile
deleted file mode 100644
index b78f84a..0000000
--- a/i3/.zprofile
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	exec startx
-fi
diff --git a/scripts/Scripts/xlaunchrc b/scripts/Scripts/xlaunchrc
deleted file mode 100755
index 2b10413..0000000
--- a/scripts/Scripts/xlaunchrc
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-feh --bg-tile /home/julian/Pictures/defaultWall.*
-export TERM=xfce4-terminal
-export TERMINAL=xfce4-terminal
-
-xmodmap .Xmodmap
-xcape -e "Control_R=Escape"
-
-nm-applet &
-xscreensaver &
-xss-lock -- xscreensaver-command --lock &
-# xcompmgr &
-
-# play ~/Winsounds/login.wav -q &
-
-autorandr -c
-xfce4-panel &
-
-exec bspwm
-# exec i3
diff --git a/xinit/#pre_stow.sh# b/xinit/#pre_stow.sh#
new file mode 100644
index 0000000..c972151
--- /dev/null
+++ b/xinit/#pre_stow.sh#
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mkdir -p ~/Scripts
diff --git a/xinit/.Xmodmap b/xinit/.Xmodmap
new file mode 100644
index 0000000..89d617a
--- /dev/null
+++ b/xinit/.Xmodmap
@@ -0,0 +1,4 @@
+clear lock
+clear control
+keycode 66 = Control_R
+add control = Control_R Control_L
diff --git a/xinit/.zprofile b/xinit/.zprofile
new file mode 100644
index 0000000..b78f84a
--- /dev/null
+++ b/xinit/.zprofile
@@ -0,0 +1,3 @@
+if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
+	exec startx
+fi
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
new file mode 100755
index 0000000..2a27fa2
--- /dev/null
+++ b/xinit/Scripts/xlaunchrc
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set +e
+
+setxkbmap -layout us -variant altgr-intl
+
+export _JAVA_AWT_WM_NONREPARENTING=1
+feh --bg-tile /home/julian/Pictures/defaultWall.*
+export TERM=xfce4-terminal
+export TERMINAL=xfce4-terminal
+
+export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
+
+dbus-update-activation-environment --systemd DISPLAY &
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets) &
+
+xmodmap .Xmodmap
+xcape -e "Control_R=Escape"
+
+nm-applet &
+xscreensaver &
+xss-lock -- xscreensaver-command --lock &
+dunst &
+# xcompmgr &
+
+# play ~/Winsounds/login.wav -q &
+
+autorandr -c
+xfce4-panel &
+
+# Please do not block
-- 
cgit v1.2.3