summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bash/.bashrc3
-rw-r--r--bin/.local/bin/MIMEmbellish0
-rwxr-xr-xbin/.local/bin/downloads (renamed from bin/bin/downloads)0
-rwxr-xr-xbin/.local/bin/keyboard (renamed from bin/bin/keyboard)0
-rwxr-xr-xbin/.local/bin/monitor (renamed from bin/bin/monitor)0
-rwxr-xr-xbin/.local/bin/password (renamed from bin/bin/password)0
-rwxr-xr-xbin/.local/bin/references (renamed from bin/bin/references)0
-rwxr-xr-xbin/.local/bin/run (renamed from bin/bin/run)0
-rwxr-xr-xbin/.local/bin/tldr (renamed from bin/bin/tldr)0
-rwxr-xr-xbin/.local/bin/tmux_attach (renamed from bin/bin/tmux_attach)0
-rwxr-xr-xbin/.local/bin/workspace (renamed from bin/bin/workspace)2
-rw-r--r--zsh/.zshenv2
-rw-r--r--zsh/.zshrc4
13 files changed, 7 insertions, 4 deletions
diff --git a/bash/.bashrc b/bash/.bashrc
index a8153ac..542ce53 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -11,4 +11,5 @@ fi
# FZF
[ -f ~/.fzf.bash ] && source ~/.fzf.bash
-source ~/.zgen/urbainvaes/fzf-marks-master/fzf-marks.plugin.bash
+FZF_MARKS_PLUGIN=$HOME/Dropbox/projects/fzf-marks/fzf-marks.plugin.bash
+[ -f "$FZF_MARKS_PLUGIN" ] && source "$FZF_MARKS_PLUGIN"
diff --git a/bin/.local/bin/MIMEmbellish b/bin/.local/bin/MIMEmbellish
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/.local/bin/MIMEmbellish
diff --git a/bin/bin/downloads b/bin/.local/bin/downloads
index dfbbd98..dfbbd98 100755
--- a/bin/bin/downloads
+++ b/bin/.local/bin/downloads
diff --git a/bin/bin/keyboard b/bin/.local/bin/keyboard
index 11b13d1..11b13d1 100755
--- a/bin/bin/keyboard
+++ b/bin/.local/bin/keyboard
diff --git a/bin/bin/monitor b/bin/.local/bin/monitor
index ce12c04..ce12c04 100755
--- a/bin/bin/monitor
+++ b/bin/.local/bin/monitor
diff --git a/bin/bin/password b/bin/.local/bin/password
index eae4be6..eae4be6 100755
--- a/bin/bin/password
+++ b/bin/.local/bin/password
diff --git a/bin/bin/references b/bin/.local/bin/references
index 46ff41e..46ff41e 100755
--- a/bin/bin/references
+++ b/bin/.local/bin/references
diff --git a/bin/bin/run b/bin/.local/bin/run
index 43f83ab..43f83ab 100755
--- a/bin/bin/run
+++ b/bin/.local/bin/run
diff --git a/bin/bin/tldr b/bin/.local/bin/tldr
index 9e12f41..9e12f41 100755
--- a/bin/bin/tldr
+++ b/bin/.local/bin/tldr
diff --git a/bin/bin/tmux_attach b/bin/.local/bin/tmux_attach
index 25d8f12..25d8f12 100755
--- a/bin/bin/tmux_attach
+++ b/bin/.local/bin/tmux_attach
diff --git a/bin/bin/workspace b/bin/.local/bin/workspace
index 7f94ff1..3685b90 100755
--- a/bin/bin/workspace
+++ b/bin/.local/bin/workspace
@@ -13,7 +13,7 @@ workspaces=$(i3-msg -t get_workspaces | awk 'BEGIN {
act_on_container() {
# Get desired workspace
- [[ -z $2 ]] && target=$(echo "$workspaces" | awk '{print $2}' | dmenu -i -p "Select workspace: ") || target=$2
+ [[ -z $2 ]] && target=$(echo "$workspaces" | awk '{print $2}' | dmenu -i -p "Select workspace") || target=$2
# Exit if empty
[[ -z $target ]] && exit
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 5db58ac..0c30d7c 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -2,7 +2,7 @@ export EDITOR=nvim
export VISUAL=nvim
# Export PATH without repetitions
-export -U PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin:$HOME/.gem/ruby/2.5.0/bin:/usr/lib/surfraw${PATH:+:}$PATH"
+export -U PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin:$HOME/.gem/ruby/2.5.0/bin:/usr/lib/surfraw${PATH:+:}$PATH"
# Python startup file
export PYTHONSTARTUP="$HOME/.pythonrc"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 96a86d3..16327cf 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -59,10 +59,12 @@ fi
[ ! -d ~/.zsh/zgen ] && git clone https://github.com/tarjoilija/zgen.git ~/.zsh/zgen
source "$HOME/.zsh/zgen/zgen.zsh"
+FZF_MARKS_PLUGIN_ZSH=$HOME/Dropbox/projects/fzf-marks/fzf-marks.plugin.zsh
+[ -f "$FZF_MARKS_PLUGIN_ZSH" ] && source "$FZF_MARKS_PLUGIN_ZSH"
+
if ! zgen saved; then
echo "Creating a zgen save"
zgen load rupa/z
- zgen load urbainvaes/fzf-marks
zgen load zsh-users/zsh-completions src
zgen load zsh-users/zsh-syntax-highlighting
zgen load zsh-users/zsh-autosuggestions