diff --git a/modules/misc/home.nix b/modules/misc/home.nix index 523e43d..5ada84e 100644 --- a/modules/misc/home.nix +++ b/modules/misc/home.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { imports = [ ./zsh ./nvim @@ -41,21 +41,19 @@ userName = "Zoe Roux"; }; - programs.tmux = { - enable = true; - escapeTime = 0; - terminal = "\$TERM"; - shortcut = "t"; - mouse = true; - aggressiveResize = true; - clock24 = true; - historyLimit = 50000; - extraConfig = '' + home.packages = with pkgs; [tmux]; + xdg.configFile."tmux/tmux.conf".text = '' + unbind C-b + set -g prefix C-t + bind -N "Send the prefix key through to the application" t send-prefix + + set -g mouse on set -g status off - set focus-events on set -g set-clipboard on - ''; - }; + + run-shell ${pkgs.tmuxPlugins.sensible.rtp} + ''; + # terminal = "\$TERM"; xdg.configFile."nixpkgs/config.nix".text = '' { allowUnfree = true; diff --git a/modules/misc/nvim/lua/plugins/motions.lua b/modules/misc/nvim/lua/plugins/motions.lua index 015aaf8..bfe0acd 100644 --- a/modules/misc/nvim/lua/plugins/motions.lua +++ b/modules/misc/nvim/lua/plugins/motions.lua @@ -29,15 +29,15 @@ return { keys = { { "a", 'lua require("harpoon"):list():append()', desc = "Mark file" }, { "h", 'lua require("harpoon").ui:toggle_quick_menu(require("harpoon"):list())', desc = "Harpoon menu" }, - { "", 'lua require("harpoon"):list():select(1)', desc = "Navigate to harpoon 1" }, - { "", 'lua require("harpoon"):list():select(2)', desc = "Navigate to harpoon 2" }, - { "", 'lua require("harpoon"):list():select(3)', desc = "Navigate to harpoon 3" }, - { "", 'lua require("harpoon"):list():select(4)', desc = "Navigate to harpoon 4" }, + { "", 'lua require("harpoon"):list():select(1)', desc = "Navigate to harpoon 1" }, + { "", 'lua require("harpoon"):list():select(2)', desc = "Navigate to harpoon 2" }, + { "", 'lua require("harpoon"):list():select(3)', desc = "Navigate to harpoon 3" }, + { "", 'lua require("harpoon"):list():select(4)', desc = "Navigate to harpoon 4" }, -- is not a valid sequence so use HJKL instead. - { "", 'lua require("harpoon"):list():select(1)', desc = "Navigate to harpoon 1" }, - { "", 'lua require("harpoon"):list():select(2)', desc = "Navigate to harpoon 2" }, - { "", 'lua require("harpoon"):list():select(3)', desc = "Navigate to harpoon 3" }, + { "", 'lua require("harpoon"):list():select(1)', desc = "Navigate to harpoon 1" }, + { "", 'lua require("harpoon"):list():select(2)', desc = "Navigate to harpoon 2" }, + { "", 'lua require("harpoon"):list():select(3)', desc = "Navigate to harpoon 3" }, -- is already taken but since I use harpoon less on querty no worry }, config = function(_, opts)