.gitmodules

@@ -1,6 +1,4 @@
 [submodule "fish/.config/fish/nvm-wrapper"]
 	path = fish/.config/fish/nvm-wrapper
 	url = https://github.com/passcod/nvm-fish-wrapper
-[submodule "vim/.spf13-vim"]
-	path = vim/.spf13-vim
-	url = https://github.com/spf13/spf13-vim
+

bash/.bashrc

@@ -90,7 +90,7 @@ fi
 # some more ls aliases
 alias ll='ls -alF'
 alias la='ls -A'
-alias l='ls -CF'
+alias l='ls -alh'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert

bin/bin/rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+def execute(_, code)
+  puts _.instance_eval(&code)
+rescue Errno::EPIPE
+  exit
+end
+
+single_line = ARGV.delete('-l')
+code = eval("Proc.new { #{ARGV.join(' ')} }")
+single_line ? STDIN.each { |l| execute(l.chomp, code) } : execute(STDIN.each_line, code)
+

byobu/.byobu/.ssh-agent

@@ -1 +1 @@
-/run/user/1000/keyring/ssh
+/run/user/1000/gnupg/S.gpg-agent.ssh

byobu/.byobu/color.tmux

@@ -1,5 +0,0 @@
-BYOBU_DARK="\#6eb08d"
-BYOBU_LIGHT=black
-BYOBU_ACCENT=magenta
-BYOBU_HIGHLIGHT=red
-MONOCHROME=

byobu/.byobu/status

@@ -31,7 +31,7 @@ screen_lower_right="color network #disk_io custom #entropy raid reboot_required
 # Tmux has one status line, with 2 halves for status
 tmux_left=" #logo #distro #release #arch #session"
 # You can have as many tmux right lines below here, and cycle through them using Shift-F5
-tmux_right=" #network #disk_io #custom #entropy #raid reboot_required updates_available #apport #services mail #users uptime #ec2_cost #rcs_cost #fan_speed cpu_temp #battery #wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname #ip_address #time_utc #date time"
+tmux_right=" #network #disk_io #custom #entropy #raid reboot_required updates_available #apport #services #mail #users uptime #ec2_cost #rcs_cost #fan_speed cpu_temp #battery #wifi_quality processes load_average cpu_count cpu_freq memory #swap #disk #whoami hostname #ip_address #time_utc #date time"
 #tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost fan_speed cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time"
 #tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time"
 #tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime #ec2_cost #rcs_cost fan_speed cpu_temp #battery #wifi_quality #processes #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time"

byobu/.gitignore

@@ -0,0 +1 @@
+.byobu/color.tmux

fish/.config/fish/.gitignore

@@ -0,0 +1,2 @@
+fishd.*
+fish_history

fish/.config/fish/config.fish

@@ -14,7 +14,7 @@ if test -d /usr/local/go
   set -x GOPATH (/usr/local/go/bin/go env GOPATH)
 end
 
-set user_paths ~/bin /usr/local/go/bin ~/.yarn/bin $GOPATH/bin ~/.local/bin ~/.cargo/bin /snap/bin
+set user_paths ~/bin /usr/local/go/bin ~/.yarn/bin $GOPATH/bin ~/.local/bin ~/.cargo/bin /snap/bin ~/.fzf/bin
 for path in $user_paths
   if test -d $path
     set -x fish_user_paths $fish_user_paths $path
@@ -22,7 +22,12 @@ for path in $user_paths
 end
 
 set -x SSH_AGENT_PID ""
-set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+if test -S $HOME/.gnupg/S.gpg-agent
+  set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
+  set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent
+else
+  set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+end
 
 set -x BBJ_USER $USER