diff --git a/flake.lock b/flake.lock index bcdcb45..8d24ec3 100644 --- a/flake.lock +++ b/flake.lock @@ -370,11 +370,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -544,14 +544,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -580,7 +580,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -598,25 +598,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_10" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1709126324, @@ -632,9 +614,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1701680307, @@ -867,15 +849,17 @@ "hb-downloader": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710853817, - "narHash": "sha256-Fn3lxKgi3BGWO2ku9LSZaNWTu1ls+BZjokPHElHzlpk=", + "lastModified": 1762459093, + "narHash": "sha256-bxFnU+/OanVLr6FJ2m8mq3MRHHymLRdh5EOsv9dp2zE=", "ref": "refs/heads/main", - "rev": "867786099aca217af82c58122c4c54db847dbfdd", - "revCount": 8, + "rev": "fcf24cd5cd2d40da9466bff097671ed1844eb94e", + "revCount": 9, "type": "git", "url": "https://git.cronyakatsuki.xyz/crony/hb-downloader" }, @@ -1068,7 +1052,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks_2", - "systems": "systems_5", + "systems": "systems_4", "xdph": "xdph" }, "locked": { @@ -1245,7 +1229,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1761675634, @@ -1365,8 +1349,8 @@ "inputs": { "crane": "crane", "fenix": "fenix", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1761489878, @@ -1406,8 +1390,10 @@ }, "lnxlink": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { @@ -1441,7 +1427,7 @@ }, "nbfc-linux": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_10", "utils": "utils_2" }, "locked": { @@ -1463,7 +1449,7 @@ "inputs": { "flake-parts": "flake-parts", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1762387511, @@ -1670,22 +1656,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1704874635, "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", @@ -1702,38 +1672,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1705957679, "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", @@ -1749,7 +1687,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_11": { "locked": { "lastModified": 1762286042, "narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=", @@ -1765,7 +1703,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_12": { "locked": { "lastModified": 1762111121, "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", @@ -1781,23 +1719,7 @@ "type": "github" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { + "nixpkgs_13": { "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", @@ -1813,23 +1735,7 @@ "type": "github" } }, - "nixpkgs_17": { - "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_18": { + "nixpkgs_14": { "locked": { "lastModified": 1704842529, "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", @@ -1927,27 +1833,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1710765496, - "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "lastModified": 1759417375, + "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", "type": "github" }, "original": { @@ -1957,7 +1847,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1760284886, "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", @@ -1973,6 +1863,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -2029,9 +1935,11 @@ }, "note": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_15" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1761426592, @@ -2077,8 +1985,8 @@ "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_2", "mnw": "mnw", - "nixpkgs": "nixpkgs_16", - "systems": "systems_11" + "nixpkgs": "nixpkgs_13", + "systems": "systems_10" }, "locked": { "lastModified": 1762353527, @@ -2097,17 +2005,15 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1710843117, - "narHash": "sha256-b6iKQeHegzpc697rxTPA3bpwGN3m50eLCgdQOmceFuE=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e8dc1b4fe80c6fcededde7700e6a23bcdf7f3347", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -2143,7 +2049,7 @@ "inputs": { "flake-compat": "flake-compat_6", "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1760663237, @@ -2162,10 +2068,10 @@ "pre-commit-hooks_4": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "gitignore": "gitignore_5", - "nixpkgs": "nixpkgs_18", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_14", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1708018599, @@ -2202,7 +2108,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_12", "note": "note", "nvf": "nvf", "stylix": "stylix", @@ -2295,7 +2201,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_12", + "systems": "systems_11", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -2391,21 +2297,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2438,16 +2329,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2468,16 +2359,16 @@ }, "systems_6": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2609,9 +2500,11 @@ }, "upfast": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "gomod2nix": "gomod2nix_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks_4" }, "locked": { @@ -2648,7 +2541,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index dfd0668..268289a 100644 --- a/flake.nix +++ b/flake.nix @@ -75,16 +75,28 @@ agenix.url = "github:ryantm/agenix"; # My selfhosted service, inspired by 0x0.st - upfast.url = "git+https://git.cronyakatsuki.xyz/crony/UpFast"; + upfast = { + url = "git+https://git.cronyakatsuki.xyz/crony/UpFast"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # My note management app - note.url = "git+https://git.cronyakatsuki.xyz/crony/note"; + note = { + url = "git+https://git.cronyakatsuki.xyz/crony/note"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # My custom script for downloading humble bundle bundle's - hb-downloader.url = "git+https://git.cronyakatsuki.xyz/crony/hb-downloader"; + hb-downloader = { + url = "git+https://git.cronyakatsuki.xyz/crony/hb-downloader"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # My flake for installing lnxlink - lnxlink.url = "git+https://git.cronyakatsuki.xyz/crony/lnxlink-flake"; + lnxlink = { + url = "git+https://git.cronyakatsuki.xyz/crony/lnxlink-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Dev version of hyprland hyprland = { diff --git a/modules/cross-platform/home-manager/shell.nix b/modules/cross-platform/home-manager/shell.nix index b8ee7a0..7beda57 100644 --- a/modules/cross-platform/home-manager/shell.nix +++ b/modules/cross-platform/home-manager/shell.nix @@ -39,7 +39,6 @@ email = "crony@cronyakatsuki.xyz"; }; }; - delta.enable = true; }; # Install fzf @@ -64,10 +63,6 @@ enableZshIntegration = true; }; - home.sessionVariables = { - _ZO_EXCLUDE_DIRS = "$HOME:$HOME/docs/share:/mnt"; - }; - # Install eza programs.eza = { enable = true; @@ -76,6 +71,7 @@ icons = "always"; extraOptions = [ "--group-directories-first" + "--group" ]; }; @@ -87,7 +83,10 @@ }; # Install tealdeer - programs.tealdeer.enable = true; + programs.tealdeer = { + enable = true; + enableAutoUpdates = true; + }; # Install bat programs.bat.enable = true; @@ -107,8 +106,8 @@ enable = true; }; - # Install btop - programs.btop.enable = true; + # Install htop + programs.htop.enable = true; # Install lazygit programs.lazygit.enable = true; diff --git a/modules/cross-platform/home-manager/yazi.nix b/modules/cross-platform/home-manager/yazi.nix index 07cec18..e17deda 100644 --- a/modules/cross-platform/home-manager/yazi.nix +++ b/modules/cross-platform/home-manager/yazi.nix @@ -130,14 +130,17 @@ { on = "K"; run = "plugin parent-arrow -1"; + desc = "Move directory without leaving cwd in parent directory"; } { on = "J"; run = "plugin parent-arrow 1"; + desc = "Move directory without leaving cwd in parent directory"; } { on = ["g" "r"]; run = "shell -- ya emit cd \"$(git rev-parse --show-toplevel)\""; + desc = "Go to root of git repository"; } { on = ["c" "m"]; @@ -154,6 +157,16 @@ run = "plugin mount"; desc = "Manage mounting disks"; } + { + on = ["g" "c"]; + run = "cd ~/repos/nixos"; + desc = "Go ~/repos/nixos"; + } + { + on = ["g" "d"]; + run = "cd ~/downs"; + desc = "Go ~/downs"; + } ]; }; };