checkpoint

6 files changed, 28 insertions, 25 deletions

diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc
index 3a131fa..2ec027e 100755
--- a/config/X/x11/xinitrc
+++ b/config/X/x11/xinitrc
@@ -11,6 +11,9 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 [ -f "$userresources" ] && xrdb -merge "$userresources"
 [ -f "$usermodmap" ] && xmodmap "$usermodmap"
 
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
+
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
 	for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
 		[ -x "$f" ] && . "$f"
@@ -20,25 +23,5 @@ fi
 
 export MENUCMD="dmenu"
 export IMAGE="feh"
-# Autostart these programs
-{ 
-    picom -b &
-    feh --no-fehbg --bg-scale ~/pics/wallpaper
-    setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win
-    # xautolock -locker slock &
-    gammastep -m randr &
-    ntfy transmission &
-    # dunst &
-    slstatus &
-    upds &
-    eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
-    unclutter --timeout 3 --jitter 50 -b
-    herbimisu &
-    202020 &
-    
-    signal-desktop &
-    discord &
-    st -e "sh" "-c" "pgrep tmux && tmux a || tmux" &
-}
 
 exec startdwm
diff --git a/config/common/mpd/mpd.conf b/config/common/mpd/mpd.conf
index 889b458..095b345 100644
--- a/config/common/mpd/mpd.conf
+++ b/config/common/mpd/mpd.conf
@@ -1,4 +1,4 @@
-music_directory      "~/music"
+music_directory      "/media/manthe/music"
 playlist_directory   "~/.config/mpd/playlists"
 db_file              "~/.config/mpd/database"
 pid_file             "~/.config/mpd/pid"
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index a35ccd9..59b844c 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -76,7 +76,7 @@ alias lst2='ls --tree -L2'
 alias lst3='ls --tree -L3'
 alias ls.='ls -dl .*'
 which eza >/dev/null 2>&1 &&
-	alias ls='eza --sort extension --group-directories-first --git' ||
+	alias ls='eza --sort name --group-directories-first --git' ||
 	alias ls='ls --color --group-directories-first --sort=extension'
 
 # pacman aliases
diff --git a/config/essentials/zsh/.zprofile b/config/essentials/zsh/.zprofile
index 9ae68bc..f67e3f7 100755
--- a/config/essentials/zsh/.zprofile
+++ b/config/essentials/zsh/.zprofile
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-[ "${TTY%%tty*}" = '/dev/' ] && clear
-
-if [ "$FROMLY" ] && [ "$(id -u)" -ne 0 ]; then
+if [ "$TTY" = "/dev/tty1" ] && [ "$(id -u)" -ne 0 ]; then
     exec startx > /dev/null 2>&1
     exit
 fi
diff --git a/config/home/.bashrc b/config/home/.bashrc
index c8c3a52..7e58d24 100644
--- a/config/home/.bashrc
+++ b/config/home/.bashrc
@@ -11,3 +11,5 @@ PS1=' \w $ '
 HISTFILE=
 . $HOME/.config/shell/aliases.sh 
 . $HOME/.config/shell/functions.sh
+
+eval "$(zoxide init bash)"
diff --git a/config/home/.xprofile b/config/home/.xprofile
new file mode 100755
index 0000000..9d01277
--- /dev/null
+++ b/config/home/.xprofile
@@ -0,0 +1,20 @@
+xrandr --output "$(xrandr | grep '\bconnected\b' | awk '{print $1}')" --mode 1920x1080 --rate 144 &
+
+picom -b &
+feh --no-fehbg --bg-scale ~/pics/wallpaper
+setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win
+
+# xautolock -locker slock &
+
+gammastep -m randr &
+ntfy transmission &
+herbimisu &
+slstatus &
+# upds &
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
+unclutter --timeout 3 --jitter 50 -b
+202020 &
+
+signal-desktop &
+discord &
+st -e "sh" "-c" "pgrep tmux && tmux a || tmux" &