From 02c909ed44a29d80ab0a5b870c346ab4aeb94311 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 4 Feb 2024 12:36:43 +0000
Subject: [PATCH] Replace eza with lsd
---
system/nixos/home-manager/default.nix | 1 -
system/shared/home-manager-packages.nix | 1 -
system/shared/home-manager.nix | 2 ++
system/shared/modules/zsh.nix | 4 ++--
system/wsl2/default.nix | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/system/nixos/home-manager/default.nix b/system/nixos/home-manager/default.nix
index 075db99a..84161541 100644
--- a/system/nixos/home-manager/default.nix
+++ b/system/nixos/home-manager/default.nix
@@ -31,7 +31,6 @@ in
home.sessionVariables = {
EDITOR = "nvim";
- EXA_COLORS = "uu=38;5;255:gu=38;5;255:ur=38;5;255:uw=38;5;255:ue=38;5;255:wx=38;5;255:gr=38;5;250:gw=38;5;250:gx=38;5;250:tr=38;5;255:tw=38;5;255:tx=38;5;255:da=38;5;250:sn=32:sb=0:di=38;5;105";
LANG = "en_GB.UTF-8";
LC_ALL = "en_GB.UTF-8";
LC_CTYPE = "en_GB.UTF-8";
diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix
index 89658881..ac66e9b1 100644
--- a/system/shared/home-manager-packages.nix
+++ b/system/shared/home-manager-packages.nix
@@ -6,7 +6,6 @@ with pkgs; [
delta
dog
doppler
- eza
fd
file
gcc
diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index 2ba07e2c..720392bc 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -28,6 +28,8 @@
target = "logo.txt";
};
+ programs.lsd.enable = true;
+
programs.nnn.enable = true;
programs.direnv = {
diff --git a/system/shared/modules/zsh.nix b/system/shared/modules/zsh.nix
index f59319ef..6bd0e8e6 100644
--- a/system/shared/modules/zsh.nix
+++ b/system/shared/modules/zsh.nix
@@ -17,7 +17,7 @@
clear-ls-all() {
clear
- exa -al
+ lsd -al
}
zle -N clear-ls-all
@@ -96,7 +96,7 @@
ialias cs="create-script"
ialias daily="run create-daily next"
ialias fetch="git fetch --all --jobs=4 --progress --prune"
- ialias ls="exa -la"
+ ialias ls="lsd -la"
ialias pull="git pull --autostash --jobs=4 --summary origin"
ialias rebase="git rebase --autostash --stat"
ialias reset="git reset --hard; git clean -fd"
diff --git a/system/wsl2/default.nix b/system/wsl2/default.nix
index 919a80b0..bf60c34d 100644
--- a/system/wsl2/default.nix
+++ b/system/wsl2/default.nix
@@ -15,7 +15,6 @@ inputs.home-manager.lib.homeManagerConfiguration {
home.sessionVariables = {
EDITOR = "nvim";
- EXA_COLORS = "uu=38;5;255:gu=38;5;255:ur=38;5;255:uw=38;5;255:ue=38;5;255:wx=38;5;255:gr=38;5;250:gw=38;5;250:gx=38;5;250:tr=38;5;255:tw=38;5;255:tx=38;5;255:da=38;5;250:sn=32:sb=0:di=38;5;105";
PATH = "$PATH:./vendor/bin:./node_modules/.bin";
PULUMI_SKIP_UPDATE_CHECK = "true";
RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config";