refactor: cleanup cli configs

isabelroses · Apr 17, 2024 · ed59ba3 · ed59ba3
1 parent e07e3be
commit ed59ba3
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 66 deletions.
diff --git a/home/isabel/configs/cli/atuin.nix b/home/isabel/configs/cli/atuin.nix
@@ -6,25 +6,23 @@
 }: let
   inherit (lib) mkIf isModernShell;
 in {
-  config = mkIf (isModernShell osConfig) {
-    programs.atuin = {
-      enable = true;
+  programs.atuin = mkIf (isModernShell osConfig) {
+    enable = true;
 
-      enableBashIntegration = config.programs.bash.enable;
-      enableFishIntegration = config.programs.fish.enable;
-      enableZshIntegration = config.programs.zsh.enable;
-      enableNushellIntegration = config.programs.nushell.enable;
+    enableBashIntegration = config.programs.bash.enable;
+    enableFishIntegration = config.programs.fish.enable;
+    enableZshIntegration = config.programs.zsh.enable;
+    enableNushellIntegration = config.programs.nushell.enable;
 
-      flags = ["--disable-up-arrow"];
-      settings = {
-        dialect = "uk";
-        show_preview = true;
-        inline_height = 30;
-        style = "compact";
-        update_check = false;
-        sync_address = "https://atuin.isabelroses.com";
-        sync_frequency = "5m";
-      };
+    flags = ["--disable-up-arrow"];
+    settings = {
+      dialect = "uk";
+      show_preview = true;
+      inline_height = 30;
+      style = "compact";
+      update_check = false;
+      sync_address = "https://atuin.isabelroses.com";
+      sync_frequency = "5m";
     };
   };
 }
diff --git a/home/isabel/configs/cli/bat.nix b/home/isabel/configs/cli/bat.nix
@@ -2,13 +2,9 @@
   lib,
   osConfig,
   ...
-}: let
-  acceptedTypes = ["desktop" "laptop" "wsl" "lite" "hybrid"];
-in {
-  config = lib.mkIf ((lib.isAcceptedDevice osConfig acceptedTypes) && lib.isModernShell osConfig) {
-    programs.bat = {
-      enable = true;
-      catppuccin.enable = true;
-    };
+}: {
+  programs.bat = lib.mkIf (lib.isModernShell osConfig) {
+    enable = true;
+    catppuccin.enable = true;
   };
 }
diff --git a/home/isabel/configs/cli/default.nix b/home/isabel/configs/cli/default.nix
@@ -8,8 +8,9 @@
     ./freeze.nix
     ./fzf.nix
     ./hyfetch.nix
+    ./ripgrep.nix
     ./starship.nix
-    ./tealdear.nix
+    # ./tealdear.nix
     ./zoxide.nix
   ];
 }
diff --git a/home/isabel/configs/cli/eza.nix b/home/isabel/configs/cli/eza.nix
@@ -6,23 +6,21 @@
 }: let
   inherit (lib) mkIf isModernShell;
 in {
-  config = mkIf (isModernShell osConfig) {
-    programs.eza = {
-      enable = true;
-      icons = true;
+  programs.eza = mkIf (isModernShell osConfig) {
+    enable = true;
+    icons = true;
 
-      enableBashIntegration = config.programs.bash.enable;
-      enableFishIntegration = config.programs.fish.enable;
-      enableZshIntegration = config.programs.zsh.enable;
-      # enableNushellIntegration = config.programs.nushell.enable;
+    enableBashIntegration = config.programs.bash.enable;
+    enableFishIntegration = config.programs.fish.enable;
+    enableZshIntegration = config.programs.zsh.enable;
+    # enableNushellIntegration = config.programs.nushell.enable;
 
-      extraOptions = [
-        "--group"
-        "--group-directories-first"
-        "--header"
-        "--no-permissions"
-        "--octal-permissions"
-      ];
-    };
+    extraOptions = [
+      "--group"
+      "--group-directories-first"
+      "--header"
+      "--no-permissions"
+      "--octal-permissions"
+    ];
   };
 }
diff --git a/home/isabel/configs/cli/fzf.nix b/home/isabel/configs/cli/fzf.nix
@@ -3,19 +3,15 @@
   config,
   osConfig,
   ...
-}: let
-  acceptedTypes = ["desktop" "laptop" "wsl" "lite" "hybrid"];
-in {
-  config = lib.mkIf ((lib.isAcceptedDevice osConfig acceptedTypes) && lib.isModernShell osConfig) {
-    programs.fzf = {
-      enable = true;
-      catppuccin.enable = true;
+}: {
+  programs.fzf = lib.mkIf (lib.isModernShell osConfig) {
+    enable = true;
+    catppuccin.enable = true;
 
-      enableBashIntegration = config.programs.bash.enable;
-      enableZshIntegration = config.programs.zsh.enable;
-      enableFishIntegration = config.programs.fish.enable;
+    enableBashIntegration = config.programs.bash.enable;
+    enableZshIntegration = config.programs.zsh.enable;
+    enableFishIntegration = config.programs.fish.enable;
 
-      defaultOptions = ["--height=30%" "--layout=reverse" "--info=inline"];
-    };
+    defaultOptions = ["--height=30%" "--layout=reverse" "--info=inline"];
   };
 }
diff --git a/home/isabel/configs/cli/ripgrep.nix b/home/isabel/configs/cli/ripgrep.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf isModernShell;
+in {
+  programs.ripgrep = mkIf (isModernShell osConfig) {
+    enable = true;
+
+    # https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#configuration-file
+    arguments = [
+      "--max-columns=150"
+      "--max-columns-preview"
+      "--glob=!.git/*"
+      "--smart-case"
+    ];
+  };
+}
diff --git a/home/isabel/configs/cli/tealdear.nix b/home/isabel/configs/cli/tealdear.nix
@@ -3,17 +3,15 @@
   osConfig,
   ...
 }: {
-  config = lib.mkIf (lib.isModernShell osConfig) {
-    programs.tealdeer = {
-      enable = true;
-      settings = {
-        display = {
-          compact = false;
-          use_pager = true;
-        };
-
-        updates.auto_update = false;
+  programs.tealdeer = lib.mkIf (lib.isModernShell osConfig) {
+    enable = true;
+    settings = {
+      display = {
+        compact = false;
+        use_pager = true;
       };
+
+      updates.auto_update = false;
     };
   };
 }
diff --git a/home/isabel/packages/cli/shared.nix b/home/isabel/packages/cli/shared.nix
@@ -21,8 +21,7 @@ in {
         nix-output-monitor # much nicer nix build output
       ]
       ++ optionals cfg.cli.modernShell.enable [
-        ripgrep # much better and faster grep
-        vhs # programatically make gifs
+        vhs # programmatically make gifs
         glow # markdown preview
       ]
       ++ optionals stdenv.isLinux [