From 82abab090124f04ecdc03091418517a9b637bf00 Mon Sep 17 00:00:00 2001 From: BraydonKains Date: Fri, 1 Mar 2024 09:22:30 -0500 Subject: [PATCH] centerpad, also I'm tired of gruvbox for now --- nvim/after/plugin/colours.lua | 17 ++++-- nvim/lua/RageCage64/packer.lua | 97 +++++++++++++++++---------------- nvim/lua/RageCage64/remap.lua | 35 +++++++----- nvim/plugin/packer_compiled.lua | 47 +++++++++------- 4 files changed, 108 insertions(+), 88 deletions(-) diff --git a/nvim/after/plugin/colours.lua b/nvim/after/plugin/colours.lua index 024878e..8d0a17b 100644 --- a/nvim/after/plugin/colours.lua +++ b/nvim/after/plugin/colours.lua @@ -1,13 +1,18 @@ require("rose-pine").setup({ - variant = "moon" + variant = "moon" }) function SetColour(colour) - colour = colour or "gruvbox" - vim.cmd(string.format("colorscheme %s", colour)) + -- 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" }) - --vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + --vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + --vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) end -SetColour() +function UnsetColour() + vim.cmd("colorscheme default") +end + +-- SetColour() diff --git a/nvim/lua/RageCage64/packer.lua b/nvim/lua/RageCage64/packer.lua index 9a657ad..5eec189 100644 --- a/nvim/lua/RageCage64/packer.lua +++ b/nvim/lua/RageCage64/packer.lua @@ -1,51 +1,54 @@ vim.cmd [[packadd packer.nvim]] return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - - -- Navigation - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.5', - -- or , branch = '0.1.x', - requires = { { 'nvim-lua/plenary.nvim' } } - } - - -- Colours - use('ellisonleao/gruvbox.nvim') - use({ 'rose-pine/neovim', as = 'rose-pine' }) - use({ 'bluz71/vim-moonfly-colors', as = 'moonfly' }) - - -- Treesitter - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('nvim-treesitter/playground') - - -- Editing - use('mbbill/undotree') - use('tpope/vim-surround') - use('tpope/vim-commentary') - - -- LSP - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, -- Required - { - -- Optional - 'williamboman/mason.nvim', - run = function() - vim.cmd [[MasonUpdate]] - end, - }, - { 'williamboman/mason-lspconfig.nvim' }, -- Optional - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, -- Required - { 'hrsh7th/cmp-nvim-lsp' }, -- Required - { 'L3MON4D3/LuaSnip' }, -- Required - }, - - use('editorconfig/editorconfig-vim'), - } + use 'wbthomason/packer.nvim' + + -- Navigation + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.5', + -- or , branch = '0.1.x', + requires = { { 'nvim-lua/plenary.nvim' } } + } + + -- Colours + use('ellisonleao/gruvbox.nvim') + use({ 'rose-pine/neovim', as = 'rose-pine' }) + use({ 'bluz71/vim-moonfly-colors', as = 'moonfly' }) + + -- Treesitter + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + use('nvim-treesitter/playground') + + -- Editing + use('mbbill/undotree') + use('tpope/vim-surround') + use('tpope/vim-commentary') + + -- LSP + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v2.x', + requires = { + -- LSP Support + { 'neovim/nvim-lspconfig' }, -- Required + { + -- Optional + 'williamboman/mason.nvim', + run = function() + vim.cmd [[MasonUpdate]] + end, + }, + { 'williamboman/mason-lspconfig.nvim' }, -- Optional + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, -- Required + { 'hrsh7th/cmp-nvim-lsp' }, -- Required + { 'L3MON4D3/LuaSnip' }, -- Required + }, + + use('editorconfig/editorconfig-vim'), + + -- For centering when I'm writing documents + use { 'smithbm2316/centerpad.nvim' } + } end) diff --git a/nvim/lua/RageCage64/remap.lua b/nvim/lua/RageCage64/remap.lua index 5520499..f232b39 100644 --- a/nvim/lua/RageCage64/remap.lua +++ b/nvim/lua/RageCage64/remap.lua @@ -9,23 +9,23 @@ vim.keymap.set("x", "p", "\"_dP") -- Enter and space completion local function enter_complete(seq) - local open_seq = string.sub(seq, 1, math.floor(string.len(seq)/2)) - local close_seq = string.sub(seq, math.ceil(string.len(seq)/2)+1, string.len(seq)) - vim.keymap.set( - "i", - string.format("%s", open_seq), - string.format("%s%sO", open_seq, close_seq) - ) + local open_seq = string.sub(seq, 1, math.floor(string.len(seq) / 2)) + local close_seq = string.sub(seq, math.ceil(string.len(seq) / 2) + 1, string.len(seq)) + vim.keymap.set( + "i", + string.format("%s", open_seq), + string.format("%s%sO", open_seq, close_seq) + ) end local function space_complete(seq) - local open_seq = string.sub(seq, 1, string.len(seq)/2) - local lefts = string.rep("", string.len(seq)/2) - vim.keymap.set( - "i", - string.format("%s", open_seq), - string.format("%s%s", seq, lefts) - ) + local open_seq = string.sub(seq, 1, string.len(seq) / 2) + local lefts = string.rep("", string.len(seq) / 2) + vim.keymap.set( + "i", + string.format("%s", open_seq), + string.format("%s%s", seq, lefts) + ) end enter_complete("{}") @@ -48,3 +48,10 @@ vim.keymap.set("v", "c", '"+') -- Reload config vim.keymap.set("n", "rc", ":so $HOME/.config/nvim/init.lua") + +function WritingMode() + require("centerpad").toggle() + vim.opt.wrap = not vim.opt.wrap +end + +vim.keymap.set('n', 'z', ':lua WritingMode()') diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index 158be3c..a062bec 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 = "/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/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,97 +76,102 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { LuaSnip = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/LuaSnip", + path = "/home/braydon/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, + ["centerpad.nvim"] = { + loaded = true, + path = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.local/share/nvim/site/pack/packer/start/moonfly", url = "https://github.com/bluz71/vim-moonfly-colors" }, ["nvim-cmp"] = { loaded = true, - path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.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 = "/home/braydon/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" } }