diff --git a/flake.lock b/flake.lock index 97ea601..9c3da49 100644 --- a/flake.lock +++ b/flake.lock @@ -153,7 +153,9 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1761920229, @@ -322,11 +324,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -369,42 +371,22 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", + "rust-overlay": "rust-overlay", "wsl": "wsl", "zellij-switch": "zellij-switch", "zenyd-mpv-scripts": "zenyd-mpv-scripts" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1736476219, - "narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=", + "lastModified": 1762051177, + "narHash": "sha256-pESNTx/m3WnrYx+OujBtDP5Bj0/mAyHa4MgEwzkgkLE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9", + "rev": "08c33e87c4829bbdd42b5af247cf7a19e126369f", "type": "github" }, "original": { @@ -502,7 +484,9 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2", + "rust-overlay": [ + "rust-overlay" + ], "systems": "systems_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 8ed9e8b..dafd871 100644 --- a/flake.nix +++ b/flake.nix @@ -64,16 +64,22 @@ flake = false; }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + }; + # Zellij Switcher zellij-switch = { url = "github:mostafaqanbaryan/zellij-switch"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; # Text editor helix = { url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; # # Nextcloud Apps diff --git a/platforms/home-manager/modules/nmasur/profiles/power-user.nix b/platforms/home-manager/modules/nmasur/profiles/power-user.nix index 3365595..a0f7beb 100644 --- a/platforms/home-manager/modules/nmasur/profiles/power-user.nix +++ b/platforms/home-manager/modules/nmasur/profiles/power-user.nix @@ -19,7 +19,7 @@ in pkgs.delta # Fancy diffs pkgs.difftastic # Other fancy diffs pkgs.doggo # DNS client (dig) - pkgs.du-dust # Disk usage tree (ncdu) + pkgs.dust # Disk usage tree (ncdu) pkgs.dua # File sizes (du) pkgs.duf # Basic disk information (df) pkgs.jless # JSON viewer @@ -42,7 +42,7 @@ in programs.fish.shellAliases = { "du" = lib.mkDefault (lib.getExe pkgs.dua); - "ncdu" = lib.mkDefault (lib.getExe pkgs.du-dust); + "ncdu" = lib.mkDefault (lib.getExe pkgs.dust); "df" = lib.mkDefault (lib.getExe pkgs.duf); # Use eza (exa) instead of ls for fancier output