From 24cb2ea2c901b4cef50a2dcbd24e770f54b8538f Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sun, 5 Mar 2023 21:28:52 +0100
Subject: commandline: configure exa, expand dircolors

---
 common/commandline.nix | 64 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 25 deletions(-)

(limited to 'common/commandline.nix')

diff --git a/common/commandline.nix b/common/commandline.nix
index 74adfa2..212534e 100644
--- a/common/commandline.nix
+++ b/common/commandline.nix
@@ -1,14 +1,14 @@
-inputs:
-
-{ config, pkgs, lib, ... }:
-
-with inputs.self.lib.theme;
-let
+inputs: {
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with inputs.self.lib.theme; let
   dominantEscapeCode = fgEscapeCode config.theme.colors.dominant;
   bgDominantEscapeCode = bgEscapeCode config.theme.colors.dominant;
   backgroundEscapeCode = fgEscapeCode config.theme.colors.background;
-in
-{
+in {
   imports = [
     (import ./commandline/dircolors.nix inputs)
     (import ./commandline/git.nix inputs)
@@ -19,7 +19,7 @@ in
   ];
 
   console = {
-    packages = with pkgs; [ terminus_font ];
+    packages = with pkgs; [terminus_font];
     font = "ter-d22n";
     colors = [
       "282a2e"
@@ -43,7 +43,6 @@ in
   };
 
   environment.shellAliases = {
-    ll = "ls -l";
     e = "\${EDITOR}";
     cpr = "${pkgs.rsync}/bin/rsync -ah --inplace --info=progress2";
   };
@@ -60,22 +59,20 @@ in
     };
   };
 
-  security.sudo.extraConfig =
-    let
-      lectureFile = builtins.toFile "sudoers.lecture" ''
-        
-             ${dominantEscapeCode}"Bee" careful    __
-               ${dominantEscapeCode}with sudo!    // \
-                             \\_/ //
-           '''-.._.-'''-.._.. -(||)(')
-                             ''''
+  security.sudo.extraConfig = let
+    lectureFile = builtins.toFile "sudoers.lecture" ''
+      
+           ${dominantEscapeCode}"Bee" careful    __
+             ${dominantEscapeCode}with sudo!    // \
+                           \\_/ //
+         '''-.._.-'''-.._.. -(||)(')
+                           ''''
 
-      '';
-    in
-    ''
-      Defaults lecture = always
-      Defaults lecture_file = "${lectureFile}"
     '';
+  in ''
+    Defaults lecture = always
+    Defaults lecture_file = "${lectureFile}"
+  '';
 
   home-manager.users.minijackson = {
     programs.bash.enable = true;
@@ -88,9 +85,26 @@ in
     };
 
     programs.pazi.enable = true;
+
+    programs.exa = {
+      enable = true;
+      enableAliases = true;
+    };
+
+    home.sessionVariables = {
+      EXA_COLORS = let
+        spec = set:
+          lib.concatStringsSep ":"
+          (lib.mapAttrsToList
+            (key: value: "${key}=${value}")
+            set);
+      in
+        spec {
+        };
+    };
   };
 
-  home-manager.users.root = { ... }: {
+  home-manager.users.root = {...}: {
     programs.bash.enable = true;
     programs.pazi = lib.mkDefault config.home-manager.users.minijackson.programs.pazi;
     programs.bat = lib.mkDefault config.home-manager.users.minijackson.programs.bat;
-- 
cgit v1.2.3