From a139415fc9db00ddf0061a47c46a81210ff08c44 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 15 Aug 2024 22:55:56 -0500 Subject: [PATCH] Tighten up evaluation No need to bring along the unstable when I ended up never using it. Also, clean up some extra cruft in the tmux configuration --- flake.nix | 1 - home/home.nix | 2 -- home/modules/gui.nix | 1 - overlays/default.nix | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index a0dfed2..374a486 100644 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,6 @@ ...}@inputs: let pkg-sets = final: prev: { - unstable = import inputs.nixunstable { system = final.system; inherit overlays; }; nix23_05 = import inputs.nix23_05 { system = final.system; inherit overlays; }; }; local_overlay = import ./overlays; diff --git a/home/home.nix b/home/home.nix index f97b540..aca3e10 100644 --- a/home/home.nix +++ b/home/home.nix @@ -17,10 +17,8 @@ in programs.tmux = { enable = true; keyMode = "vi"; - shell = "${pkgs.myxonsh}/bin/xonsh"; terminal = "xterm-256color"; customPaneNavigationAndResize = true; - #"set-option -g default-command ${pkgs.myxonsh}/bin/xonsh" extraConfig = (lib.strings.concatStringsSep "\n" [ "bind P paste-buffer" ]); diff --git a/home/modules/gui.nix b/home/modules/gui.nix index 0dc0d18..da950b4 100644 --- a/home/modules/gui.nix +++ b/home/modules/gui.nix @@ -23,7 +23,6 @@ in { cdrtools fluffychat freetube - cinny-desktop qpwgraph vlc x265 diff --git a/overlays/default.nix b/overlays/default.nix index 8cd71fe..d7d6191 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -82,7 +82,7 @@ in rec { }; pipenv-ivr = prev.callPackage ./pipenv.nix { }; - myxonsh = (prev.unstable.xonsh-unwrapped.passthru.wrapper.override { + myxonsh = (prev.xonsh-unwrapped.passthru.wrapper.override { extraPackages = (ps: with ps; [ xonsh-apipenv xonsh-direnv