Moved scripts

CHANGELOG.md

@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- Made as compatible with XDG base directories as possible
+- Moved `Scripts` to `~/.local/bin`
 - Fixed `mailto` action to pull up `mutt` with `termite`
 - Fixed `neomutt`'s behavior when opening attachments
 - Removed GT Tribe calendar

Makefile

@@ -247,7 +247,7 @@ stow-pre:
 
 stow-post:
  # shortcuts initialization
- sudo -u $(USER) /home/$(USER)/.config/Scripts/genshortcuts
+ sudo -u $(USER) /home/$(USER)/.local/bin/genshortcuts
  # neovim vim-plug initialization
  sudo -u $(USER) nvim +'PlugInstall --sync' +qa
  # set wallpaper and run wpgtk

dunst/.config/dunst/dunstrc

@@ -179,10 +179,10 @@
  ### Misc/Advanced ###
 
  # dmenu path.
- dmenu = /home/micah/.config/Scripts/dmenucolor
+ dmenu = bemenucolor
 
  # Browser for opening urls in context menu.
- browser = /home/micah/.config/Scripts/linkhandler
+ browser = linkhandler
 
  # Always run rule-defined scripts, even if the notification is suppressed
  always_run_script = true

dunst/.config/systemd/user/dunst.service

@@ -3,7 +3,7 @@ Description=dunst notifications
 
 [Service]
 Type=simple
-ExecStart=/home/micah/.config/Scripts/dunstcolor
+ExecStart=/home/micah/.local/bin/dunstcolor
 
 [Install]
 WantedBy=default.target

etc/systemd/system/wakelock.service

@@ -6,7 +6,7 @@ Before=suspend.target
 User=micah
 Type=forking
 Environment=DISPLAY=:0
-ExecStart=/home/micah/.config/Scripts/lock
+ExecStart=/home/micah/.local/bin/lock
 
 [Install]
 WantedBy=suspend.target

i3blocks/.config/i3blocks/config

@@ -1,4 +1,4 @@
-command=~/.config/Scripts/statusbar/$BLOCK_NAME
+command=~/.local/bin/statusbar/$BLOCK_NAME
 separator=false
 separator_block_width=15
 markup=pango

mutt/.config/mutt/gatechrc

@@ -4,7 +4,7 @@ set realname = "Micah Halter"
 set from = "mehalter@gatech.edu"
 set mbox_type = Maildir
 set sendmail = "/bin/sh sendmail gatech"
-set folder = "$HOME/.Mail/Gatech"
+set folder = "$XDG_DATA_HOME/Mail/Gatech"
 
 
 set spoolfile = "+INBOX"

mutt/.config/mutt/gmailrc

@@ -4,7 +4,7 @@ set realname = "Micah Halter"
 set from = "micah@mehalter.com"
 set mbox_type = Maildir
 set sendmail = "/bin/sh sendmail gmail"
-set folder = "$HOME/.Mail/Gmail"
+set folder = "$XDG_DATA_HOME/Mail/Gmail"
 
 set spoolfile = "+INBOX"
 set record = /dev/null

mutt/.config/mutt/mailto

@@ -1,3 +0,0 @@
-#!/usr/bin/zsh
-
-exec $TERMINAL -e "/home/micah/.config/Scripts/i3-runner neomutt \"$@\""

mutt/.config/mutt/muttrc

@@ -1,19 +1,19 @@
-source $HOME/.config/mutt/gmailrc
-source $HOME/.config/mutt/muttcol
-source $HOME/.config/mutt/aliases
+source $XDG_CONFIG_HOME/mutt/gmailrc
+source $XDG_CONFIG_HOME/mutt/muttcol
+source $XDG_CONFIG_HOME/mutt/aliases
 
-macro index P '<sync-mailbox><enter-command>source $HOME/.config/mutt/gmailrc<enter><change-folder>!<enter>'
-macro index S '<sync-mailbox><enter-command>source $HOME/.config/mutt/gatechrc<enter><change-folder>!<enter>'
+macro index P '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/gmailrc<enter><change-folder>!<enter>'
+macro index S '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/gatechrc<enter><change-folder>!<enter>'
 
 set editor = $EDITOR
 set timeout = "5"
 set wait_key = no
 set markers = no
 set mail_check = "10"
-set mailcap_path = $HOME/.config/mutt/mailcap
+set mailcap_path = $XDG_CONFIG_HOME/mutt/mailcap
 set date_format="%m/%d %I:%M"
 set index_format="%?M?+& ?%2M %2C %Z %d %-15.15F %s (%-4.4c)"
-set signature = $HOME/.config/mutt/signature
+set signature = $XDG_CONFIG_HOME/mutt/signature
 set sendmail_wait = -1
 set fast_reply
 set reverse_name

mutt/.local/share/applications/mutt.desktop

@@ -2,7 +2,7 @@
 Name=Mutt
 Comment=IRC Client
 GenericName=Mutt
-Exec=/home/micah/.config/mutt/mailto
+Exec=mailto
 StartupNotify=true
 Terminal=false
 Type=Application

neovim/.config/nvim/init.vim

@@ -43,8 +43,8 @@ call plug#end()
 set scrolloff=7
 set fileformats=unix,dos,mac
 set path+=**
-set spellfile=$HOME/.config/nvim/spell/en.utf-8.add
-set thesaurus+=$HOME/.config/nvim/spell/mthesaur.txt
+set spellfile=$XDG_CONFIG_HOME/nvim/spell/en.utf-8.add
+set thesaurus+=$XDG_CONFIG_HOME/nvim/spell/mthesaur.txt
 " 1 tab == 2 spaces
 set expandtab
 set shiftwidth=2

ranger/.config/ranger/pinrunner.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source $HOME/.config/Scripts/pins.sh
+source $HOME/.local/bin/pins.sh
 
 $1 $2 2> /dev/null

ranger/.config/ranger/rc.conf

@@ -443,7 +443,7 @@ map V console shell $EDITOR%space
 map cW bulkrename %s
 map mkd console mkdir%space
 map D console delete
-map X shell $HOME/.config/Scripts/extract %f
+map X shell extract %f
 map Z shell tar -cvzf %f.tar.gz %s
 map <C-f> fzf_select
 map <C-l> fzf_locate
@@ -454,9 +454,9 @@ map vr shell [ -e /tmp/nvimsocket ] && nvr %f 2>/dev/null &
 
 # Pins
 map pg pingo
-map pa console shell $HOME/.config/ranger/pinrunner.sh pa%space
-map pd shell $HOME/.config/ranger/pinrunner.sh pd "$(cat $HOME/.pins|fzf -n 1|awk '{print $1}')"
-map pe shell $HOME/.config/ranger/pinrunner.sh pe "$(cat $HOME/.pins|fzf -n 1|awk '{print $1}')"
+map pa console shell $XDG_CONFIG_HOME/ranger/pinrunner.sh pa%space
+map pd shell $XDG_CONFIG_HOME/ranger/pinrunner.sh pd "$(cat $XDG_DATA_HOME/pins|fzf -n 1|awk '{print $1}')"
+map pe shell $XDG_CONFIG_HOME/ranger/pinrunner.sh pe "$(cat $XDG_DATA_HOME/pins|fzf -n 1|awk '{print $1}')"
 
 # Document
 map Mk shell compiler %f

rtv/.mailcap

@@ -1,6 +1,6 @@
-image/x-imgur-album; $HOME/.config/Scripts/sxiveh '%s'; test=test -n "$DISPLAY"
+image/x-imgur-album; sxiveh '%s'; test=test -n "$DISPLAY"
 image/gif; mpv '%s' --autofit=640x480 --loop=inf; test=test -n "$DISPLAY"
-image/*; $HOME/.config/Scripts/sxiveh '%s'; test=test -n "$DISPLAY"
+image/*; sxiveh '%s'; test=test -n "$DISPLAY"
 
 video/x-youtube; mpv --ytdl-format=best '%s' --autofit=640x480; test=test -n "$DISPLAY"
 video/*; mpv '%s' --autofit=640x480 --loop=inf; test=test -n "$DISPLAY"

scripts/.config/Scripts/bemenui3

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-i3-msg "$(cat ~/.config/i3/config | sed -E 's/^bindsym\s*(\S*)\s*(\S.*$)/\1|\2/;t;d'|column -s'|' -t | bemenucolor -l 30 | cut -d' ' -f2- | xargs -0)"

scripts/.config/Scripts/configs.shortcuts

@@ -1,12 +0,0 @@
-cfa	~/.config/zsh/aliases
-cfb	~/.bashrc
-cfcf	~/.config/Scripts/configs.shortcuts
-cfcv	~/Documents/mehalter.com/content.md
-cff	~/.config/Scripts/folders.shortcuts
-cfi	~/.config/i3/config
-cfq	~/.config/qutebrowser/config.py
-cfr	~/.config/ranger/rc.conf
-cft	~/.tmux.conf
-cfv	~/.config/nvim/init.vim
-cfw	~/.config/bookmarks
-cfz	~/.config/zsh/.zshrc

scripts/.config/configs

@@ -0,0 +1,11 @@
+cfa	$XDG_CONFIG_HOME/zsh/aliases
+cfcf	$XDG_CONFIG_HOME/configs
+cfcv	$HOME/Documents/mehalter.com/content.md
+cff	$XDG_CONFIG_HOME/folders
+cfi	$XDG_CONFIG_HOME/i3/config
+cfq	$XDG_CONFIG_HOME/qutebrowser/config.py
+cfr	$XDG_CONFIG_HOME/ranger/rc.conf
+cft	$XDG_CONFIG_HOME/tmux/tmux.conf
+cfv	$XDG_CONFIG_HOME/nvim/init.vim
+cfw	$XDG_CONFIG_HOME/bookmarks
+cfz	$XDG_CONFIG_HOME/zsh/.zshrc

scripts/.config/Scripts/folders.shortcuts → scripts/.config/folders

@@ -11,7 +11,7 @@ o /opt
 p ~/Pictures
 r /
 s ~/Documents/School-Work
-S ~/.config/Scripts
+S ~/.local/bin
 u /usr
 v ~/Videos
 ws ~/Documents/mehalter.com

scripts/.config/Scripts/MIMEmbellish → scripts/.local/bin/MIMEmbellish

@@ -16,6 +16,7 @@ from email import encoders
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.nonmultipart import MIMENonMultipart
+from os import environ
 from os.path import basename, splitext, expanduser
 
 
@@ -38,7 +39,7 @@ def pandoc(from_format, to_format='markdown', plain='markdown', title=None):
  if title is not None:
  command += ' --variable=pagetitle:{}'.format(shlex.quote(title))
  command += ' --webtex --template={}'.format(
- expanduser('~/.config/mutt/template.html'))
+ expanduser(environ["XDG_CONFIG_HOME"]+'/mutt/template.html'))
  return command.format(from_format, to_format)
 
 

scripts/.local/bin/bemenui3

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+i3-msg "$(cat $XDG_CONFIG_HOME/i3/config | sed -E 's/^bindsym\s*(\S*)\s*(\S.*$)/\1|\2/;t;d'|column -s'|' -t | bemenucolor -l 30 | cut -d' ' -f2- | xargs -0)"

scripts/.config/Scripts/bemenulatex → scripts/.local/bin/bemenulatex

@@ -2,7 +2,7 @@
 
 xclip -h >/dev/null || exit
 
-chosen=$(grep -v "#" -h $XDG_CONFIG_HOME/Scripts/latexchars | bemenucolor -l 20)
+chosen=$(grep -v "#" -h $XDG_DATA_HOME/latexchars | bemenucolor -l 20)
 
 [ "$chosen" != "" ] || exit
 

scripts/.config/Scripts/dunstbar → scripts/.local/bin/dunstbar

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-scripts="$XDG_CONFIG_HOME/Scripts/statusbar"
+scripts="$HOME/.local/bin/statusbar"
 time=3000
 
 script="$scripts/fullbar"

scripts/.config/Scripts/genshortcuts → scripts/.local/bin/genshortcuts

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Config locations
-folders="$XDG_CONFIG_HOME/Scripts/folders.shortcuts"
-configs="$XDG_CONFIG_HOME/Scripts/configs.shortcuts"
+folders="$XDG_CONFIG_HOME/folders"
+configs="$XDG_CONFIG_HOME/configs"
 
 # Output locations
 zsh_shortcuts="$XDG_CONFIG_HOME/zsh/shortcuts"

scripts/.local/bin/mailto

@@ -0,0 +1,3 @@
+#!/usr/bin/zsh
+
+exec $TERMINAL -e "i3-runner neomutt \"$@\""

scripts/.config/Scripts/statusbar/fullbar → scripts/.local/bin/statusbar/fullbar

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-scripts="$XDG_CONFIG_HOME/Scripts/statusbar"
+scripts="$HOME/.local/bin/statusbar"
 
 echo "$({ $scripts/mail;
  $scripts/volume;

scripts/.config/Scripts/statusbar/network → scripts/.local/bin/statusbar/network

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-scripts="$XDG_CONFIG_HOME/Scripts/statusbar"
+scripts="$HOME/.local/bin/statusbar"
 
 echo "$({ $scripts/vpn; $scripts/wifi; $scripts/ethernet; } | tr '\n' ' ')"

sxiv/.config/sxiv/exec/key-handler

@@ -1,7 +1,6 @@
 #!/bin/sh
 while read file
 do
- dmenu="$HOME/.config/Scripts/dmenucolor"
  fullpath="$(pwd)/$file"
  case "$1" in
  "w")
@@ -13,12 +12,12 @@ do
  notify-send "Wallpaper changed."
  ;;
  "c")
- [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.config/Scripts/folders.shortcuts | awk '{print $2}' | $dmenu -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
+ [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/folders | awk '{print $2}' | bemenucolor -l 20 -i -p "Copy file(s) to where?" | sed "s|~|$HOME|g")"
  [ -z "$destdir" ] && exit
  cp "$file" "$destdir" && notify-send -i "$fullpath" "$file copied to $destdir." &
  ;;
  "m")
- [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" ~/.config/Scripts/folders.shortcuts | awk '{print $2}' | $dmenu -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
+ [ -z "$destdir" ] && destdir="$(sed "s/\s.*#.*$//;/^\s*$/d" $XDG_CONFIG_HOME/folders | awk '{print $2}' | bemenucolor -l 20 -i -p "Move file(s) to where?" | sed "s|~|$HOME|g")"
  [ -z "$destdir" ] && exit
  cp "$file" "$destdir" && notify-send -i "$fullpath" "$file moved to $destdir." &
  ;;
@@ -39,7 +38,7 @@ do
  echo -n "$fullpath" | xclip -selection clipboard &&
  notify-send "$fullpath copied to clipboard" & ;;
  "d")
- [ "$(printf "No\\nYes" | $dmenu -i -p "Delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
+ [ "$(printf "No\\nYes" | bemenucolor -i -p "Delete $file?")" = "Yes" ] && rm "$file" && notify-send "$file deleted." ;;
  "G")
  gimp "$file" & ;;
  esac