From 74cadfd80fd5f88bfa2481994c7f6c450339bcf5 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 24 Oct 2024 13:35:30 +0200
Subject: [PATCH 1/4] Common: enable eza

---
 roles/common/programs/default.nix | 1 +
 roles/common/programs/eza.nix     | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 roles/common/programs/eza.nix

diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index d4428e5..48b27ba 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -14,6 +14,7 @@
     ./direnv.nix
     ./atuin.nix
     ./fish.nix
+    ./eza.nix
   ];
   # Some programs dont have a programs.*.enable option, so I install their package here
   environment.systemPackages = with pkgs; [
diff --git a/roles/common/programs/eza.nix b/roles/common/programs/eza.nix
new file mode 100644
index 0000000..4d36553
--- /dev/null
+++ b/roles/common/programs/eza.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  home-manager = {
+    users.toast.programs.eza = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+  };
+}

From f58fdb8d49f1db1d7c4544ce835f1589e672761c Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 24 Oct 2024 13:50:48 +0200
Subject: [PATCH 2/4] Flake: add non-flake inputs

---
 flake.lock | 17 +++++++++++++++++
 flake.nix  | 15 +++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 93650c0..de04455 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,6 +56,22 @@
         "type": "github"
       }
     },
+    "eza-themes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726839736,
+        "narHash": "sha256-dd9KBb3Upg+x/4ImQwSwKWtDHyfk/29zLkmrVgHVsh0=",
+        "owner": "eza-community",
+        "repo": "eza-themes",
+        "rev": "302f4783dcd84a8221f1da8223d1ea0885fd26e3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "eza-community",
+        "repo": "eza-themes",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -553,6 +569,7 @@
         "agenix": "agenix",
         "catppuccin": "catppuccin",
         "catppuccin-vsc": "catppuccin-vsc",
+        "eza-themes": "eza-themes",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
         "jovian": "jovian",
diff --git a/flake.nix b/flake.nix
index f6accae..2832d46 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,10 +68,6 @@
 
     catppuccin.url = "github:catppuccin/nix";
 
-    lix = {
-      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-      flake = false;
-    };
     lix-module = {
       url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs-raw";
@@ -87,6 +83,17 @@
       url = "github:Infinidoge/nix-minecraft";
       inputs.nixpkgs.follows = "nixpkgs-raw";
     };
+
+    # Non flake inputs / random things
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
+    };
+
+    eza-themes = {
+      url = "github:eza-community/eza-themes";
+      flake = false;
+    };
   };
 
   outputs = {...} @ inputs:

From 67716baa547e7873f51971a5894d55aaa8261fdc Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 24 Oct 2024 14:07:32 +0200
Subject: [PATCH 3/4] Common/eza: enable git and icon support

---
 roles/common/programs/eza.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/roles/common/programs/eza.nix b/roles/common/programs/eza.nix
index 4d36553..23502f6 100644
--- a/roles/common/programs/eza.nix
+++ b/roles/common/programs/eza.nix
@@ -1,8 +1,12 @@
 {pkgs, ...}: {
   home-manager = {
-    users.toast.programs.eza = {
-      enable = true;
-      enableBashIntegration = true;
+    users.toast = {
+      programs.eza = {
+        enable = true;
+        enableBashIntegration = true;
+        git = true;
+        icons = "auto";
+      };
     };
   };
 }

From 582ac7314a7a8494aef20790fd64709f4a9d079e Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 24 Oct 2024 14:07:49 +0200
Subject: [PATCH 4/4] Common/eza: use catppuccin theme

---
 roles/common/programs/eza.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/common/programs/eza.nix b/roles/common/programs/eza.nix
index 23502f6..7e904e6 100644
--- a/roles/common/programs/eza.nix
+++ b/roles/common/programs/eza.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{flakeSelf, ...}: {
   home-manager = {
     users.toast = {
       programs.eza = {
@@ -7,6 +7,7 @@
         git = true;
         icons = "auto";
       };
+      xdg.configFile."eza/theme.yml".source = "${flakeSelf.inputs.eza-themes}/themes/catppuccin.yml";
     };
   };
 }