stuf

14 files changed, 133 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 59b9ee0..a34737e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ clean: uninstall_emacs uninstall_spacemacs \
        uninstall_vim uninstall_x uninstall_zsh \
        uninstall_basics
 
-.PHONY: emacs spacemacs git i3wm vim x zsh basics
+.PHONY: emacs spacemacs git i3wm vim x zsh fish basics
 
 emacs:
 	stow -t ~ emacs
@@ -21,6 +21,8 @@ x:
 	stow -t ~ x
 zsh:
 	stow -t ~ zsh
+fish:
+	stow -t ~ fish
 basics:
 	stow -t ~ basics
 
@@ -38,5 +40,7 @@ uninstall_x:
 	stow -Dt ~ x
 uninstall_zsh:
 	stow -Dt ~ zsh
+uninstall_fish:
+	stow -Dt ~ fish
 uninstall_basics:
 	stow -Dt ~ basics
diff --git a/fish/.config/fish/conf.d/omf.fish b/fish/.config/fish/conf.d/omf.fish
new file mode 100644
index 0000000..df4a93b
--- /dev/null
+++ b/fish/.config/fish/conf.d/omf.fish
@@ -0,0 +1,8 @@
+# Path to Oh My Fish install.
+set -gx OMF_PATH '/home/peter/dotfiles/fish/.local/share/omf'
+
+# Customize Oh My Fish configuration path.
+set -gx OMF_CONFIG '/home/peter/dotfiles/fish/.config/omf'
+
+# Load Oh My Fish configuration.
+source $OMF_PATH/init.fish
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
new file mode 100644
index 0000000..ebbc9d7
--- /dev/null
+++ b/fish/.config/fish/config.fish
@@ -0,0 +1 @@
+eval (python -m virtualfish)
diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
new file mode 100644
index 0000000..ca514db
--- /dev/null
+++ b/fish/.config/fish/fish_variables
@@ -0,0 +1,48 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_classic_git_prompt_initialized:\x1d
+SETUVAR __fish_init_2_39_8:\x1d
+SETUVAR __fish_init_2_3_0:\x1d
+SETUVAR budspencer_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
+SETUVAR budspencer_cursors:\x5c033\x5d12\x3b\x23268bd2\x5c007\x1e\x5c033\x5d12\x3b\x23b58900\x5c007\x1e\x5c033\x5d12\x3b\x23af005f\x5c007\x1e\x5c033\x5d12\x3b\x236c71c4\x5c007
+SETUVAR budspencer_day:000000\x1e333333\x1e666666\x1effffff\x1effff00\x1eff6600\x1eff0000\x1eff0033\x1e3300ff\x1e00aaff\x1e00ffff\x1e00ff00
+SETUVAR budspencer_night:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
+SETUVAR budspencer_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
+SETUVAR budspencer_pwdstyle:short\x1elong\x1enone
+SETUVAR budspencer_sessions_active:\x1d
+SETUVAR budspencer_sessions_active_pid:\x1d
+SETUVAR chain_links:chain\x2elinks\x2eroot\x1echain\x2elinks\x2ejobs\x1echain\x2elinks\x2epwd\x1echain\x2elinks\x2evcs_branch\x1echain\x2elinks\x2evcs_dirty\x1echain\x2elinks\x2evcs_stashed
+SETUVAR dangerous_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
+SETUVAR dangerous_pwdstyle:short\x1elong\x1enone
+SETUVAR dangerous_sessions_active:\x1d
+SETUVAR dangerous_sessions_active_pid:\x1d
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:5f87ff
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:00875f
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:bcbcbc
+SETUVAR fish_color_error:red\x1e\x2d\x2dbold
+SETUVAR fish_color_escape:cyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:cyan
+SETUVAR fish_color_match:cyan
+SETUVAR fish_color_normal:5f5f5f
+SETUVAR fish_color_operator:cyan
+SETUVAR fish_color_param:5f87ff
+SETUVAR fish_color_quote:brown
+SETUVAR fish_color_redirection:normal
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dpurple
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:cyan
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:\x1d
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:555\x1eyellow
+SETUVAR fish_pager_color_prefix:cyan
+SETUVAR fish_pager_color_progress:cyan
+SETUVAR fish_user_abbreviations:\x1d
+SETUVAR yimmy_solarized:true
diff --git a/fish/.config/fish/fishd.DankPad b/fish/.config/fish/fishd.DankPad
new file mode 100644
index 0000000..529e8e2
--- /dev/null
+++ b/fish/.config/fish/fishd.DankPad
@@ -0,0 +1,48 @@
+# This file is automatically generated by the fish.
+# Do NOT edit it directly, your changes will be overwritten.
+SET __fish_classic_git_prompt_initialized:\x1d
+SET __fish_init_2_39_8:\x1d
+SET __fish_init_2_3_0:\x1d
+SET budspencer_colors:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
+SET budspencer_cursors:\x5c033\x5d12\x3b\x23268bd2\x5c007\x1e\x5c033\x5d12\x3b\x23b58900\x5c007\x1e\x5c033\x5d12\x3b\x23af005f\x5c007\x1e\x5c033\x5d12\x3b\x236c71c4\x5c007
+SET budspencer_day:000000\x1e333333\x1e666666\x1effffff\x1effff00\x1eff6600\x1eff0000\x1eff0033\x1e3300ff\x1e00aaff\x1e00ffff\x1e00ff00
+SET budspencer_night:000000\x1e083743\x1e445659\x1efdf6e3\x1eb58900\x1ecb4b16\x1edc121f\x1eaf005f\x1e6c71c4\x1e268bd2\x1e2aa198\x1e859900
+SET budspencer_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
+SET budspencer_pwdstyle:short\x1elong\x1enone
+SET budspencer_sessions_active:\x1d
+SET budspencer_sessions_active_pid:\x1d
+SET chain_links:chain\x2elinks\x2eroot\x1echain\x2elinks\x2ejobs\x1echain\x2elinks\x2epwd\x1echain\x2elinks\x2evcs_branch\x1echain\x2elinks\x2evcs_dirty\x1echain\x2elinks\x2evcs_stashed
+SET dangerous_nocmdhist:c\x1ed\x1ell\x1els\x1em\x1es
+SET dangerous_pwdstyle:short\x1elong\x1enone
+SET dangerous_sessions_active:\x1d
+SET dangerous_sessions_active_pid:\x1d
+SET fish_color_autosuggestion:555\x1ebrblack
+SET fish_color_cancel:\x2dr
+SET fish_color_command:5f87ff
+SET fish_color_comment:red
+SET fish_color_cwd:00875f
+SET fish_color_cwd_root:red
+SET fish_color_end:bcbcbc
+SET fish_color_error:red\x1e\x2d\x2dbold
+SET fish_color_escape:cyan
+SET fish_color_history_current:\x2d\x2dbold
+SET fish_color_host:cyan
+SET fish_color_match:cyan
+SET fish_color_normal:5f5f5f
+SET fish_color_operator:cyan
+SET fish_color_param:5f87ff
+SET fish_color_quote:brown
+SET fish_color_redirection:normal
+SET fish_color_search_match:\x2d\x2dbackground\x3dpurple
+SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SET fish_color_status:red
+SET fish_color_user:cyan
+SET fish_color_valid_path:\x2d\x2dunderline
+SET fish_greeting:\x1d
+SET fish_key_bindings:fish_vi_key_bindings
+SET fish_pager_color_completion:normal
+SET fish_pager_color_description:555\x1eyellow
+SET fish_pager_color_prefix:cyan
+SET fish_pager_color_progress:cyan
+SET fish_user_abbreviations:\x1d
+SET yimmy_solarized:true
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
new file mode 120000
index 0000000..4816b7d
--- /dev/null
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -0,0 +1 @@
+/home/peter/dotfiles/fish/.local/share/omf/themes/bobthefish/fish_prompt.fish
\ No newline at end of file
diff --git a/fish/.config/fish/functions/ls.fish b/fish/.config/fish/functions/ls.fish
new file mode 100644
index 0000000..88461a1
--- /dev/null
+++ b/fish/.config/fish/functions/ls.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 0
+function ls --description 'alias ls exa'
+	exa  $argv;
+end
diff --git a/fish/.config/omf/bundle b/fish/.config/omf/bundle
new file mode 100644
index 0000000..85bb3b6
--- /dev/null
+++ b/fish/.config/omf/bundle
@@ -0,0 +1,13 @@
+theme agnoster
+theme ays
+theme bobthefish
+theme bongnoster
+theme budspencer
+theme coffeeandcode
+theme default
+theme gentoo
+theme gianu
+theme pygmalion
+theme randomrussel
+theme separation
+theme shellder
diff --git a/fish/.config/omf/channel b/fish/.config/omf/channel
new file mode 100644
index 0000000..2bf5ad0
--- /dev/null
+++ b/fish/.config/omf/channel
@@ -0,0 +1 @@
+stable
diff --git a/fish/.config/omf/theme b/fish/.config/omf/theme
new file mode 100644
index 0000000..ff8a58d
--- /dev/null
+++ b/fish/.config/omf/theme
@@ -0,0 +1 @@
+bobthefish
diff --git a/fish/.local/share/omf b/fish/.local/share/omf
new file mode 160000
+Subproject 1069f1fac2003a532b7a2920886589e600adaf2
diff --git a/git/.gitignore_global b/git/.gitignore_global
index b79602f..28e41f3 100644
--- a/git/.gitignore_global
+++ b/git/.gitignore_global
@@ -1 +1,3 @@
 **/.idea
+**/.vscode
+**/.#*
diff --git a/i3wm/.lock.sh b/i3wm/.lock.sh
index b1c3b79..927b168 100755
--- a/i3wm/.lock.sh
+++ b/i3wm/.lock.sh
@@ -6,7 +6,7 @@ revert() {
 trap revert HUP INT TERM
 xset +dpms dpms 0 0 5
 
-ffmpeg -loglevel quiet -y -f x11grab -video_size 1920x1080 -i $DISPLAY -i ~/.rick_lock.png -filter_complex "boxblur=5:1,overlay=(main_w-overlay_w-400):(main_h-overlay_h-5)" -vframes 1 /tmp/screen.png
+ffmpeg -loglevel quiet -y -f x11grab -video_size `xdpyinfo | grep 'dimensions' | awk '{print $2}'` -i $DISPLAY -i ~/.rick_lock.png -filter_complex "boxblur=5:1,overlay=(main_w-overlay_w-400):(main_h-overlay_h-5)" -vframes 1 /tmp/screen.png
 
 #scrot -d 1 /tmp/locking_screen.png
 #convert -blur 0x8 /tmp/locking_screen.png /tmp/screen_blur.png
diff --git a/spacemacs/.emacs.d b/spacemacs/.emacs.d
-Subproject c7a103a772d808101d7635ec10f292ab9202d9e
+Subproject dc53608b65e562a49debdc226f76d6df91f92b2