feat(nix): migrate ripgrep settings

.dotbot.conf.yaml

@@ -56,7 +56,6 @@
     ~/.gnupg/gpg.conf: gpg/gpg.conf
     ~/.hammerspoon: hammerspoon
     ~/.pandoc: pandoc
-    ~/.ripgreprc: search/ripgrep
     ~/.tmux-cht-command: tmux/tmux-cht-command
     ~/.tmux-cht-languages: tmux/tmux-cht-languages
     ~/.tmux.conf: tmux/tmux.conf

fish/config.fish

@@ -48,7 +48,7 @@ end
 set --export XDG_CONFIG_HOME "$HOME/.config"
 
 set --export KEYTIMEOUT 1
-set --export RIPGREP_CONFIG_PATH $HOME/.ripgreprc
+set --export RIPGREP_CONFIG_PATH $HOME/.config/ripgrep/ripgreprc
 set --export GIT_EDITOR nvim
 set --export EDITOR nvim
 
@@ -96,6 +96,7 @@ if test -f $nix_path
 end
 
 set --export PATH /run/current-system/sw/bin $PATH
+set --export PATH /etc/profiles/per-user/$USER/bin $PATH
 
 # Zoxide
 zoxide init fish | source
@@ -211,6 +212,9 @@ alias mux tmuxinator
 alias ms 'mux start'
 alias ta 'tmux attach'
 
+# Nix
+alias nxs 'darwin-rebuild switch --flake ~/.dotfiles/nix'
+
 # Bat
 alias cat bat
 

nix/README.md

@@ -7,7 +7,13 @@ This is my folder where I migrate my current dotfile setup to [Nix](https://nixo
 
 ```sh
 # First time install
-nix run nix-darwin -- switch --flake ~/.config/nix-darwin
+nix run nix-darwin -- switch --flake ~/.dotfiles/nix
+```
+
+By default the `$hostname` that matches the current machine is used, but it is possible to manually load one by running:
+
+```sh
+nix run nix-darwin -- switch --flake ~/.dotfiles/nix#mac-mini
 ```
 
 Make sure this is added to your path:

nix/home/default.nix

@@ -6,6 +6,7 @@ in
 {
   # https://nix-community.github.io/home-manager/options.html
   imports = [
+    ./ripgrep
     ./skhd
     ./yabai
   ];
@@ -23,11 +24,6 @@ in
     # environment.
     home.packages = with pkgs; [
       nixpkgs-fmt
-      ripgrep
     ];
-
-    home.sessionVariables = {
-      EDITOR = "vim";
-    };
   };
 }

nix/home/ripgrep/default.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  home.file.".config/ripgrep/ripgreprc" = {
+    source = ./ripgreprc;
+  };
+
+  programs.ripgrep = {
+    enable = true;
+  };
+}

nix/home/ripgrep/ripgreprc

@@ -1,9 +1,9 @@
 --max-columns-preview
 
---type-add 
+--type-add
 web:*.{html,css,js,jsx,ts,tsx}*
 
---type-add 
+--type-add
 text:*.{md,mdx,txt}*
 
 --glob=!git/*

zsh/zshrc

@@ -14,7 +14,7 @@ export SSH_AUTH_SOCK=$HOME/Library/Containers/com.maxgoedjen.Secretive.SecretAge
 export XDG_CONFIG_HOME="$HOME/.config"
 
 export KEYTIMEOUT=1
-export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
+export RIPGREP_CONFIG_PATH=$HOME/.config/ripgrep/ripgreprc
 export GIT_EDITOR=nvim
 export EDITOR=nvim