From 7acda4cd9dbf6053f08b171fdbe2db8cad1c7814 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Sat, 21 May 2022 22:55:19 +0930
Subject: [PATCH] random updates, dwm is working fine started from tty, but
 xmonad don't like it and lightdm isn't working as expected with updated
 profiles and x config

---
 .config/x11/xinitrc               | 17 ++++++++++-------
 .config/xmobar/xmobarrc-single.hs | 14 +++++++-------
 .config/zsh/.zshrc                |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index 34c2872..e5b86f5 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -6,18 +6,21 @@ else
 	. "$HOME/.xprofile"
 fi
 
-HOST=$(cat /etc/hostname)
+if [ -f /etc/hostname ]; then
+	HOST=$(cat /etc/hostname)
+else
+	HOST=$(hostname)
+fi
+
 if [ "$HOST" == "archmetabox" ] ; then
 	# this is specifically for the laptop so check hostname
 	xrandr --setprovideroutputsource modesetting NVIDIA-G0
 	xrandr --auto
 fi
 
-
-HOST=$(hostname)
 if [ "$HOST" == "holocene" ] ; then
-
-    dwmblocks &
-
-    exec dwm
+	dwmblocks &
+	exec dwm
+else
+	./$MOME/.xmonad/start-xmonad.sh
 fi
diff --git a/.config/xmobar/xmobarrc-single.hs b/.config/xmobar/xmobarrc-single.hs
index d4a7287..2c1a65f 100644
--- a/.config/xmobar/xmobarrc-single.hs
+++ b/.config/xmobar/xmobarrc-single.hs
@@ -1,4 +1,4 @@
-Config { 
+Config {
 
    -- appearance
      font =         		"xft:Fira Code:size=9:antialias=true:hinting=true"
@@ -38,7 +38,7 @@ Config {
    --   The --template option controls how the plugin is displayed. Text
    --   color can be set by enclosing in <fc></fc> tags. For more details
    --   see http://projects.haskell.org/xmobar/#system-monitor-plugins.
-   , commands =                              
+   , commands =
         -- cpu activity monitor
         [ Run Cpu            [ "--template" , "cpu <total>%"
                              , "--Low"      , "30"         -- units: %
@@ -47,7 +47,7 @@ Config {
                              , "--normal"   , "#ffb86c"
                              , "--high"     , "#ff5555"
                              ] 10
-                          
+
         -- memory usage monitor
         -- , Run Memory         [ "--template" ,"mem: <usedratio>% (<used>Mb)"
         , Run Memory         [ "--template" ,"mem <usedratio>%"
@@ -58,7 +58,7 @@ Config {
                              , "--high"     , "#ff5555"
                              ] 10
 
-        -- time and date indicator 
+        -- time and date indicator
         --   (%F = y-m-d date, %a = day of week, %T = h:m:s time)
         , Run Date             "<fc=#268bd2><fn=1>\xf073 </fn> %a %Y-%m-%d</fc> <fc=#6272a4>|</fc> <fc=#2AA198><fn=1>\xf017 </fn>%H:%M:%S</fc>" "date" 10
 
@@ -97,7 +97,7 @@ Config {
                              -- ] 10
 
         -- keyboard layout indicator
-        -- , Run Kbd            [ ("us(dvorak)" , "DV") 
+        -- , Run Kbd            [ ("us(dvorak)" , "DV")
         --                      , ("us"         , "US")
         --                      ]
 
@@ -133,9 +133,9 @@ Config {
 
         -- Script that pulls weather related data and builds string to display
         , Run Com "xmobar-status-weather" ["YPAD"] "weather" 300
-        
+
         -- Script polls the batter for info and displays nicely
-        , Run Com "status-bat" [] "bat" 20
+        , Run Com "xmobar-status-bat" [] "bat" 20
 
         -- Prints out the left side items such as workspaces, layout, etc.
         , Run UnsafeStdinReader
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d1ac2f5..26dfa54 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,5 +1,5 @@
 # If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export PATH=$HOME/.local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
 export ZSH="/home/solomon/.oh-my-zsh"