summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbspwm/.config/bspwm/bspwmrc8
-rw-r--r--bspwm/.config/sxhkd/sxhkdrc5
-rw-r--r--bspwm/.xinitrc28
-rwxr-xr-xscripts/Scripts/xlaunchrc20
4 files changed, 30 insertions, 31 deletions
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 24dddc4..008d28b 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -1,10 +1,11 @@
#! /usr/bin/env bash
-sxhkd &
+# Started by nixos
+# sxhkd &
bspc monitor -d 1 2 3 4 5 6 7 8 9
-bspc config border_width 2
+bspc config border_width 3
bspc config window_gap 12
bspc config split_ratio 0.52
@@ -27,3 +28,6 @@ bspc rule -a firefox desktop=^9
bspc config normal_border_color "#555753"
bspc config active_border_color "#555753"
bspc config focused_border_color "#3465a4"
+
+# Launch other stuff
+~/Scripts/xlaunchrc
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index 7721f9d..960cbb7 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -1,6 +1,9 @@
alt + i
- xfce4-terminal
+ termite
+
+alt + w
+ ./Scripts/lc common
# program launcher
alt + d
diff --git a/bspwm/.xinitrc b/bspwm/.xinitrc
deleted file mode 100644
index 2ccaa76..0000000
--- a/bspwm/.xinitrc
+++ /dev/null
@@ -1,28 +0,0 @@
-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 &
-
-autorandr -c
-xfce4-panel &
-
-exec bspwm
-# exec i3
diff --git a/scripts/Scripts/xlaunchrc b/scripts/Scripts/xlaunchrc
new file mode 100755
index 0000000..2b10413
--- /dev/null
+++ b/scripts/Scripts/xlaunchrc
@@ -0,0 +1,20 @@
+#!/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