Updated layout to support GNU Stow

11 files changed, 18 insertions, 2 deletions

diff --git a/.authinfo.gpg b/.authinfo.gpg
index 7d74c00..ffc7538 100644
--- a/.authinfo.gpg
+++ b/.authinfo.gpg
diff --git a/.local/share/applications/mimeapps.list b/.local/share/applications/mimeapps.list
deleted file mode 100755
index d0d0bcb..0000000
--- a/.local/share/applications/mimeapps.list
+++ /dev/null
@@ -1 +0,0 @@
-x-scheme-handler/org-protocol=emacsclient.desktop
diff --git a/amethyst b/amethyst/.amethyst
index 5631413..5631413 100644
--- a/amethyst
+++ b/amethyst/.amethyst
diff --git a/.local/share/applications/emacsclient.desktop b/emacs/.local/share/applications/emacsclient.desktop
index 1629a69..1629a69 100755
--- a/.local/share/applications/emacsclient.desktop
+++ b/emacs/.local/share/applications/emacsclient.desktop
diff --git a/emacs/.local/share/applications/mimeapps.list b/emacs/.local/share/applications/mimeapps.list
new file mode 100755
index 0000000..a5853b0
--- /dev/null
+++ b/emacs/.local/share/applications/mimeapps.list
@@ -0,0 +1,7 @@
+[Default Applications]
+text/html=vivaldi-stable.desktop
+x-scheme-handler/http=vivaldi-stable.desktop
+x-scheme-handler/https=vivaldi-stable.desktop
+x-scheme-handler/about=vivaldi-stable.desktop
+x-scheme-handler/unknown=vivaldi-stable.desktop
+x-scheme-handler/org-protocol=emacsclient.desktop
diff --git a/.config/i3/config b/i3/.config/i3/config
index 71f8d4e..71f8d4e 100644
--- a/.config/i3/config
+++ b/i3/.config/i3/config
diff --git a/.procmailrc b/procmail/.procmailrc
index 99a57fb..99a57fb 100644
--- a/.procmailrc
+++ b/procmail/.procmailrc
diff --git a/.Xmodmap b/xorg/.Xmodmap
index 2ff5a51..2ff5a51 100644
--- a/.Xmodmap
+++ b/xorg/.Xmodmap
diff --git a/.Xmodmap-pckeyboard_fix b/xorg/.Xmodmap-pckeyboard_fix
index a89845d..a89845d 100644
--- a/.Xmodmap-pckeyboard_fix
+++ b/xorg/.Xmodmap-pckeyboard_fix
diff --git a/.Xresources b/xorg/.Xresources
index 0315c2e..3903541 100644
--- a/.Xresources
+++ b/xorg/.Xresources
@@ -1,4 +1,5 @@
 Xcursor.size: 16
+Xft.dpi:       96
 
 ! Ctrl+Shift+C and Ctrl+Shift+V for Copy and Paste (using CLIPBOARD)
 xterm*VT100.Translations: #override Ctrl Shift <Key>V: insert-selection(CLIPBOARD) \n Ctrl Shift <Key>C: copy-selection(CLIPBOARD)
diff --git a/.zshrc b/zsh/.zshrc
index 6b9249c..cc6921d 100644
--- a/.zshrc
+++ b/zsh/.zshrc
@@ -54,6 +54,7 @@ ZSH=~/.oh-my-zsh
 source $ZSH/oh-my-zsh.sh
 
 export RUST_SRC_PATH="$HOME/Code/rust-lang/src"
+source $HOME/.cargo/env
 
 export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/games"
 export MANPATH="/usr/local/man:$MANPATH"
@@ -83,7 +84,7 @@ alias ducks='du -cks * |sort -rn |head -11'
 source /usr/local/bin/virtualenvwrapper.sh
 
 # emacsclient is a script located in ~/bin
-alias emacs='emacsclient -nw'
+alias emacs='emacsclient'
 
 alias dc='docker-compose'
 
@@ -95,3 +96,11 @@ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 export GPG_TTY=$(tty)
 export COMPOSE_HTTP_TIMEOUT=600
 export DOCKER_CLIENT_TIMEOUT=120
+
+show_virtual_env() {
+  if [ -n "$VIRTUAL_ENV" ]; then
+    echo "($(basename $VIRTUAL_ENV))"
+  fi
+}
+
+PS1='$(show_virtual_env)'$PS1