Merge pull request #81 from bob8677/master

[instantos/instantOS.git] / userinstall.sh

diff --git a/userinstall.sh b/userinstall.sh
index 0828c77..6612c45 100755 (executable)
--- a/userinstall.sh
+++ b/userinstall.sh
@@ -4,70 +4,39 @@
 ## installs all instantOS tools            ##
 #############################################
 
-cd "$HOME"
-
+cd || echo "ERROR: could not go to HOME"
 echo "installing instantOS tools"
 
-RAW="https://raw.githubusercontent.com"
-source <(curl -s $RAW/paperbenni/bash/master/import.sh)
-pb install
-pb git
-
-LINK="$RAW/paperbenni/suckless/master"
-
-curl -s "$LINK/termprograms.txt" >.cache/termprograms.txt
-
-if ! [ ~/.local/share/fonts/symbola.ttf ]; then
-    mkdir -p .local/share/fonts
-    cd .local/share/fonts
-    echo "installing symbola font"
-    wget -q "http://symbola.surge.sh/symbola.ttf"
-fi
-
-cd "$HOME"
-
 # laptop specific stuff
-if acpi | grep -q '[0-9]%' &>/dev/null; then
+if acpi | grep -q '.' &>/dev/null; then
     # config file to indicate being a laptop
-    touch .cache/islaptop
-else
-    curl -s "$RAW/paperbenni/suckless/master/monitor.sh" | bash
+    echo "device appears to be a laptop"
+    iconf -i islaptop 1
 fi
 
-cd
-
-# auto start script with instantWM
-ls .instantos &>/dev/null || mkdir .instantos
-curl -s $LINK/autostart.sh >.instantos/autostart.sh
-chmod +x .instantos/autostart.sh
-
-cd /tmp
-# drag and drop x utility for ranger
-if ! command -v dragon &>/dev/null; then
-    cd /tmp
-    git clone --depth=1 https://github.com/mwh/dragon.git &>/dev/null
-    cd dragon
-    make
-    make install
-    cd ..
-    rm -rf dragon
+# needed for nm-applet start
+if lspci | grep -Eiq '(wifi|wireless)'; then
+    echo "device has wifi capabilities"
+    iconf -i haswifi 1
+    iconf -i wifiapplet 1
 fi
 
-cd
-mkdir -p paperbenni/notifications &>/dev/null
+# needed to disable bluetooth service
+if lsusb | grep -iq 'bluetooth'; then
+    echo "device has bluetooth"
+    iconf -i hasbluetooth 1
+fi
 
-# gets executed by dunst on notification
-curl "$RAW/paperbenni/suckless/master/programs/dunsttrigger" >~/paperbenni/notifications/dunsttrigger
-chmod +x ~/paperbenni/notifications/dunsttrigger
-wget -O ~/paperbenni/notifications/notification.ogg "https://notificationsounds.com/notification-sounds/me-too-603/download/ogg"
+# change some behaviour like light for setting brightness
+if iconf -r hasnvidia
+then
+    iconf -i hasnvidia 1
+    iconf -i uselight 1
+fi
 
-cd
+instantmouse gen
 
-rm -rf instantos/wallpapers
-mkdir -p instantos/wallpapers
-curl -s "$RAW/instantOS/instantWALLPAPER/master/wall.sh" >instantos/wallpapers/wall.sh
-instantos/wallpapers/wall.sh
+mkdir ~/instantos
+mkdir -p ~/.config/instantos
 
-# set instantwm as default for lightdm
-echo '[Desktop]' >.dmrc
-echo 'Session=instantwm' >>.dmrc
+iconf -i userinstall 1