diff options
| author | Julian T <julian@jtle.dk> | 2020-01-13 12:51:33 +0100 |
|---|---|---|
| committer | Julian T <julian@jtle.dk> | 2020-01-13 12:51:33 +0100 |
| commit | 2171f213d6c7d0443c52b736b12f4394b4e34655 (patch) | |
| tree | d3950bd036e398d488e7d700742a62debe832772 | |
| parent | 77cbf7cd3976accb5539d7c105cb54fdcd962ce4 (diff) | |
Switched xlaunch system
| -rw-r--r-- | i3/.Xmodmap | 5 | ||||
| -rw-r--r-- | i3/.xinitrc | 23 | ||||
| -rw-r--r-- | i3/.zprofile | 3 | ||||
| -rw-r--r-- | xinit/#pre_stow.sh# | 3 | ||||
| -rw-r--r-- | xinit/.Xmodmap (renamed from bspwm/.Xmodmap) | 1 | ||||
| -rw-r--r-- | xinit/.zprofile (renamed from bspwm/.zprofile) | 0 | ||||
| -rwxr-xr-x | xinit/Scripts/xlaunchrc (renamed from scripts/Scripts/xlaunchrc) | 15 |
7 files changed, 18 insertions, 32 deletions
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/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/bspwm/.Xmodmap b/xinit/.Xmodmap index 08cf429..89d617a 100644 --- a/bspwm/.Xmodmap +++ b/xinit/.Xmodmap @@ -2,4 +2,3 @@ clear lock clear control keycode 66 = Control_R add control = Control_R Control_L - diff --git a/bspwm/.zprofile b/xinit/.zprofile index b78f84a..b78f84a 100644 --- a/bspwm/.zprofile +++ b/xinit/.zprofile diff --git a/scripts/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc index 2b10413..2a27fa2 100755 --- a/scripts/Scripts/xlaunchrc +++ b/xinit/Scripts/xlaunchrc @@ -1,14 +1,26 @@ #!/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 & @@ -16,5 +28,4 @@ xss-lock -- xscreensaver-command --lock & autorandr -c xfce4-panel & -exec bspwm -# exec i3 +# Please do not block |