about summary refs log tree commit diff stats
path: root/nix-conf/home/includes/common.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix-conf/home/includes/common.nix')
-rw-r--r--nix-conf/home/includes/common.nix25
1 files changed, 8 insertions, 17 deletions
diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index 960a74c..e12558c 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -8,20 +8,6 @@ let
   hcr = pkgs.callPackage ./scripts/hm-changes-report.nix { inherit config pkgs; };
   scr = pkgs.callPackage ./scripts/system-changes-report.nix { inherit config pkgs; };
   unstable = import <unstable> { };
-
-  nix-search = (
-    pkgs.buildGoModule {
-      pname = "nix-search";
-      version = "0.3.1";
-      src = pkgs.fetchFromGitHub {
-        owner = "diamondburned";
-        repo = "nix-search";
-        rev = "e616ac1c82a616fa6e6d8c94839c5052eb8c808d";
-        hash = "sha256-h9yYOjL9i/m0r5NbqMcLMFNnwSKsIgfUr5qk+47pOtc=";
-      };
-      vendorHash = "sha256-bModWDH5Htl5rZthtk/UTw/PXT+LrgyBjsvE6hgIePY=";
-    }
-  );
 in
 {
   imports = [
@@ -64,8 +50,10 @@ in
     aspellDicts.en
     aspellDicts.en-computers
     aspellDicts.en-science
+    bandwhich
     bottom
     broot
+    comma
     curl
     diff-so-fancy
     difftastic
@@ -97,6 +85,8 @@ in
     nixpkgs-review
     nvd
     pass
+    procs
+    pstree
     rage
     ripgrep
     rlwrap
@@ -111,11 +101,12 @@ in
     uni
     unzip
     w3m
+    xan
     yq
+    zip
     zstd
 
     unstable.nixfmt-rfc-style
-    unstable.wcurl
   ];
 
   programs.bat = {
@@ -140,8 +131,7 @@ in
   programs.eza = {
     enable = true;
     git = true;
-    # TODO remove when 24.11 is released
-    icons = if  builtins.substring 0 5 lib.version == "24.05" then true else "auto";
+    icons = "auto";
     enableBashIntegration = false;
     enableZshIntegration = false;
     enableFishIntegration = false;
@@ -375,6 +365,7 @@ in
 
   programs.lsd = {
     enable = true;
+    enableZshIntegration = false; # don't set aliases
     settings = {
       indicators = true;
       #layout = "oneline";