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
This commit is contained in:
@@ -50,7 +50,6 @@
|
|||||||
...}@inputs:
|
...}@inputs:
|
||||||
let
|
let
|
||||||
pkg-sets = final: prev: {
|
pkg-sets = final: prev: {
|
||||||
unstable = import inputs.nixunstable { system = final.system; inherit overlays; };
|
|
||||||
nix23_05 = import inputs.nix23_05 { system = final.system; inherit overlays; };
|
nix23_05 = import inputs.nix23_05 { system = final.system; inherit overlays; };
|
||||||
};
|
};
|
||||||
local_overlay = import ./overlays;
|
local_overlay = import ./overlays;
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ in
|
|||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
keyMode = "vi";
|
keyMode = "vi";
|
||||||
shell = "${pkgs.myxonsh}/bin/xonsh";
|
|
||||||
terminal = "xterm-256color";
|
terminal = "xterm-256color";
|
||||||
customPaneNavigationAndResize = true;
|
customPaneNavigationAndResize = true;
|
||||||
#"set-option -g default-command ${pkgs.myxonsh}/bin/xonsh"
|
|
||||||
extraConfig = (lib.strings.concatStringsSep "\n" [
|
extraConfig = (lib.strings.concatStringsSep "\n" [
|
||||||
"bind P paste-buffer"
|
"bind P paste-buffer"
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ in {
|
|||||||
cdrtools
|
cdrtools
|
||||||
fluffychat
|
fluffychat
|
||||||
freetube
|
freetube
|
||||||
cinny-desktop
|
|
||||||
qpwgraph
|
qpwgraph
|
||||||
vlc
|
vlc
|
||||||
x265
|
x265
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ in rec {
|
|||||||
};
|
};
|
||||||
pipenv-ivr = prev.callPackage ./pipenv.nix { };
|
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; [
|
extraPackages = (ps: with ps; [
|
||||||
xonsh-apipenv
|
xonsh-apipenv
|
||||||
xonsh-direnv
|
xonsh-direnv
|
||||||
|
|||||||
Reference in New Issue
Block a user