From 23c83773c9030ce83000d1f5d995be25d089bad9 Mon Sep 17 00:00:00 2001
From: Kumar Damani <damani.kumar@gmail.com>
Date: Fri, 24 May 2019 09:24:01 -0400
Subject: latest updates

---
 Scripts/.config/Scripts/autostart.sh | 36 +++++++++++++++++++++++++++++++++++
 Scripts/.config/Scripts/startdwm     | 37 +++++++-----------------------------
 2 files changed, 43 insertions(+), 30 deletions(-)
 create mode 100755 Scripts/.config/Scripts/autostart.sh

(limited to 'Scripts')

diff --git a/Scripts/.config/Scripts/autostart.sh b/Scripts/.config/Scripts/autostart.sh
new file mode 100755
index 0000000..9987401
--- /dev/null
+++ b/Scripts/.config/Scripts/autostart.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+function run {
+  SERVICE="$@"
+  RUNNING=$(ps aux | grep -v grep | grep "$SERVICE")
+  if [ "${RUNNING:-null}" = null ];
+  then
+    $@ &
+  fi
+}
+
+# Common programs
+~/.config/Scripts/screen.sh d
+setxkbmap -layout us -variant altgr-intl -option caps:escape
+xmodmap -e "keycode 135 = Super_R"
+run mpd
+run nm-applet
+run compton
+run wal -i ~/.config/wall1.jpg
+run synclient TouchpadOff=1
+run /usr/bin/xflux -l 43.6404 -g -79.3995
+run st -c email -e neomutt
+run vivaldi-stable
+run keepassxc
+amixer -c 0 set Headphone 100% unmute
+#run dropbox
+
+# WM specific
+if [ $GDMSESSION == "dwm" ];
+then
+  run stalonetray
+else
+  run ~/.config/Scripts/launch_polybar.sh
+  run st -c dropdown -e tmux -f ~/.config/tmux/tmux_start.conf attach
+  run st -c math -e R
+fi
diff --git a/Scripts/.config/Scripts/startdwm b/Scripts/.config/Scripts/startdwm
index 60c140c..226ba0e 100755
--- a/Scripts/.config/Scripts/startdwm
+++ b/Scripts/.config/Scripts/startdwm
@@ -1,30 +1,4 @@
-#!/bin/bash
-
-function run {
-  SERVICE="$@"
-  RUNNING=$(ps aux | grep -v grep | grep "$SERVICE")
-  if [ "${RUNNING:-null}" = null ];
-  then
-    $@ &
-  fi
-}
-
-
-setxkbmap -layout us -variant altgr-intl -option caps:escape
-xmodmap -e "keycode 135 = Super_R"
-run mpd
-run nm-applet
-run compton
-run wal -i ~/.config/wall1.jpg
-run synclient TouchpadOff=1
-run /usr/bin/xflux -l 43.6404 -g -79.3995
-run ~/.config/Scripts/screen.sh d
-run st -c email -e neomutt
-run firefox
-run keepassxc
-amixer -c 0 set Headphone 100% unmute
-run dropbox
-run stalonetray
+#!/bin/sh
 
 disk_used=$(df -hl --total / | awk '{print $5}' | sed -n 2p)
 
@@ -37,9 +11,12 @@ while true; do
     xsetroot -name "/: ${disk_used} || V:${vol} || $(date)"
     sleep 3
 done &
-while true; do
+#while true; do
     # Log stderror to a file
-    dwm 2> ~/.dwm.log
+    # dwm 2> ~/.dwm.log
     # No error logging
     #dwm >/dev/null 2>&1
-done
+#done
+
+$HOME/.config/Scripts/autostart.sh
+exec dwm
-- 
cgit v1.2.3