From da5fe6cb3d7bcb27dcf8bd03dbd2c014f9a28a92 Mon Sep 17 00:00:00 2001 From: RageCage64 Date: Fri, 31 May 2024 08:52:57 -0400 Subject: [PATCH] trying to get tmux clipboard working --- .gitignore | 2 +- .tmux.conf | 3 +++ nvim/after/plugin/colours.lua | 6 ++--- nvim/lua/RageCage64/remap.lua | 17 ++++++++++-- nvim/plugin/packer_compiled.lua | 48 ++++++++++++++++----------------- 5 files changed, 46 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index c304571..c0b6cde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ **/*.luarc.json -nvim/plugin/packer_compiled.lua +**/nvim/plugin/packer_compiled.lua diff --git a/.tmux.conf b/.tmux.conf index 60c9a17..f41df6c 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -7,6 +7,9 @@ set -g mouse on # Attempting to get terminal colour # set -g default-terminal "tmux-256color" set -g default-terminal "xterm-256color" +set -ag terminal-overrides ",xterm-256color:clipboard" +setw -g allow-passthrough on +set -s set-clipboard on # Top status with nice colours set -g status-style "fg=#665c54" diff --git a/nvim/after/plugin/colours.lua b/nvim/after/plugin/colours.lua index 8d0a17b..4282761 100644 --- a/nvim/after/plugin/colours.lua +++ b/nvim/after/plugin/colours.lua @@ -3,8 +3,8 @@ require("rose-pine").setup({ }) function SetColour(colour) - -- colour = colour or "gruvbox" - colour = colour or "rose-pine" + colour = colour or "gruvbox" + -- colour = colour or "rose-pine" vim.cmd(string.format("colorscheme %s", colour)) --vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) @@ -15,4 +15,4 @@ function UnsetColour() vim.cmd("colorscheme default") end --- SetColour() +SetColour() diff --git a/nvim/lua/RageCage64/remap.lua b/nvim/lua/RageCage64/remap.lua index 75392a1..1c79257 100644 --- a/nvim/lua/RageCage64/remap.lua +++ b/nvim/lua/RageCage64/remap.lua @@ -5,6 +5,19 @@ vim.keymap.set("n", "pv", vim.cmd.Ex) -- Paste over without copying in the pasted over word vim.keymap.set("x", "p", "\"_dP") +-- Maybe getting pasting through gmosh +vim.g.clipboard = { + name = 'OSC 52', + copy = { + ['+'] = require('vim.ui.clipboard.osc52').copy('+'), + ['*'] = require('vim.ui.clipboard.osc52').copy('*'), + }, + paste = { + ['+'] = require('vim.ui.clipboard.osc52').paste('+'), + ['*'] = require('vim.ui.clipboard.osc52').paste('*'), + }, +} + -- From old vimrc -- Enter and space completion @@ -43,8 +56,8 @@ vim.keymap.set("n", "ws", ":vsp") vim.keymap.set("n", "wi", ":sp") vim.keymap.set("n", "wt", ":tabnew") -vim.keymap.set("n", "c", '"+') -vim.keymap.set("v", "c", '"+') +vim.keymap.set("n", "c", '"+') +vim.keymap.set("v", "c", '"+') -- Reload config vim.keymap.set("n", "rc", ":so $HOME/.config/nvim/init.lua") diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index 55f95fe..f3e0e64 100644 --- a/nvim/plugin/packer_compiled.lua +++ b/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/braydonk/.cache/nvim/packer_hererocks/2.1.1707061634/share/lua/5.1/?.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1707061634/share/lua/5.1/?/init.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1707061634/lib/luarocks/rocks-5.1/?.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1707061634/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/braydonk/.cache/nvim/packer_hererocks/2.1.1707061634/lib/lua/5.1/?.so" +local package_path_str = "/usr/local/google/home/braydonk/.cache/nvim/packer_hererocks/2.1.1716656478/share/lua/5.1/?.lua;/usr/local/google/home/braydonk/.cache/nvim/packer_hererocks/2.1.1716656478/share/lua/5.1/?/init.lua;/usr/local/google/home/braydonk/.cache/nvim/packer_hererocks/2.1.1716656478/lib/luarocks/rocks-5.1/?.lua;/usr/local/google/home/braydonk/.cache/nvim/packer_hererocks/2.1.1716656478/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/usr/local/google/home/braydonk/.cache/nvim/packer_hererocks/2.1.1716656478/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -76,112 +76,112 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { LuaSnip = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/LuaSnip", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, ["centerpad.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/centerpad.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/centerpad.nvim", url = "https://github.com/smithbm2316/centerpad.nvim" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["editorconfig-vim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/editorconfig-vim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/editorconfig-vim", url = "https://github.com/editorconfig/editorconfig-vim" }, ["gruvbox.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", url = "https://github.com/ellisonleao/gruvbox.nvim" }, ["lsp-zero.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", url = "https://github.com/VonHeikemen/lsp-zero.nvim" }, ["mason-lspconfig.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", url = "https://github.com/williamboman/mason-lspconfig.nvim" }, ["mason.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/mason.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/mason.nvim", url = "https://github.com/williamboman/mason.nvim" }, moonfly = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/moonfly", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/moonfly", url = "https://github.com/bluz71/vim-moonfly-colors" }, ["neo-tree.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/neo-tree.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/neo-tree.nvim", url = "https://github.com/nvim-neo-tree/neo-tree.nvim" }, ["nui.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nui.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/nui.nvim", url = "https://github.com/MunifTanjim/nui.nvim" }, ["nvim-cmp"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lspconfig"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-treesitter"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["packer.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, playground = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/playground", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/playground", url = "https://github.com/nvim-treesitter/playground" }, ["plenary.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["rose-pine"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/rose-pine", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/rose-pine", url = "https://github.com/rose-pine/neovim" }, ["telescope.nvim"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, undotree = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/undotree", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/undotree", url = "https://github.com/mbbill/undotree" }, ["vim-commentary"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-commentary", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-commentary", url = "https://github.com/tpope/vim-commentary" }, ["vim-surround"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-surround", + path = "/usr/local/google/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" } }