From f37af9701f2fd72fc7629228805d8da1f3d7e2a9 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 5 Jul 2018 09:47:46 -0500 Subject: [PATCH] Switch to Alacritty for terminal emulator, fsharp vim plugin, fix bar/fontawesome issues, add goodies for irc --- apps/alacritty/alacritty.yml | 10 +++--- apps/neovim/bindings.vim | 2 ++ apps/neovim/init.vim | 1 + de/bar/bar.bash | 5 +-- de/bar/polybar-config | 5 +-- de/bspwmrc | 3 ++ de/sxhkdrc | 6 ++-- .../arch-linux/provisioning/2-essentials.bash | 4 ++- scripts/bin/murxvt | 1 + shell/aliases | 1 + shell/bashrc | 36 +++++++++---------- 11 files changed, 43 insertions(+), 31 deletions(-) diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml index f793440..b19bd6b 100644 --- a/apps/alacritty/alacritty.yml +++ b/apps/alacritty/alacritty.yml @@ -26,8 +26,8 @@ dpi: y: 180.0 padding: - x: 30.0 - y: 30.0 + x: 24.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 diff --git a/apps/neovim/bindings.vim b/apps/neovim/bindings.vim index 8dbd3ac..649082b 100644 --- a/apps/neovim/bindings.vim +++ b/apps/neovim/bindings.vim @@ -208,3 +208,5 @@ cnoremap xnoremap < >gv +nmap ga +xmap ga diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index e4bae87..df294b9 100644 --- a/apps/neovim/init.vim +++ b/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']} diff --git a/de/bar/bar.bash b/de/bar/bar.bash index 6c61a35..6140d0f 100755 --- a/de/bar/bar.bash +++ b/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_2="Font Awesome 5 Brands" +# export BAR_ICON_FONT="Font Awesome 5 Free" +# 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)) diff --git a/de/bar/polybar-config b/de/bar/polybar-config index 75cb685..a0e949a 100644 --- a/de/bar/polybar-config +++ b/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 =  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 = 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  diff --git a/de/bspwmrc b/de/bspwmrc index 2c32843..1e571b9 100755 --- a/de/bspwmrc +++ b/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 diff --git a/de/sxhkdrc b/de/sxhkdrc index 49b51f2..4fae910 100755 --- a/de/sxhkdrc +++ b/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 diff --git a/scripts/arch-linux/provisioning/2-essentials.bash b/scripts/arch-linux/provisioning/2-essentials.bash index 4389aa4..6ee5668 100755 --- a/scripts/arch-linux/provisioning/2-essentials.bash +++ b/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` \ diff --git a/scripts/bin/murxvt b/scripts/bin/murxvt index 7668533..fa122ab 100755 --- a/scripts/bin/murxvt +++ b/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" diff --git a/shell/aliases b/shell/aliases index 85c9f13..75fe810 100644 --- a/shell/aliases +++ b/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? diff --git a/shell/bashrc b/shell/bashrc index f8a3793..2b833b8 100644 --- a/shell/bashrc +++ b/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