From d26b3f483bdce0a5ea92519994460537f2e2b64d Mon Sep 17 00:00:00 2001 From: tony Date: Sun, 9 Feb 2025 22:02:52 -0800 Subject: [PATCH] Fixed other stuff and added binds --- lua/config/keybinds.lua | 54 +++++++++++++++++++++++++++++++++++++++-- lua/config/options.lua | 49 ++++++++++++++++++++++++++++++++++--- lua/plugins/colors.lua | 35 ++++++++++++++++---------- 3 files changed, 120 insertions(+), 18 deletions(-) diff --git a/lua/config/keybinds.lua b/lua/config/keybinds.lua index 88edc00..4315a83 100644 --- a/lua/config/keybinds.lua +++ b/lua/config/keybinds.lua @@ -1,5 +1,55 @@ -- KEYBINDS - vim.g.mapleader = " " - vim.keymap.set("n", "cd", vim.cmd.Ex) + +vim.keymap.set("v", "J", ":m '>+1gv=gv") -- Alt Up/Down in vscode +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "J", "mzJ`z") -- Remap joining lines +vim.keymap.set("n", "", "zz") -- Keep cursor in place while moving up/down page +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") -- center screen when looping search results +vim.keymap.set("n", "N", "Nzzzv") + +-- paste and don't replace clipboard over deleted text +vim.keymap.set("x", "p", [["_dP]]) +vim.keymap.set({"n", "v"}, "d", [["_d]]) + + +-- sometimes in insert mode, control-c doesn't exactly work like escape +vim.keymap.set("i", "", "") + +vim.keymap.set("n", "", "cnextzz") +vim.keymap.set("n", "", "cprevzz") + +-- What the heck is Ex mode? +vim.keymap.set("n", "Q", "") + +vim.keymap.set("n", "k", "lnextzz") +vim.keymap.set("n", "j", "lprevzz") + +-- getting Alex off my back :) +vim.keymap.set("n", "dg", "DogeGenerate") + +-- lint / format php files for LC +vim.keymap.set("n", "cc", "!php-cs-fixer fix % --using-cache=no") + +-- Replace all instances of whatever is under cursor (on line) +vim.keymap.set("n", "s", [[:s/\<\>//gI]]) + +-- make file executable +vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) + +-- yank into clipboard even if on ssh +vim.keymap.set('n', 'y', 'OSCYankOperator') +vim.keymap.set('v', 'y', 'OSCYankVisual') + +-- reload without exiting vim +vim.keymap.set("n", "rl", "source ~/.config/nvim/init.lua") + +vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) + +-- source file +vim.keymap.set("n", "", function() + vim.cmd("so") +end) diff --git a/lua/config/options.lua b/lua/config/options.lua index 33466c4..52de0a7 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -5,8 +5,51 @@ local set = vim.opt set.relativenumber = true set.number = true ---tab spaces globally +-- indentation and tabs +set.tabstop = 4 set.shiftwidth = 4 +set.autoindent = true +set.expandtab = true --- signcolumn and cursor -set.signcolumn = 'yes' +-- search settings +set.ignorecase = true +set.smartcase = true + +-- appearance +set.termguicolors = true +set.background = "dark" +set.signcolumn = "yes" + +-- cursor line +set.cursorline = true + +-- 80th column +set.colorcolumn = "80" + +-- clipboard +set.clipboard:append("unnamedplus") + +-- backspace +set.backspace = "indent,eol,start" + +-- split windows +set.splitbelow = true +set.splitright = true + +-- dw/diw/ciw works on full-word +set.iskeyword:append("-") + +-- keep cursor at least 8 rows from top/bot +set.scrolloff = 8 + +-- undo dir settings +set.swapfile = false +set.backup = false +set.undodir = os.getenv("HOME") .. "/.vim/undodir" +set.undofile = true + +-- incremental search +set.incsearch = true + +-- faster cursor hold +set.updatetime = 50 diff --git a/lua/plugins/colors.lua b/lua/plugins/colors.lua index e4d39e7..702b12a 100644 --- a/lua/plugins/colors.lua +++ b/lua/plugins/colors.lua @@ -1,15 +1,24 @@ +function enable_transparency() + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.api.nvim_set_hl(0, "LineNr", { bg= "none" }) +end + return { - -- { - -- "Mofiqul/voscode.nvim", - -- name = 'vscode', - -- config = function() - -- vim.cmd.colorscheme "vscode" - -- end - -- } - { - "folke/tokyonight.nvim", - config = function() - vim.cmd.colorscheme "tokyonight" - end - } + { + "folke/tokyonight.nvim", + config = function() + vim.cmd.colorscheme "tokyonight" + vim.cmd('hi Directory guibg=NONE') + vim.cmd('hi SignColumn guibg=NONE') + enable_transparency() + end + }, + -- { + -- "Mofiqul/voscode.nvim", + -- name = 'vscode', + -- config = function() + -- vim.cmd.colorscheme "vscode" + -- end + -- } }