diff --git a/os/dev/default.nix b/os/dev/default.nix index 5183246..3076618 100644 --- a/os/dev/default.nix +++ b/os/dev/default.nix @@ -222,6 +222,7 @@ in { }; }; tmux = { + enable = true; mouse = true; prefix = "C-Space"; keyMode = "vi"; diff --git a/overlays/default.nix b/overlays/default.nix index a4f9ee6..4ec9fca 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,12 +9,14 @@ # example = prev.example.overrideAttrs (oldAttrs: rec { # ... # }); - tmuxPlugins = prev.tmuxPlugins.extend (final': prev': { - tokyo-night-tmux = prev.callPackage ../pkgs/tmux-tokyo-night.nix { - prev = prev; - lib = prev.lib; + tmuxPlugins = + prev.tmuxPlugins + // { + tokyo-night-tmux = prev.callPackage ../pkgs/tmux-tokyo-night.nix { + pkgs = prev; + lib = prev.lib; + }; }; - }); koboldcpp = prev.koboldcpp.override { cublasSupport = true; }; diff --git a/pkgs/tmux-tokyo-night.nix b/pkgs/tmux-tokyo-night.nix index 68ea766..c51a53d 100644 --- a/pkgs/tmux-tokyo-night.nix +++ b/pkgs/tmux-tokyo-night.nix @@ -1,12 +1,12 @@ # USED IN OVERLAY { - prev, + pkgs, lib, }: -prev.tmuxPlugins.mkTmuxPlugin { +pkgs.tmuxPlugins.mkTmuxPlugin { pluginName = "tokyo-night-tmux"; version = "c3bc283cceeefaa7e5896878fe20711f466ab591"; - src = prev.fetchFromGithub { + src = pkgs.fetchFromGitHub { owner = "janoamaral"; repo = "tokyo-night-tmux"; rev = "c3bc283cceeefaa7e5896878fe20711f466ab591";