diff --git a/flake.lock b/flake.lock index 701d20f..d614124 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1750151065, + "narHash": "sha256-il+CAqChFIB82xP6bO43dWlUVs+NlG7a4g8liIP5HcI=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "7573f55ba337263f61167dbb0ea926cdc7c8eb5d", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "affinity-nix": { "inputs": { "elemental-wine-source": "elemental-wine-source", @@ -137,11 +153,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1751681497, - "narHash": "sha256-MqoEtje0tW84XJX7reIVBBnUQ4EIO3qvgriU0cWf7YI=", + "lastModified": 1751766315, + "narHash": "sha256-rIIRch7pSBsxaee2+9hVOTFcHahQvV2ASqbDEINCXkk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5ccdea942b6d6483c626a82a5a2eb856afb4a96e", + "rev": "35e4150b360528360680a0b75e142396c6fbd484", "type": "github" }, "original": { @@ -172,6 +188,34 @@ "type": "github" } }, + "eza": { + "inputs": { + "advisory-db": "advisory-db", + "flake-utils": "flake-utils_3", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "powertest": "powertest", + "pre-commit-hooks": "pre-commit-hooks", + "rust-overlay": "rust-overlay", + "systems": "systems_3", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1751750910, + "narHash": "sha256-nvxcyvyBRGKL6yn/TSD03g48l9DMFJ4jBW8nqW/y7p4=", + "owner": "eza-community", + "repo": "eza", + "rev": "fa2f3216ad110499302f8311c195d7235ebe3900", + "type": "github" + }, + "original": { + "owner": "eza-community", + "repo": "eza", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1733328505, @@ -236,6 +280,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1747046372, @@ -346,14 +406,17 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": [ + "eza", + "systems" + ] }, "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": { @@ -364,14 +427,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -416,6 +479,24 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_11" + }, + "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" + } + }, "freetype2": { "flake": false, "locked": { @@ -455,8 +536,8 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_3", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -496,6 +577,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "eza", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "nix-rice", @@ -541,11 +644,11 @@ ] }, "locked": { - "lastModified": 1751676893, - "narHash": "sha256-kXlkCJcws234u4gLjtl07/U+8FV8/TBYoR14gXVRv0g=", + "lastModified": 1751760902, + "narHash": "sha256-qBGNn7T/zOgUDQTo/RM/D2oxMkB2x36j3ajvpVanEVs=", "owner": "nix-community", "repo": "home-manager", - "rev": "57d1027e1eaf1220342248ff18d34f42b0beea7b", + "rev": "8b0180dde1d6f4cf632e046309e8f963924dfbd0", "type": "github" }, "original": { @@ -613,7 +716,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1750503503, @@ -721,7 +824,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1751139849, @@ -847,7 +950,7 @@ "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systemd-nix": "systemd-nix", - "systems": "systems_6", + "systems": "systems_7", "uv2nix": "uv2nix" }, "locked": { @@ -917,6 +1020,27 @@ "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": [ + "eza", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nh": { "inputs": { "nixpkgs": [ @@ -949,11 +1073,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751653855, - "narHash": "sha256-JzPiCLz/ESg5OJ3uYPP141HTPEpfDA+g/8LPVtNiQdA=", + "lastModified": 1751736567, + "narHash": "sha256-/wvCffuHn2eOw6qYyLFm+oButg9Z1dU/BhkHhoRd5z4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0ca4dc1ae61f37b9f2f15225b3015a2dea3413da", + "rev": "f3b4c3cbb65b690c66ad5ca78f1e88620d4d6cc5", "type": "github" }, "original": { @@ -997,8 +1121,8 @@ }, "nix-appimage": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -1054,7 +1178,7 @@ "nixpkgs" ], "nixpkgs-lib": "nixpkgs-lib_3", - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1748538518, @@ -1314,11 +1438,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -1360,6 +1484,66 @@ "type": "github" } }, + "powertest": { + "inputs": { + "flake-utils": [ + "eza", + "flake-utils" + ], + "naersk": [ + "eza", + "naersk" + ], + "nixpkgs": [ + "eza", + "nixpkgs" + ], + "rust-overlay": [ + "eza", + "rust-overlay" + ], + "treefmt-nix": [ + "eza", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1700124898, + "narHash": "sha256-+5jKG/KmYOopvHwBAGu5iPVFqoug16Bkyk/InwB40tc=", + "owner": "eza-community", + "repo": "powertest", + "rev": "c7b7d3038036d24dd5c77286e69a3d4b119bae81", + "type": "github" + }, + "original": { + "owner": "eza-community", + "repo": "powertest", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "eza", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -1419,6 +1603,7 @@ "emacs-lsp-booster": "emacs-lsp-booster", "emacs-overlay": "emacs-overlay", "envfs": "envfs", + "eza": "eza", "home-manager": "home-manager", "hypridle": "hypridle", "hyprlock": "hyprlock", @@ -1442,6 +1627,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "eza", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751510438, + "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "wezterm", @@ -1462,7 +1668,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "xwayland-satellite", @@ -1483,7 +1689,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ "yazi", @@ -1575,6 +1781,21 @@ "type": "github" } }, + "systems_11": { + "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, @@ -1592,16 +1813,16 @@ }, "systems_3": { "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" } }, @@ -1621,21 +1842,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1650,7 +1856,7 @@ "type": "github" } }, - "systems_7": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1665,6 +1871,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_8": { "locked": { "lastModified": 1681028828, @@ -1734,6 +1955,27 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "eza", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -1776,7 +2018,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": "nixpkgs_8" }, "locked": { @@ -1817,12 +2059,12 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", "nixpkgs": "nixpkgs_9", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "zlib": "zlib" }, "locked": { @@ -1843,11 +2085,11 @@ }, "xwayland-satellite": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1751228685, @@ -1898,11 +2140,11 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1751550109, diff --git a/flake.nix b/flake.nix index 106d790..e494ea4 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + eza = { + url = "github:emenel/eza"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates"; nix-way-templates.url = "github:the-nix-way/dev-templates"; diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index a5100ac..bd382e3 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -19,7 +19,7 @@ in home = { packages = lib.mkMerge [ - (with inputs.affinity-nix.packages.x86_64-linux; [ + (with inputs.affinity-nix.packages.${pkgs.system}; [ photo publisher designer diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 317f5ce..d2c203a 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -44,8 +44,8 @@ }) (final: prev: { - bash-env-json = inputs.bash-env-json.packages.x86_64-linux.default; - bash-env-nushell = inputs.bash-env-nushell.packages.x86_64-linux.default; + bash-env-json = inputs.bash-env-json.packages.${pkgs.system}.default; + bash-env-nushell = inputs.bash-env-nushell.packages.${pkgs.system}.default; }) (final: prev: { diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix index 4fa3439..147d618 100644 --- a/hosts/media-server/configuration.nix +++ b/hosts/media-server/configuration.nix @@ -19,8 +19,8 @@ }) (final: prev: { - bash-env-json = inputs.bash-env-json.packages.x86_64-linux.default; - bash-env-nushell = inputs.bash-env-nushell.packages.x86_64-linux.default; + bash-env-json = inputs.bash-env-json.packages.${pkgs.system}.default; + bash-env-nushell = inputs.bash-env-nushell.packages.${pkgs.system}.default; }) ]; }; @@ -150,7 +150,7 @@ dates = "daily"; extraArgs = "--keep 4"; }; - flake = "/home/media-server/nixos-config"; + flake = "/home/media/nixos-config"; package = pkgs.nh; }; diff --git a/modules/home/hypridle.nix b/modules/home/hypridle.nix index a03023f..871de38 100644 --- a/modules/home/hypridle.nix +++ b/modules/home/hypridle.nix @@ -1,8 +1,8 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { services.hypridle = { enable = true; - package = inputs.hypridle.packages.x86_64-linux.default; + package = inputs.hypridle.packages.${pkgs.system}.default; settings = { general = { lock_cmd = "pidof hyprlock || hyprlock"; diff --git a/modules/home/hyprlock.nix b/modules/home/hyprlock.nix index 6e8702a..82324eb 100644 --- a/modules/home/hyprlock.nix +++ b/modules/home/hyprlock.nix @@ -5,7 +5,7 @@ let strPalette = palette.toRGBHex pkgs.rice.colorPalette; in { programs.hyprlock = { enable = true; - package = inputs.hyprlock.packages.x86_64-linux.default; + package = inputs.hyprlock.packages.${pkgs.system}.default; settings = { general = { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index b8aa625..bbc8121 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -156,6 +156,7 @@ git = true; icons = "auto"; colors = "auto"; + package = inputs.eza.packages.${pkgs.system}.default; }; fd = { enable = true; diff --git a/modules/home/shell-conf/nushell/config.nu b/modules/home/shell-conf/nushell/config.nu index d8e05ce..4d9c57b 100644 --- a/modules/home/shell-conf/nushell/config.nu +++ b/modules/home/shell-conf/nushell/config.nu @@ -1,12 +1,14 @@ $env.config.completions.external.completer = $fish_completer $env.LS_COLORS = (vivid generate one-dark) -$env.TRANSIENT_PROMPT_COMMAND = ^starship module character -$env.TRANSIENT_PROMPT_INDICATOR = "" -$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = "" -$env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = "" -$env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = "" -$env.TRANSIENT_PROMPT_COMMAND_RIGHT = ^starship module time +# $env.TRANSIENT_PROMPT_COMMAND = ^starship module character +# $env.TRANSIENT_PROMPT_INDICATOR = "" +# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = "" +# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = "" +# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = "" +# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = ^starship module time + +def --env nufzf [] {$in | each {|i| $i | to json --raw} | str join "\n" | fzf | from json} def --env doomup [...args] { doom sync ...$args @@ -15,7 +17,7 @@ def --env doomup [...args] { } def --env lla [...args] { - ls -alm ...$args | select name type size modified mode user group + ls -alm ...$args | select name type size modified mode user } # def --env pullall [] { diff --git a/modules/home/shell-conf/nushell/nushell.nix b/modules/home/shell-conf/nushell/nushell.nix index 22403b5..9a18b56 100644 --- a/modules/home/shell-conf/nushell/nushell.nix +++ b/modules/home/shell-conf/nushell/nushell.nix @@ -29,10 +29,12 @@ show_banner = false; ls = { clickable_links = true; }; table = { - mode = "none"; + mode = "rounded"; + header_on_separator = true; }; color_config = { hints = "#666666"; + separator = "#333333"; }; completions = { case_sensitive = false; diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index 1515038..cd235b9 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -3,7 +3,7 @@ programs.yazi = { enable = true; enableFishIntegration = true; - package = inputs.yazi.packages.x86_64-linux.default; + package = inputs.yazi.packages.${pkgs.system}.default; initLua = ./yazi/init.lua; plugins = with pkgs.yaziPlugins; {