From 86ef9d918f00c821c6806305d35a1e4d3dae67fc Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Fri, 14 Apr 2023 09:10:47 -0400 Subject: [PATCH] Update nixpkgs for starship --- flake.lock | 18 +++++++++--------- home/zellij.nix | 2 +- nixos/nix.nix | 13 ------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index b88b941..1ba52bf 100644 --- a/flake.lock +++ b/flake.lock @@ -400,11 +400,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1680389554, - "narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=", + "lastModified": 1681250798, + "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8", + "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", "type": "github" }, "original": { @@ -872,11 +872,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1680758185, - "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", + "lastModified": 1681217261, + "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", + "rev": "3fb8eedc450286d5092e4953118212fa21091b3b", "type": "github" }, "original": { @@ -1050,11 +1050,11 @@ }, "utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/home/zellij.nix b/home/zellij.nix index 6dd1d1a..2ad818f 100644 --- a/home/zellij.nix +++ b/home/zellij.nix @@ -23,7 +23,7 @@ }; home.packages = [ - # Open zellij for current project. + # Open zellij by prompting for CWD (pkgs.nuenv.mkScript { name = "zux"; script = '' diff --git a/nixos/nix.nix b/nixos/nix.nix index cf1dfee..8d3bb21 100644 --- a/nixos/nix.nix +++ b/nixos/nix.nix @@ -6,19 +6,6 @@ nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ flake.inputs.nuenv.overlays.nuenv - - # https://github.com/starship/starship/issues/5063 - (self: super: { - starship = super.starship.overrideDerivation (oa: { - patches = (oa.patches or [ ]) ++ [ - (builtins.fetchurl { - name = "nushell.patch"; - url = "https://github.com/starship/starship/commit/041a51835371d3738cc7b597b4a506a5dc4341c9.diff"; - sha256 = "sha256:0az1jjb24mngzybgv7kavdj1bhfdm0cqnci3gz6zkgpaxqvw7vnz"; - }) - ]; - }); - }) ]; }