From d4c2e3d2cf13f1bed2e8a41a8cac46f95c52c619 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sat, 18 Jul 2020 22:40:38 +0000
Subject: [PATCH] Fix several issues related to fresh install

---
 .config/bspwm/bspwmrc    |  3 ++-
 .config/nixpkgs/home.nix | 17 +++++++++++++++--
 .config/sxhkd/sxhkdrc    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 1096a98..8fae2eb 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-p='picom sxhkd polybar'
+p='picom sxhkd polybar dunst'
 for i in $p; do pkill "$i"; done
 
 sxhkd &
+dunst &
 
 monitors=$(xrandr | grep -swc 'connected')
 
diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix
index 25d5b9b..ac27faa 100644
--- a/.config/nixpkgs/home.nix
+++ b/.config/nixpkgs/home.nix
@@ -12,11 +12,13 @@
       awscli2
       bandwhich
       bat
+      bind
       chromium
       direnv
+      dunst
       exa
       fd
-      firefox-devedition-bin
+      firefox
       fzf
       gimp
       git
@@ -48,14 +50,15 @@
       signal-desktop
       slack
       spotify
+      starship
       terraform
-      terraform-docs
       terraform-lsp
       tflint
       tmux
       tree
       unzip
       vlc
+      vscode
       youtube-dl
       zathura
       zip
@@ -112,6 +115,9 @@
 
       localVariables = {
         ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
+        ZSH_DISABLE_COMPFIX = "true";
+        DISABLE_UNTRACKED_FILES_DIRTY="true";
+        CASE_SENSITIVE="true";
       };
 
       initExtra = ''
@@ -125,6 +131,8 @@
         eval "$(direnv hook zsh)"
         eval "$(_RFD_COMPLETE=source_zsh rfd)"
         eval "$(starship init zsh)"
+
+        setopt noincappendhistory
       '';
 
       shellAliases = {
@@ -201,6 +209,11 @@
         set tabstop=2
         set wildmenu
 
+        " Remember line number
+        if has("autocmd")
+          au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
+        endif
+
         " Search down into subfolders
         " Provides tab-completion for all file-related tasks
         set path+=**
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index a1bd69b..afc641e 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -8,7 +8,7 @@ super + Return
 
 # program launcher
 super + d
-	dmenu_run
+	rofi -show run
 
 # make sxhkd reload its configuration files:
 super + Escape