diff --git a/flake.lock b/flake.lock index 26a0ba2..aa774d8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1684153753, - "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=", + "lastModified": 1694793763, + "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", "owner": "ryantm", "repo": "agenix", - "rev": "db5637d10f797bb251b94ef9040b237f4702cde3", + "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1686922395, - "narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=", + "lastModified": 1695224363, + "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c", + "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1695109627, + "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", "type": "github" }, "original": { @@ -179,15 +179,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "nixos", + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -195,17 +195,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1686869522, - "narHash": "sha256-tbJ9B8WLCTnVP/LwESRlg0dII6Zyg2LmUU/mB9Lu98E=", + "lastModified": 1694959747, + "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", + "rev": "970a59bd19eff3752ce552935687100c46e820a5", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "7c67f006ea0e7d0265f16d7df07cc076fdffd91f", "type": "github" } }, @@ -231,11 +231,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1687141659, - "narHash": "sha256-ckvEuxejYmFTyFF0u9CWV8h5u+ubuxA7vYrOw/GXRXg=", + "lastModified": 1695175880, + "narHash": "sha256-TBR5/K3jkrd+U5mjxvRvUhlcT1Hw9jFywz1TjAGZRm4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "86302751ef371597d48951983e1a2f04fe78d4ff", + "rev": "e054ca37ee416efe9d8fc72d249ec332ef74b6d4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b3103c..d7bee9e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?rev=7c67f006ea0e7d0265f16d7df07cc076fdffd91f"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-latest.url = github:NixOS/nixpkgs/nixos-unstable; home-manager.url = github:nix-community/home-manager; pwnix = { diff --git a/shared/env.nix b/shared/env.nix index cc0e34c..8128f66 100644 --- a/shared/env.nix +++ b/shared/env.nix @@ -5,7 +5,7 @@ pkgs: with pkgs; [ bottom coreutils curl - exa + eza fd file git diff --git a/shared/home/bash.nix b/shared/home/bash.nix index 52a92d7..ea225dc 100644 --- a/shared/home/bash.nix +++ b/shared/home/bash.nix @@ -25,6 +25,7 @@ in with lib; { "reboot" "exit" "exa" + "eza" "fg" "cd" "ls" @@ -38,7 +39,8 @@ in with lib; { shellAliases = { # General aliases ":q" = "exit"; - "t" = "${exa}/bin/exa -T"; + "t" = "${eza}/bin/eza -T"; + "l" = "${eza}/bin/eza"; ".." = "cd .."; # Git command aliases diff --git a/shared/home/programs.nix b/shared/home/programs.nix index a740298..6b8c919 100644 --- a/shared/home/programs.nix +++ b/shared/home/programs.nix @@ -26,7 +26,7 @@ # It's like `top` but cooler programs.bottom.enable = true; - programs.exa = { + programs.eza = { enable = true; extraOptions = [ "--group-directories-first"