From ce1ea93cbcc8ea6d6c4ec0a588dc2ac2d7563469 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 16 Jun 2023 14:42:38 -0700 Subject: [PATCH] adding in new color scheme --- after/plugin/colors.lua | 12 ++++-------- after/plugin/lsp.lua | 2 +- after/plugin/telescope.lua | 2 +- init.lua | 1 - lua/talksik/packer.lua | 12 +++--------- plugin/packer_compiled.lua | 17 ++++++----------- 6 files changed, 15 insertions(+), 31 deletions(-) diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index fe97b1b..654a689 100644 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -1,14 +1,10 @@ -require('rose-pine').setup({ - disable_background = true +require('catppuccin').setup({ + flavour = "latte" }) -function ColorMyPencils(color) - color = color or "rose-pine" +function ColorMyPencils(color) + color = color or "catppuccin" vim.cmd.colorscheme(color) - - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - end ColorMyPencils() diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index 1066464..72bb9d5 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -51,7 +51,7 @@ lsp.on_attach(function(client, bufnr) vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "gl", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "lg", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) vim.keymap.set("n", "la", function() vim.lsp.buf.code_action() end, opts) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua index be1f18a..1f1ceed 100755 --- a/after/plugin/telescope.lua +++ b/after/plugin/telescope.lua @@ -5,7 +5,7 @@ require('telescope').setup { }, } -vim.keymap.set('n', 'ff', builtin.git_files, {}) +vim.keymap.set('n', 'f', builtin.git_files, {}) vim.keymap.set('n', 'ww', builtin.live_grep, {}) vim.keymap.set('n', 'sr', builtin.lsp_references, {}) vim.keymap.set('n', 'ss', builtin.lsp_document_symbols, {}) diff --git a/init.lua b/init.lua index 2d8a5c4..500a402 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1 @@ require("talksik") - diff --git a/lua/talksik/packer.lua b/lua/talksik/packer.lua index 3b8f532..b3c2628 100644 --- a/lua/talksik/packer.lua +++ b/lua/talksik/packer.lua @@ -15,14 +15,6 @@ return require('packer').startup(function(use) requires = { { 'nvim-lua/plenary.nvim' } } } - use({ - 'rose-pine/neovim', - as = 'rose-pine', - config = function() - vim.cmd('colorscheme rose-pine') - end - }) - use({ 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }) use('nvim-treesitter/playground') use('mbbill/undotree') @@ -75,5 +67,7 @@ return require('packer').startup(function(use) -- Adds extra functionality over rust analyzer use("simrat39/rust-tools.nvim") - use("theprimegean/harpoon") + use("ThePrimeagen/harpoon") + + use { "catppuccin/nvim", as = "catppuccin" } end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index ce5731f..8ed71df 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -85,6 +85,11 @@ _G.packer_plugins = { path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, + catppuccin = { + loaded = true, + path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/catppuccin", + url = "https://github.com/catppuccin/nvim" + }, ["cellular-automaton.nvim"] = { loaded = true, path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/cellular-automaton.nvim", @@ -138,7 +143,7 @@ _G.packer_plugins = { harpoon = { loaded = true, path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/harpoon", - url = "https://github.com/theprimeagen/harpoon" + url = "https://github.com/ThePrimeagen/harpoon" }, ["lsp-zero.nvim"] = { loaded = true, @@ -200,12 +205,6 @@ _G.packer_plugins = { path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, - ["rose-pine"] = { - config = { "\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0" }, - loaded = true, - path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/rose-pine", - url = "https://github.com/rose-pine/neovim" - }, ["rust-tools.nvim"] = { loaded = true, path = "/home/talksik-fedora/.local/share/nvim/site/pack/packer/start/rust-tools.nvim", @@ -233,10 +232,6 @@ time([[Defining packer_plugins]], false) time([[Config for Comment.nvim]], true) try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim") time([[Config for Comment.nvim]], false) --- Config for: rose-pine -time([[Config for rose-pine]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine") -time([[Config for rose-pine]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then