From 20ed10606e4588cde60440e1e8dff76f17f1cb33 Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Mon, 29 May 2023 21:39:25 -0500
Subject: [PATCH] changes since moving back to arch

---
 .config/lf/pv.sh       |  4 ++--
 .config/mpd/mpd.conf   |  2 +-
 .config/sway/config    | 14 +++++++-------
 .config/user-dirs.dirs | 17 +++++++++--------
 .config/zsh/.zprofile  |  2 +-
 .config/zsh/.zshrc     |  2 ++
 .local/scripts         |  2 +-
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.config/lf/pv.sh b/.config/lf/pv.sh
index b2abcfa..d17226c 100755
--- a/.config/lf/pv.sh
+++ b/.config/lf/pv.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 img () {
-    #chafa  "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
-    chafa --format=symbols  "$1" --size="$2"x"$3"
+    chafa  "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
+    #chafa --format=symbols  "$1" --size="$2"x"$3"
 }
 
 W="$(($(tput cols)/2 - 10))"
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index a5a5151..efc11ff 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -1,4 +1,4 @@
-music_directory		"~/Music"
+music_directory		"~/media/audio"
 playlist_directory	"~/.config/mpd/playlists/"
 
 auto_update "yes"
diff --git a/.config/sway/config b/.config/sway/config
index 3d558d1..6d62122 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -50,7 +50,7 @@ exec_always {
 # Example configuration:
 #
  exec swayidle -w \
-          timeout 900 'swaylock &' \
+          timeout 900 'waylock &' \
           timeout 1200 'swaymsg "output * dpms off"' \
                resume 'swaymsg "output * dpms on"' \
           before-sleep 'waylock &'
@@ -233,15 +233,15 @@ mode "resize" {
 bindsym $mod+r mode "resize"
 
 #custom keybinds
-bindsym XF86AudioRaiseVolume exec vol.sh -i 0.02 
-bindsym XF86AudioLowerVolume exec vol.sh -d 0.02 
-bindsym XF86AudioMute exec vol.sh --toggle-mute
+bindsym XF86AudioRaiseVolume exec ~/.local/scripts/vol.sh -i 0.02 
+bindsym XF86AudioLowerVolume exec ~/.local/scripts/vol.sh -d 0.02 
+bindsym XF86AudioMute exec ~/.local/scripts/vol.sh --toggle-mute
 bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
 bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
 #bindsym $mod+p exec fixscr.sh --menu
-bindsym $mod+p exec get-pass.sh -c
-bindsym $mod+o exec browser.sh
-bindsym $mod+shift+s exec ss.sh -s 
+bindsym $mod+p exec ~/.local/scripts/get-pass.sh -c
+bindsym $mod+o exec ~/.local/scripts/browser.sh
+bindsym $mod+shift+s exec ~/.local/scripts/ss.sh -s 
 bindsym ctrl+alt+delete exec waylogout
 
 
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 7f9a959..3c004b3 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -5,11 +5,12 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME/Desktop"
-XDG_DOWNLOAD_DIR="$HOME/Downloads"
-XDG_TEMPLATES_DIR="$HOME/Templates"
-XDG_PUBLICSHARE_DIR="$HOME/Public"
-XDG_DOCUMENTS_DIR="$HOME/Documents"
-XDG_MUSIC_DIR="$HOME/Music"
-XDG_PICTURES_DIR="$HOME/Pictures"
-XDG_VIDEOS_DIR="$HOME/Videos"
+XDG_DESKTOP_DIR="$HOME/.local/share/desktop"
+XDG_DOWNLOAD_DIR="$HOME/dl"
+XDG_TEMPLATES_DIR="$HOME/.local/share/templates/"
+XDG_PUBLICSHARE_DIR="$HOME/.local/share/public"
+XDG_DOCUMENTS_DIR="$HOME/docs"
+XDG_MUSIC_DIR="$HOME/.files/media/audio"
+XDG_PICTURES_DIR="$HOME/.files/media/img"
+XDG_VIDEOS_DIR="$HOME/.files/media/video"
+XDG_DOWNLOADS_DIR="$HOME/dl"
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index ca2b621..9cfcd69 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -64,7 +64,7 @@ export BROWSER="browser.sh"
 
 
 #lf icons
-[ -f "$HOME"/.config/lf/lf-icons.sh ] && source "$HOME"/.config/lf/lf-icons.sh
+[ -f "$HOME"/.config/lf/lf-icons.sh ] && . "$HOME"/.config/lf/lf-icons.sh
 
 #fixes  
 #fix weird terminal issues
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 097eaa1..bc1d047 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -134,6 +134,8 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+#[ -f ~/.config/zsh/.zprofile ] && source ~/.config/zsh/.zprofile
+
 [ -f ~/.config/aliasrc ] && source ~/.config/aliasrc
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
diff --git a/.local/scripts b/.local/scripts
index 4234c83..992a388 160000
--- a/.local/scripts
+++ b/.local/scripts
@@ -1 +1 @@
-Subproject commit 4234c835e10af1e918b1cbcf68579b4634f53570
+Subproject commit 992a388711923272e6a947712f6811f4fc5967a4