Justfile

@@ -5,9 +5,6 @@ deployhome:
   # Impure is required for NixGL with proprietary Nvidia drivers :(
   home-manager switch --impure -b bak --flake .
 
-deployhomefr:
-  home-manager switch --refresh --impure -b bak --flake .
-
 update:
   nix flake update
 

home/profile/default.nix

@@ -14,7 +14,7 @@
       SUDO_EDITOR = "${EDITOR}";
     };
 
-    shellAbbrs = {
+    shellAliases = {
       c = "clear";
       e = "${config.home.sessionVariables.EDITOR}";
       v = "${config.home.sessionVariables.EDITOR}";

home/programs/fzf.nix

@@ -1,12 +1,4 @@
 { lib, config, ... }:
-let
-  has-ripgrep = config.programs.ripgrep.enable;
-  has-fd = config.programs.fd.enable;
-  has-eza = config.programs.eza.enable;
-  has-bat = config.programs.bat.enable;
-  has-tmux = config.programs.tmux.enable;
-  has-delta = config.programs.git.delta.enable;
-in
 {
   programs.fzf = {
     enable = true;
@@ -23,22 +15,23 @@ in
       "--preview-window='border-sharp'"
     ];
 
-    defaultCommand = lib.mkIf has-ripgrep "rg --files --hidden --glob \"!.git\"";
+    # TODO: Check that rg is installed.
+    defaultCommand = "rg --files --hidden --glob \"!.git\"";
 
-    changeDirWidgetCommand = lib.mkIf has-fd "fd --type d";
+    # TODO: Check that fd is installed.
-    changeDirWidgetOptions = lib.mkIf has-eza [
+    changeDirWidgetCommand = "fd --type d";
+    changeDirWidgetOptions = lib.mkIf config.programs.eza.enable [
       "--preview 'eza --all --color=always --sort=name --group-directories-first --level=3 {}'"
     ];
 
-    fileWidgetCommand = lib.mkIf has-fd "fd --type f";
+    # TODO: Check that fd is installed.
-    fileWidgetOptions = lib.mkIf has-bat [
+    fileWidgetCommand = "fd --type f";
+    fileWidgetOptions = lib.mkIf config.programs.bat.enable [
       "--preview 'bat {}'"
     ];
 
-    tmux.enableShellIntegration = lib.mkIf has-tmux true;
+    tmux.enableShellIntegration = lib.mkIf config.programs.tmux.enable true;
   };
 
-  home.sessionVariables = lib.mkIf has-delta {
+  home.sessionVariables.fzf_diff_highlighter = "delta --paging=never --features=arctic-fox";
-    fzf_diff_highlighter = "delta --paging=never --features=arctic-fox";
-  };
 }

home/programs/lazygit.nix

@@ -1,7 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
-let
-  has-delta = config.programs.git.delta.enable;
-in
 {
   programs.lazygit = {
     enable = true;
@@ -11,14 +8,11 @@ in
 
       git.paging = {
         colorArg = "always";
-        pager = lib.mkIf has-delta "delta --paging=never --features=arctic-fox";
+        # TODO: only set this if delta is installed
+        pager = "delta --paging=never --features=arctic-fox";
       };
 
       os.editPreset = "nvim-remote";
     };
   };
-
-  home.shellAbbrs = {
-    lzg = "lazygit";
-  };
 }