From 14de7c3ec52d67602ba79e25bf6c4cc094411cd7 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 5 Nov 2020 22:03:22 -0600
Subject: [PATCH] Fix some more minor bugs

---
 apps/de/sway/config         |   4 +-
 apps/neofetch/config        | 119 ------------------------------------
 apps/neovim/plugins.vim     |   1 -
 apps/shell/fish/config.fish |   2 +-
 bin/setup-dotfiles          |   2 +-
 5 files changed, 4 insertions(+), 124 deletions(-)
 delete mode 100755 apps/neofetch/config

diff --git a/apps/de/sway/config b/apps/de/sway/config
index 6ccad74..ee9fa40 100644
--- a/apps/de/sway/config
+++ b/apps/de/sway/config
@@ -21,9 +21,9 @@ input type:keyboard {
 
 bindsym $mod+control+space exec makoctl dismiss
 bindsym $mod+shift+space exec makoctl invoke
-bindsym $mod+return exec term
+bindsym $mod+return exec kitty
 bindsym $mod+shift+return exec floating-term
-bindsym $mod+t exec term
+bindsym $mod+t exec kitty
 bindsym $mod+shift+alt+return exec kitty
 bindsym $mod+c kill
 bindsym $mod+shift+c kill # TODO: kill -9?
diff --git a/apps/neofetch/config b/apps/neofetch/config
deleted file mode 100755
index f455e95..0000000
--- a/apps/neofetch/config
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env sh
-
-export LC_ALL=C
-export LANG=C
-
-print_info() {
-    info line_break
-
-    prin "Shell" "bash"
-    prin "WM" "bspwm"
-    info "Term" term
-    info "Font" font
-    info "CPU" cpu
-    info "GPU" gpu
-
-    info line_break
-    info cols
-    info line_break
-
-    # info "OS" distro
-    # info "Kernel" kernel
-    # info "Theme" theme
-    # info "Icons" icons
-    # info "Resolution" resolution
-    # info "CPU Usage" cpu_usage
-    # info "Disk" disk
-    # info "Battery" battery
-    # info "Song" song
-    # info "Local IP" localip
-    # info "Public IP" publicip
-    # info "Users" users
-    # info "Birthday" birthday
-
-		wait
-}
-
-kernel="off"
-kernel_shorthand="on"
-
-distro_shorthand="off"
-
-os_arch="on"
-
-uptime_shorthand="off"
-
-shell_path="off"
-shell_version="on"
-
-speed_type="max"
-cpu_shorthand="off"
-cpu_display="off"
-cpu_speed="on"
-cpu_cores="logical"
-cpu_temp="off"
-
-gpu_brand="on"
-refresh_rate="off"
-
-gtk_shorthand="off"
-gtk2="on"
-gtk3="on"
-
-public_ip_host="http://ident.me"
-
-song_shorthand="off"
-
-birthday_shorthand="off"
-birthday_time="on"
-birthday_format="+%a %d %b %Y %l:%M %p"
-
-colors=(distro)
-bold="on"
-underline_enabled="on"
-underline_char="-"
-
-color_blocks="on"
-block_width=5
-block_height=2
-
-progress_char_elapsed="-"
-progress_char_total="="
-
-progress_border="on"
-progress_length="15"
-progress_color_elapsed="distro"
-progress_color_total="distro"
-
-memory_display="off"
-battery_display="off"
-disk_display="on"
-
-backend="kitty"
-image_backend="kitty"
-
-image="~/.wallpaper"
-thumbnail_dir="$HOME/.cache/thumbnails/neofetch"
-crop_mode="normal"
-crop_offset="center"
-image_size="360px"
-gap=1
-yoffset=0
-xoffset=0
-background_color=
-
-ascii="distro"
-ascii_distro="auto"
-ascii_colors=(distro)
-ascii_logo_size="normal"
-ascii_bold="on"
-
-scrot="off"
-scrot_cmd="scrot -c -d 3"
-scrot_dir="$XDG_PICTURES_DIR"
-scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png"
-image_host="imgur"
-imgur_client_id="0e8b44d15e9fc95"
-
-config="on"
-config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config"
diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim
index f38ff41..9f0172a 100644
--- a/apps/neovim/plugins.vim
+++ b/apps/neovim/plugins.vim
@@ -58,7 +58,6 @@ Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']}                 " C# language
 Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']}    " moonscript language
 Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']}                 " C# language
 " Plug 'neoclide/coc.nvim', {'branch': 'release'}                 " language server interface
-Plug 'neovim/nvim-lspconfig'                                    " neovim-native language server interface
 Plug 'tpope/vim-dadbod'                                         " vim database functions
 Plug 'lytedev/elm-vim', {'for': ['elm']}                        " elm lang
 Plug 'google/vim-jsonnet', {'for': ['jsonnet', 'libsonnet']}    " jsonnet
diff --git a/apps/shell/fish/config.fish b/apps/shell/fish/config.fish
index beed80b..1bcbe59 100755
--- a/apps/shell/fish/config.fish
+++ b/apps/shell/fish/config.fish
@@ -68,6 +68,6 @@ if has_command tmux && string match -v -q '*tmux*' $TERM && string match -v -q '
 	tmux attach -t default || tmux new -s default
 end
 
-if set -q $__HM_SESS_VARS_SOURCED
+if set -q $__HM_SESS_VARS_SOURCED; and test -f $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
 	exec bash -c "source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh; exec fish"
 end
diff --git a/bin/setup-dotfiles b/bin/setup-dotfiles
index 0103ada..4600ef5 100755
--- a/bin/setup-dotfiles
+++ b/bin/setup-dotfiles
@@ -3,7 +3,7 @@
 # TODO: quiet/auto-agree mode for curl | bash automagic?
 
 dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/" && pwd)
-source "${dfp}/bin/lib/setup_helpers.bash"
+source "${dfp}/lib/setup_helpers.bash"
 
 INTERACTIVE=1