fzf improvements

modules/darwin/alacritty.nix

@@ -5,6 +5,7 @@
     programs.alacritty.settings = {
       font.size = lib.mkForce 20.0;
       shell.program = "${pkgs.fish}/bin/fish";
+      window.startup_mode = "SimpleFullScreen";
       key_bindings = [
         {
           key = "F";

modules/darwin/hammerspoon.nix

@@ -8,7 +8,7 @@
 
   homebrew.casks = [ "hammerspoon" ];
 
-  system.activationScripts.hammerspoon.text = ''
+  system.activationScripts.postUserActivation.text = ''
     defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
   '';
 

modules/darwin/homebrew.nix

@@ -1,7 +1,16 @@
 { config, ... }: {
 
   # Homebrew - Mac-specific packages that aren't in Nix
-  # Requires Homebrew to be installed (works if you rebuild twice)
+
+  # Requires Homebrew to be installed
+  system.activationScripts.preUserActivation.text = ''
+    if ! xcode-select --version 2>/dev/null; then
+      $DRY_RUN_CMD xcode-select --install
+    fi
+    if ! /usr/local/bin/brew --version 2>/dev/null; then
+      $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    fi
+  '';
 
   homebrew = {
     enable = true;
@@ -32,22 +41,6 @@
 
     programs.fish.shellAbbrs.t = "trash";
 
-    home.activation = {
-
-      # Always install homebrew if it doesn't exist
-      installHomeBrew =
-        config.home-manager.users.${config.user}.lib.dag.entryAfter
-        [ "writeBoundary" ] ''
-          if ! xcode-select --version 2>/dev/null; then
-            $DRY_RUN_CMD xcode-select --install
-          fi
-          if ! /usr/local/bin/brew --version 2>/dev/null; then
-            $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          fi
-        '';
-
-    };
-
   };
 
 }

modules/darwin/tmux.nix

@@ -101,11 +101,11 @@
     };
 
     programs.alacritty.settings = {
-      shell.args = [
-        "--login"
-        "--init-command"
-        "tmux attach-session -t noah || tmux new-session -s noah"
-      ];
+      # shell.args = [
+      #   "--login"
+      #   "--init-command"
+      #   "tmux attach-session -t noah || tmux new-session -s noah"
+      # ];
       key_bindings = [
         {
           key = "H";

modules/shell/fish/functions/search-and-edit.fish

@@ -1,18 +1,20 @@
-set vimfile (
+set vimfile ( \
     rg \
       --color=always \
       --line-number \
       --no-heading \
       --smart-case \
-      --iglob !/Library/** \
-      --iglob !/System/** \
+      --iglob "!/Library/**" \
+      --iglob "!/System/**" \
       --iglob "!Users/$HOME/Library/*" \
+      ".*" \
     | fzf --ansi \
+        --height "80%" \
         --color "hl:-1:underline,hl+:-1:underline:reverse" \
         --delimiter : \
         --preview 'bat --color=always {1} --highlight-line {2}' \
         --preview-window 'up,60%,border-bottom,+{2}+3/3,~3'
 )
-and set vimfile (echo $vimfile | tr -d '\r')
+and set vimfile (echo $vimfile | tr -d '\r' | cut -d':' -f1)
 and commandline -r "vim $vimfile"
 and commandline -f execute

modules/shell/fzf.nix

@@ -16,8 +16,9 @@
                     --hidden \
                     --exclude ".local/**" \
                     "^.git\$" \
+                | xargs dirname \
                 | fzf)
-            and cd ${config.homePath}/dev/personal/$projdir
+            and cd $projdir
             and commandline -f execute
           '';
         };