Merge branch 'master' of git.joshfabean.com:fabean/Dotfiles

.config/alacritty/alacritty.yml

@@ -86,6 +86,7 @@ tabspaces: 8
 font:
   # Normal (roman) font face
   #normal:
+  #family: "JetBrainsMono"
     # Font family
     #
     # Default:

.config/fish/config.fish

@@ -3,7 +3,7 @@ alias bim='nvim'
 alias ssh="ssh -A" # forward ssh keys to server
 alias cp='cp -iv' # prompt when overwriting and verbose
 alias mv='mv -iv' # prompt when overwriting and verbose
-alias ll='ls -FGlAhp'
+#alias ll='ls -FGlAhp'
 alias du1='du -h -d 1'
 alias ls='exa'
 alias gs='git status'
@@ -18,15 +18,15 @@ alias docker-stop='systemctl stop docker'
 alias mux='tmuxinator'
 
 function vpn-start
-  sudo systemctl start openvpn-client@$1
+  sudo systemctl start openvpn-client@$argv
 end
 
 function vpn-stop
-  sudo systemctl stop openvpn-client@$1
+  sudo systemctl stop openvpn-client@$argv
 end
 
 function vpn-status
-  sudo systemctl status openvpn-client@$1
+  sudo systemctl status openvpn-client@$argv
 end
 
 # my path

.config/sway/golem-sway

@@ -3,7 +3,7 @@
 set $mod Mod4
 set $alt Mod1
 
-font pango:FiraCode, FontAwesome 12, Noto
+font JetBrains Mono, FontAwesome 12
 
 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape
 
@@ -245,9 +245,14 @@ client.urgent           #dc322f #b71c1c #fdf6e3 #dc322f #dc322f
 ############################
 ## Displays
 ############################
-output DVI-D-1 pos 0 0 res 1920x1080
+#HOME
+output HDMI-A-2 pos 0 0 res 1920x1080
 output DP-1 pos 1920 0 res 1920x1200
-output DP-2 pos 3840 0 res 1920x1200
+#FFICE
+#output DVI-D-1 pos 0 0 res 1920x1080
+#output HDMI-A-1 pos 0 0 res 1920x1080
+#output DP-1 pos 1920 0 res 1920x1200
+#output DP-2 pos 3840 0 res 1920x1200
 # background images
 #output eDP-1 bg ~/Wallpapers/xp-sunrise.png stretch
 #output DP-1 bg ~/Wallpapers/xp-sunrise.png stretch

.tmux.conf

@@ -64,7 +64,11 @@ bind -n M-Left if-shell "$is_vim" "send-keys M-Left" "select-pane -L"
 bind -n M-Down if-shell "$is_vim" "send-keys M-Down" "select-pane -D"
 bind -n M-Up if-shell "$is_vim" "send-keys M-Up" "select-pane -U"
 bind -n M-Right if-shell "$is_vim" "send-keys M-Right" "select-pane -R"
-bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+#bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+
+# quick pane cycling
+unbind ^B
+bind ^B select-pane -t :.+
 
 # Split windows like Vim.
 bind v split-window -h