Switch to Alacritty for terminal emulator, fsharp vim plugin, fix

bar/fontawesome issues, add goodies for irc

apps/alacritty/alacritty.yml

@@ -26,8 +26,8 @@ dpi:
   y: 180.0
 
 padding:
-  x: 30.0
+  x: 24.0
-  y: 30.0
+  y: 24.0
 
 # Display tabs using this many cells (changes require restart)
 tabspaces: 2
@@ -56,12 +56,12 @@ font:
     # style: Italic
 
   # Point size of the font
-  size: 12.0
+  size: 10.0
   # Offset is the extra space around each character. offset.y can be thought of
   # as modifying the linespacing, and offset.x as modifying the letter spacing.
   offset:
     x: -5.0
-    y: -6.0
+    y: 0.0
 
   # OS X only: use thin stroke font rendering. Thin strokes are suitable
   # for retina displays, but for non-retina you probably want this set to
@@ -79,7 +79,7 @@ custom_cursor_colors: false
 colors:
   # Default colors
   primary:
-    background: '0x000000'
+    background: '0x111111'
     foreground: '0xeaeaea'
 
   # Colors the cursor will use if `custom_cursor_colors` is true

apps/neovim/bindings.vim

@@ -208,3 +208,5 @@ cnoremap <c-p> <up>
 xnoremap < <gv
 xnoremap > >gv
 
+nmap ga <Plug><EasyAlign>
+xmap ga <Plug><EasyAlign>

apps/neovim/init.vim

@@ -171,6 +171,7 @@ Plug 'hail2u/vim-css3-syntax', {'for': ['styl', 'stylus', 'sass', 'scss', 'css',
 Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'coffeescript', 'vue']}
 Plug 'posva/vim-vue', {'for': ['vue']}
 Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'ex', 'exs']}
+Plug 'fsharp/vim-fsharp', {'for': ['fs', 'fsharp']}
 Plug 'OrangeT/vim-csharp', {'for': ['cshtml', 'cshtml.html', 'cs', 'razor']}
 Plug 'vim-erlang/vim-erlang-runtime', {'for': ['erlang', 'erl']}
 " Plug 'slashmili/alchemist.vim', {'for': ['elixir', 'ex', 'exs']}

de/bar/bar.bash

@@ -7,8 +7,9 @@ export BAR_SIDE_MARGIN=200
 
 MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1)
 export BAR_FONT=$(xrdb -query | sed -ne      's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)
-export BAR_ICON_FONT="Font Awesome 5 Free"
+# export BAR_ICON_FONT="Font Awesome 5 Free"
-export BAR_ICON_FONT_2="Font Awesome 5 Brands"
+# export BAR_ICON_FONT_2="Font Awesome 5 Brands"
+export BAR_ICON_FONT="FontAwesome"
 export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)
 export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE))
 

de/bar/polybar-config

@@ -188,6 +188,7 @@ label-foreground = ${xrdb:color6}
 [module/memory]
 type = internal/memory
 interval = 2
+; format-prefix = " "
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 ; format-underline = #4bffdc
@@ -256,7 +257,7 @@ format-volume = <label-volume> <bar-volume>
 label-volume = 
 label-volume-foreground = ${colors.foreground-alt}
 
-format-muted-prefix =
+format-muted-prefix = " "
 format-muted-foreground = ${colors.foreground-alt}
 label-muted = muted
 
@@ -297,7 +298,7 @@ format-discharging = <ramp-capacity> <label-discharging>
 format-charging-prefix =
 format-charging-prefix-foreground = ${colors.foreground-alt}
 
-format-full-prefix =
+format-full-prefix = " "
 format-full-prefix-foreground = ${colors.foreground-alt}
 
 ; empty battery 

de/bspwmrc

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+source "$HOME/.bashrc"
+
 # NO_COMPTON=1
 BORDER_WIDTH=5 # change in bspwm_config, here for launcher
 START_BAR=1
@@ -21,6 +23,7 @@ fi
 
 source "$DOTFILES_PATH/de/bspwm_config"
 
+# TODO: switch to alacritty
 if command -v urxvtd >/dev/null 2>&1; then
 	urxvtd &
 fi

de/sxhkdrc

@@ -140,7 +140,7 @@ super + alt + minus
 
 # spawn a transparent node
 super + alt + t
-	urxvtc && compton-trans -c -o 0
+	alacritty && compton-trans -c -o 0
 
 # rotate the current node
 super + r
@@ -164,11 +164,11 @@ super + shift + t
 
 # spawn a terminal
 super + Return
-	urxvtc
+	alacritty
 
 # spawn a floating terminal
 super + shift + Return
-	bspc rule -a '*' -o state=floating && urxvtc -geometry 80x24
+	bspc rule -a '*' -o state=floating && alacritty --dimensions 80x24
 
 # spawn the app launcher
 super + space

scripts/arch-linux/provisioning/2-essentials.bash

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# TODO: install alacritty
+
 pacaur -S \
 	tree `# Handy Filesystem Viewing Utility` \
 	rofi `# Application Launcher` \
@@ -35,7 +37,7 @@ pacaur -S \
 	bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \
 	terminus-font ttf-monaco `# Primary Fonts` \
 	ttf-freefont `# Font` \
-	ttf-font-awesome `# Icon Font` \
+	ttf-font-awesome-4 ttf-font-awesome `# Icon Font` \
 	autocutsel `# Clipboard Helper` \
 	curl `# HTTP Utility` \
 	w3m `# Viewing Images in Terminals` \

scripts/bin/murxvt

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+# TODO: migrate to alacritty
 font="xft:Monaco:pixelsize=16"
 
 urxvtc -fb "$font" -fi "$font" -fn "$font" -letsp "-1"

shell/aliases

@@ -47,6 +47,7 @@ alias tmatt="tmux attach -t"
 alias tu="tmux attach -t utils || tmux new -s utils"
 alias tdf="tmux attach -t dotfiles || tmux new -s dotfiles -c \"\$DOTFILES_PATH\""
 alias tmon="tmux attach -t monitoring || tmux new -s monitoring"
+alias tcom="tmux attach -t comms || tmux new -s comms"
 
 # git aliases
 # TODO: make these git aliases in the gitconfig?

shell/bashrc

@@ -13,6 +13,24 @@ export NICE_HOME="$HOME"
 
 # TODO: nice home on a per-device basis
 
+# set our PATH
+source "$DOTFILES_PATH/shell/paths"
+
+# import our aliases
+source "$DOTFILES_PATH/shell/aliases"
+
+# import our global shell functions
+source "$DOTFILES_PATH/shell/shell_funcs"
+
+# import our autocompletions
+source "$DOTFILES_PATH/shell/autocompletions"
+
+# load our key binds
+bind -f "$DOTFILES_PATH/shell/inputrc"
+
+# less tab size of 2 spaces
+LESS="-x2"
+
 # stop parsing on a non-interactive shell
 [ -z "$PS1" ] && return
 
@@ -27,27 +45,9 @@ BASE16_SHELL="$DOTFILES_PATH/scripts/colors/shell"
 # allow ** recursive wildcard globbing
 shopt -s globstar
 
-# set our PATH
-source "$DOTFILES_PATH/shell/paths"
-
-# import our aliases
-source "$DOTFILES_PATH/shell/aliases"
-
-# import our global shell functions
-source "$DOTFILES_PATH/shell/shell_funcs"
-
 # import our prompt
 source "$DOTFILES_PATH/shell/prompt"
 
-# import our autocompletions
-source "$DOTFILES_PATH/shell/autocompletions"
-
-# load our key binds
-bind -f "$DOTFILES_PATH/shell/inputrc"
-
-# less tab size of 2 spaces
-LESS="-x2"
-
 # prevents binds or commands pulling from history from insta-sending, and
 # instead places them in the readline for editing
 shopt -s histverify