flake.lock

@@ -49,11 +49,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744793570,
+        "lastModified": 1744447794,
-        "narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=",
+        "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "192378974a131c402633bee18dc892b804a663e0",
+        "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1744513122,
+        "lastModified": 1744375210,
-        "narHash": "sha256-DPxL9yHkIvmNfpd49LeOOpT9NYrzHpgYbTO1yQg6Zh4=",
+        "narHash": "sha256-aMnp0e+oGmsZ+VC6mgrE6lUcKMjBPotLesCosejRhdw=",
         "owner": "rishabh5321",
         "repo": "grayjay-flake",
-        "rev": "84accd21a2e69709040a0eea22fccdb743c9e64c",
+        "rev": "ab754473aecde1afad07ab5a5903c9336bcb5442",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744743431,
+        "lastModified": 1744117652,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744117652,
+        "lastModified": 1743808813,
-        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
+        "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
+        "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
         "type": "github"
       },
       "original": {
@@ -272,11 +272,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1744513377,
+        "lastModified": 1744259355,
-        "narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=",
+        "narHash": "sha256-gykRJw309t5NLuYXzWw9WhJFKTc4OASmc16M9jD/Vpw=",
         "owner": "Jas-SinghFSU",
         "repo": "HyprPanel",
-        "rev": "42943b3def85d8787d703778951944c8e791202b",
+        "rev": "1d4d2dcc20ebd707d5e45c7e357acc1267a498d7",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1744440957,
+        "lastModified": 1744309437,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1744232761,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
         "type": "github"
       },
       "original": {
@@ -385,11 +385,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1744232761,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1744440957,
+        "lastModified": 1744309437,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
         "type": "github"
       },
       "original": {
@@ -462,11 +462,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1744461753,
+        "lastModified": 1743856924,
-        "narHash": "sha256-3oO3CwYmZE5P4Hp5XR5WCZbF/rj5+kF0m5sTNTMDYss=",
+        "narHash": "sha256-CgCbUGd9y639PfcuzA0TrA6O5N1ICl+mB95+qTG52+E=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a22fbed4c4784e6a9761f9a896d31da98c3117b2",
+        "rev": "d209a04d349febe85c777078ca2eeea5e8bbc8a1",
         "type": "github"
       },
       "original": {
@@ -486,11 +486,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744375525,
+        "lastModified": 1743683223,
-        "narHash": "sha256-/Wf5Ca0DmV+y+qVBDXX8HAfAvSQI6y5oE27dv6t1jXk=",
+        "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "c0e7d3bda11e2cfad692d205d82757078475957a",
+        "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
         "type": "github"
       },
       "original": {
@@ -521,11 +521,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1744682091,
+        "lastModified": 1744423915,
-        "narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=",
+        "narHash": "sha256-6Hd8VyrOlmjlDBgPpx9NwX4+/uO4gEDIyjqbQLyniwE=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a",
+        "rev": "4c4b9611c71d586ea818fa5b8dcbd81129f62560",
         "type": "github"
       },
       "original": {
@@ -591,11 +591,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1744777359,
+        "lastModified": 1744406237,
-        "narHash": "sha256-20REqJW54bbQIBuP19fcjPamV9mpWN0+RPcp5hQwwLI=",
+        "narHash": "sha256-Xbt5m3/ZNeye4b42rCZOLbD8OhCOeJfUSEJ+FvfXwpg=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "d2bb30f451ef7802aca1954a6eb75efbc4c25872",
+        "rev": "4d9ee0daab52a7a205e69cfddcd441ffaa09c802",
         "type": "github"
       },
       "original": {

shared/home-manager/default.nix

@@ -11,9 +11,13 @@ in
 {
   imports = [
     inputs.catppuccin.homeModules.catppuccin
+    ./btop.nix
+    ./cava
     ./cursors.nix
     ./default-applications.nix
     ./development
+    ./fastfetch.nix
+    ./fish.nix
     ./freetube.nix
     ./gtk.nix
     ./gpg.nix
@@ -22,8 +26,8 @@ in
     ./nextcloud.nix
     ./rofi
     ./hyprland
-    ./shell
     ./spicetify.nix
+    ./yazi
     ./zen
   ];
 

shared/home-manager/shell/default.nix

@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./btop.nix
-    ./cava
-    ./fastfetch.nix
-    ./fish.nix
-    ./yazi
-    ./zoxide.nix
-  ];
-}

shared/home-manager/shell/yazi/default.nix

@@ -1,54 +0,0 @@
-{
-  theme,
-  ...
-}:
-
-{
-  catppuccin.yazi = {
-    enable = true;
-    flavor = theme.flavor;
-    accent = "blue";
-  };
-
-  programs.yazi = {
-    enable = true;
-    settings = {
-      manager = {
-        ratio = [
-          2
-          4
-          2
-        ];
-        sort_by = "natural";
-        sort_sensitive = true;
-        sort_reverse = false;
-        sort_dir_first = true;
-        linemode = "none";
-        show_hidden = true;
-        show_symlink = true;
-      };
-
-      preview = {
-        image_filter = "lanczos3";
-        image_quality = 90;
-        tab_size = 1;
-        max_width = 600;
-        max_height = 900;
-        cache_dir = "";
-        ueberzug_scale = 1;
-        ueberzug_offset = [
-          0
-          0
-          0
-          0
-        ];
-      };
-
-      tasks = {
-        micro_workers = 5;
-        macro_workers = 10;
-        bizarre_retry = 5;
-      };
-    };
-  };
-}

shared/home-manager/shell/zoxide.nix

@@ -1,6 +0,0 @@
-{
-  programs.zoxide = {
-    enable = true;
-    enableFishIntegration = true;
-  };
-}

shared/home-manager/yazi/default.nix

@@ -0,0 +1,326 @@
+{ lib, theme, ... }:
+let
+  batTheme = ".config/yazi/catppuccin-${theme.flavor}.tmTheme";
+in
+{
+  home.file.${batTheme}.source = ./catppuccin-mocha.tmTheme;
+
+  programs.yazi = {
+    enable = true;
+    settings = {
+      manager = {
+        ratio = [
+          2
+          4
+          2
+        ];
+        sort_by = "natural";
+        sort_sensitive = true;
+        sort_reverse = false;
+        sort_dir_first = true;
+        linemode = "none";
+        show_hidden = true;
+        show_symlink = true;
+      };
+
+      preview = {
+        image_filter = "lanczos3";
+        image_quality = 90;
+        tab_size = 1;
+        max_width = 600;
+        max_height = 900;
+        cache_dir = "";
+        ueberzug_scale = 1;
+        ueberzug_offset = [
+          0
+          0
+          0
+          0
+        ];
+      };
+
+      tasks = {
+        micro_workers = 5;
+        macro_workers = 10;
+        bizarre_retry = 5;
+      };
+    };
+    theme = lib.mkForce {
+      manager = {
+        cwd = {
+          fg = "#${theme.tealAlpha}";
+        };
+
+        hovered = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.blueAlpha}";
+        };
+        preview_hovered = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.textAlpha}";
+        };
+
+        find_keyword = {
+          fg = "#${theme.yellowAlpha}";
+          italic = true;
+        };
+        find_position = {
+          fg = "#${theme.pinkAlpha}";
+          bg = "reset";
+          italic = true;
+        };
+
+        marker_copied = {
+          fg = "#${theme.greenAlpha}";
+          bg = "#${theme.greenAlpha}";
+        };
+        marker_cut = {
+          fg = "#${theme.redAlpha}";
+          bg = "#${theme.redAlpha}";
+        };
+        marker_marked = {
+          fg = "#${theme.tealAlpha}";
+          bg = "#${theme.tealAlpha}";
+        };
+        marker_selected = {
+          fg = "#${theme.blueAlpha}";
+          bg = "#${theme.blueAlpha}";
+        };
+
+        tab_active = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.textAlpha}";
+        };
+        tab_inactive = {
+          fg = "#${theme.textAlpha}";
+          bg = "#${theme.surface1Alpha}";
+        };
+        tab_width = 1;
+
+        count_copied = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.greenAlpha}";
+        };
+        count_cut = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.redAlpha}";
+        };
+        count_selected = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.blueAlpha}";
+        };
+
+        border_symbol = "│";
+        border_style.fg = "#${theme.overlay1Alpha}";
+
+        syntect_theme = "~/${batTheme}";
+      };
+
+      mode = {
+        normal_main = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.blueAlpha}";
+          bold = true;
+        };
+        normal_alt = {
+          fg = "#${theme.blueAlpha}";
+          bg = "#${theme.surface0Alpha}";
+        };
+
+        select_main = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.greenAlpha}";
+          bold = true;
+        };
+        select_alt = {
+          fg = "#${theme.greenAlpha}";
+          bg = "#${theme.surface0Alpha}";
+        };
+
+        unset_main = {
+          fg = "#${theme.baseAlpha}";
+          bg = "#${theme.flamingoAlpha}";
+          bold = true;
+        };
+        unset_alt = {
+          fg = "#${theme.flamingoAlpha}";
+          bg = "#${theme.surface0Alpha}";
+        };
+      };
+
+      status = {
+        separator_open = "";
+        separator_close = "";
+
+        progress_label = {
+          fg = "#ffffff";
+          bold = true;
+        };
+        progress_normal = {
+          fg = "#${theme.blueAlpha}";
+          bg = "#${theme.surface1Alpha}";
+        };
+        progress_error = {
+          fg = "#${theme.redAlpha}";
+          bg = "#${theme.surface1Alpha}";
+        };
+
+        perm_type = {
+          fg = "#${theme.blueAlpha}";
+        };
+        perm_read = {
+          fg = "#${theme.yellowAlpha}";
+        };
+        perm_write = {
+          fg = "#${theme.redAlpha}";
+        };
+        perm_exec = {
+          fg = "#${theme.greenAlpha}";
+        };
+        perm_sep = {
+          fg = "#${theme.overlay1Alpha}";
+        };
+      };
+
+      input = {
+        border = {
+          fg = "#${theme.blueAlpha}";
+        };
+        title = { };
+        value = { };
+        selected.reversed = true;
+      };
+
+      pick = {
+        border = {
+          fg = "#${theme.blueAlpha}";
+        };
+        active = {
+          fg = "#${theme.pinkAlpha}";
+        };
+        inactive = { };
+      };
+
+      confirm = {
+        border = {
+          fg = "#${theme.blueAlpha}";
+        };
+        title = {
+          fg = "#${theme.blueAlpha}";
+        };
+        content = { };
+        list = { };
+        btn_yes = {
+          reversed = true;
+        };
+        btn_no = { };
+      };
+
+      completion = {
+        border = {
+          fg = "#${theme.blueAlpha}";
+        };
+      };
+      tasks = {
+        border = {
+          fg = "#${theme.blueAlpha}";
+        };
+        title = { };
+        hovered = {
+          underline = true;
+        };
+      };
+
+      which = {
+        mask = {
+          bg = "#${theme.surface0Alpha}";
+        };
+        cand = {
+          fg = "#${theme.tealAlpha}";
+        };
+        rest = {
+          fg = "#9399b2";
+        };
+        desc = {
+          fg = "#${theme.pinkAlpha}";
+        };
+        separator = "  ";
+        separator_style = {
+          fg = "#${theme.surface2Alpha}";
+        };
+      };
+      help = {
+        on = {
+          fg = "#${theme.tealAlpha}";
+        };
+        run = {
+          fg = "#${theme.pinkAlpha}";
+        };
+        desc = {
+          fg = "#9399b2";
+        };
+        hovered = {
+          bg = "#${theme.surface2Alpha}";
+          bold = true;
+        };
+        footer = {
+          fg = "#${theme.textAlpha}";
+          bg = "#${theme.surface1Alpha}";
+        };
+      };
+
+      notify = {
+        title_info = {
+          fg = "#${theme.tealAlpha}";
+        };
+        title_warn = {
+          fg = "#${theme.yellowAlpha}";
+        };
+        title_error = {
+          fg = "#${theme.redAlpha}";
+        };
+      };
+      filetype = {
+        rules = [
+          # Media
+          {
+            mime = "image/*";
+            fg = "#${theme.tealAlpha}";
+          }
+          {
+            mime = "{audio;video}/*";
+            fg = "#${theme.yellowAlpha}";
+          }
+
+          # Archives
+          {
+            mime = "application/*zip";
+            fg = "#${theme.pinkAlpha}";
+          }
+          {
+            mime = "application/x-{tar;bzip*;7z-compressed;xz;rar}";
+            fg = "#${theme.pinkAlpha}";
+          }
+
+          # Documents
+          {
+            mime = "application/{pdf;doc;rtf}";
+            fg = "#${theme.greenAlpha}";
+          }
+
+          # Fallback
+          {
+            name = "*";
+            fg = "#${theme.textAlpha}";
+          }
+          {
+            name = "*/";
+            fg = "#${theme.blueAlpha}";
+          }
+        ];
+      };
+
+      icon = import ./icons.nix;
+    };
+  };
+}

shell.nix

@@ -10,13 +10,4 @@
       nh
     ];
   };
-  # Formatters needed for 'just fmt'
-  format = pkgs.mkShell {
-    packages = with pkgs; [
-      nodePackages.prettier
-      nixfmt-rfc-style
-      treefmt
-      shfmt
-    ];
-  };
 }