From bf6f49726877e52932cf494a3ea2ab321d897156 Mon Sep 17 00:00:00 2001 From: 409 Date: Tue, 19 Dec 2023 17:48:11 +0100 Subject: [PATCH] changed color scheme and updated plugins --- after/plugin/colors.lua | 3 ++- after/plugin/harpoon.lua | 8 ++++---- lua/409/packer.lua | 8 +++----- lua/409/remap.lua | 8 ++++++-- plugin/packer_compiled.lua | 14 +++++++------- 5 files changed, 22 insertions(+), 19 deletions(-) mode change 100755 => 100644 plugin/packer_compiled.lua diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index bea0b8b..798a55b 100755 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -1,9 +1,10 @@ function Color(color) - color = color or "tokyonight-moon" + color = color or "catppuccin-mocha" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.cmd('hi StatusLine guibg=#00000000') end Color() diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua index e5a7509..fb14ed7 100755 --- a/after/plugin/harpoon.lua +++ b/after/plugin/harpoon.lua @@ -7,7 +7,7 @@ harpoon:setup() vim.keymap.set("n", "a", function() harpoon:list():append() end) vim.keymap.set("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) -vim.keymap.set("n", "", function() harpoon:list():select(1) end) -vim.keymap.set("n", "", function() harpoon:list():select(2) end) -vim.keymap.set("n", "", function() harpoon:list():select(3) end) -vim.keymap.set("n", "", function() harpoon:list():select(4) end) +-- vim.keymap.set("n", "", function() harpoon:list():select(1) end) +-- vim.keymap.set("n", "", function() harpoon:list():select(2) end) +-- vim.keymap.set("n", "", function() harpoon:list():select(3) end) +-- vim.keymap.set("n", "", function() harpoon:list():select(4) end) diff --git a/lua/409/packer.lua b/lua/409/packer.lua index d21b7ae..238235f 100755 --- a/lua/409/packer.lua +++ b/lua/409/packer.lua @@ -11,15 +11,13 @@ return require('packer').startup(function(use) } use { - 'nvim-telescope/telescope.nvim', tag = '0.1.4', + 'nvim-telescope/telescope.nvim', requires = { {'nvim-lua/plenary.nvim'} } } use { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = {}, + "catppuccin/nvim", + as = "catppuccin" } use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) diff --git a/lua/409/remap.lua b/lua/409/remap.lua index 98d6f25..348c849 100755 --- a/lua/409/remap.lua +++ b/lua/409/remap.lua @@ -26,8 +26,8 @@ vim.keymap.set("n", "Q", "") vim.keymap.set("n", "", "silent !tmux neww tmux-sessionizer") vim.keymap.set("n", "f", vim.lsp.buf.format) -vim.keymap.set("n", "", "cnextzz") -vim.keymap.set("n", "", "cprevzz") +-- vim.keymap.set("n", "", "cnextzz") +-- vim.keymap.set("n", "", "cprevzz") vim.keymap.set("n", "k", "lnextzz") vim.keymap.set("n", "j", "lprevzz") @@ -38,3 +38,7 @@ vim.keymap.set("n", "", function() vim.cmd("so") end) +vim.keymap.set("n", "", " TmuxNavigateLeft"); +vim.keymap.set("n", "", " TmuxNavigateRight"); +vim.keymap.set("n", "", " TmuxNavigateDown"); +vim.keymap.set("n", "", " TmuxNavigateUp"); diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua old mode 100755 new mode 100644 index 67cbfc4..256b346 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/j409/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?/init.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/j409/.cache/nvim/packer_hererocks/2.1.1700008891/lib/lua/5.1/?.so" +local package_path_str = "/home/j409/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?/init.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?.lua;/home/j409/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/j409/.cache/nvim/packer_hererocks/2.1.1702233742/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 @@ -79,6 +79,11 @@ _G.packer_plugins = { path = "/home/j409/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, + catppuccin = { + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, ["cmp-nvim-lsp"] = { loaded = true, path = "/home/j409/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", @@ -134,11 +139,6 @@ _G.packer_plugins = { path = "/home/j409/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, - ["tokyonight.nvim"] = { - loaded = true, - path = "/home/j409/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", - url = "https://github.com/folke/tokyonight.nvim" - }, undotree = { loaded = true, path = "/home/j409/.local/share/nvim/site/pack/packer/start/undotree",