From 8238a9955522eaf4ef029987632f93896b116e23 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 16 Sep 2023 12:25:19 -0700 Subject: [PATCH] flake update, replace exa with eza and comment out broken packages from update for now --- flake.lock | 24 ++++++++++++------------ home.nix | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 7a13033..b45a767 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1691640097, - "narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", + "lastModified": 1694810318, + "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", + "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1691856649, - "narHash": "sha256-1/KYCwNyOPpUoyno9Yj3zMHITQaW+wPzVlJFPOPPCo4=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "406d34d919e9e8b831b531782cf5ef6995188566", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nur": { "locked": { - "lastModified": 1691854419, - "narHash": "sha256-ZMdZIJ2ql6tyOT2XPbOZmEUiz2H0pbryZwj/nTfVREs=", + "lastModified": 1694886364, + "narHash": "sha256-MbwCXmTpdBlJPuJwBmAI1wb/z9J84OC4M4d7hz7spSs=", "owner": "nix-community", "repo": "nur", - "rev": "93fd3971deda2516b227a1bff71551c4eeb79f00", + "rev": "40cd392b888a4d78044d733b9fee61710f749a05", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 07c1f03..0fe4ded 100644 --- a/home.nix +++ b/home.nix @@ -35,7 +35,7 @@ coursier curlFull delta - exa + eza fd ffmpeg font-awesome @@ -75,7 +75,7 @@ rclone readline ripgrep - ripgrep-all + # ripgrep-all rnix-lsp rustup sbt @@ -158,6 +158,16 @@ }; }; + # programs.nheko = { + # enable = true; + # settings = { + # scaleFactor = 1.0; + # user = { + # alertOnNotification = true; + # }; + # }; + # }; + programs.starship = { enable = true; settings = { @@ -288,7 +298,7 @@ ping="prettyping"; ".." = "cd .."; pj="python -m json.tool"; - l="exa --long --header --git --all"; + l="eza --long --header --git --all"; g="git"; gl="git log"; gc="git commit -m";