-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from djensenius/moar-tweaks
Moar tweaks
- Loading branch information
Showing
27 changed files
with
704 additions
and
696 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| -- luacheck: globals noshowmode linebreak on | ||
| vim.opt.syntax=on | ||
| vim.opt.nu=true | ||
| vim.opt.showmode=noshowmode | ||
| vim.opt.ruler=true | ||
| vim.opt.showcmd=true | ||
| vim.opt.syntax = on | ||
| vim.opt.nu = true | ||
| vim.opt.showmode = noshowmode | ||
| vim.opt.ruler = true | ||
| vim.opt.showcmd = true | ||
| vim.opt.writebackup = false | ||
| vim.opt.swapfile=false | ||
| vim.opt.laststatus=2 | ||
| vim.opt.autoread=true | ||
| vim.opt.history=1000 | ||
| vim.opt.scrolloff=8 | ||
| vim.opt.sidescroll=1 | ||
| vim.opt.sidescrolloff=15 | ||
| vim.opt.wrap=linebreak | ||
| vim.opt.showbreak=" " | ||
| vim.opt.visualbell=true | ||
| vim.opt.wildmenu=true | ||
| vim.opt.mouse:append('a') | ||
| vim.opt.statusline:append('%f') | ||
| vim.opt.cursorline=true | ||
| vim.opt.swapfile = false | ||
| vim.opt.laststatus = 2 | ||
| vim.opt.autoread = true | ||
| vim.opt.history = 1000 | ||
| vim.opt.scrolloff = 8 | ||
| vim.opt.sidescroll = 1 | ||
| vim.opt.sidescrolloff = 15 | ||
| vim.opt.wrap = linebreak | ||
| vim.opt.showbreak = " " | ||
| vim.opt.visualbell = true | ||
| vim.opt.wildmenu = true | ||
| vim.opt.mouse:append("a") | ||
| vim.opt.statusline:append("%f") | ||
| vim.opt.cursorline = true | ||
|
|
||
| -- Tab/indent configuration | ||
| vim.opt.tabstop=2 | ||
| vim.opt.shiftwidth=2 | ||
| vim.opt.expandtab=true | ||
| vim.opt.softtabstop=2 | ||
| vim.opt.autoindent=true | ||
| vim.opt.cindent=true | ||
| vim.opt.smarttab=true | ||
| vim.opt.tabstop = 2 | ||
| vim.opt.shiftwidth = 2 | ||
| vim.opt.expandtab = true | ||
| vim.opt.softtabstop = 2 | ||
| vim.opt.autoindent = true | ||
| vim.opt.cindent = true | ||
| vim.opt.smarttab = true | ||
|
|
||
| -- Search configuration | ||
| vim.opt.smartcase=true | ||
| vim.opt.ignorecase=true | ||
| vim.opt.hlsearch=true | ||
| vim.opt.incsearch=true | ||
| vim.opt.smartcase = true | ||
| vim.opt.ignorecase = true | ||
| vim.opt.hlsearch = true | ||
| vim.opt.incsearch = true | ||
|
|
||
| -- Undo file settings | ||
| vim.opt.undofile=true | ||
| vim.opt.undolevels=1000 | ||
| vim.opt.undoreload=10000 | ||
| vim.opt.updatetime=100 | ||
| vim.g.python_host_prog="/usr/bin/python3" | ||
| vim.opt.undofile = true | ||
| vim.opt.undolevels = 1000 | ||
| vim.opt.undoreload = 10000 | ||
| vim.opt.updatetime = 100 | ||
| vim.g.python_host_prog = "/usr/bin/python3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,61 @@ | ||
| -- Move around splits with <c-hjkl> | ||
| vim.keymap.set('n', '<C-k>', '<C-w><Up>') | ||
| vim.keymap.set('n', '<C-j>', '<C-w><Down>') | ||
| vim.keymap.set('n', '<C-l>', '<C-w><Right>') | ||
| vim.keymap.set('n', '<C-h>', '<C-w><Left>') | ||
| vim.keymap.set("n", "<C-k>", "<C-w><Up>") | ||
| vim.keymap.set("n", "<C-j>", "<C-w><Down>") | ||
| vim.keymap.set("n", "<C-l>", "<C-w><Right>") | ||
| vim.keymap.set("n", "<C-h>", "<C-w><Left>") | ||
|
|
||
| vim.keymap.set('i', '<C-k>', '<Up>') | ||
| vim.keymap.set('i', '<C-j>', '<Down>') | ||
| vim.keymap.set('i', '<C-l>', '<Right>') | ||
| vim.keymap.set('i', '<C-h>', '<Left>') | ||
| vim.keymap.set("i", "<C-k>", "<Up>") | ||
| vim.keymap.set("i", "<C-j>", "<Down>") | ||
| vim.keymap.set("i", "<C-l>", "<Right>") | ||
| vim.keymap.set("i", "<C-h>", "<Left>") | ||
|
|
||
| -- Buffer and tab operations with <s-hjkl> | ||
| vim.keymap.set('n', '<s-h>', ':bprevious<cr>') | ||
| vim.keymap.set('n', '<s-l>', ':bnext<cr>') | ||
| vim.keymap.set('n', '<s-j>', ':tabnext<cr>') | ||
| vim.keymap.set('n', '<s-k>', ':tabprev<cr>') | ||
| vim.keymap.set('n', '<s-t>', ':tabnew<cr>') | ||
| vim.keymap.set("n", "<s-h>", ":bprevious<cr>") | ||
| vim.keymap.set("n", "<s-l>", ":bnext<cr>") | ||
| vim.keymap.set("n", "<s-j>", ":tabnext<cr>") | ||
| vim.keymap.set("n", "<s-k>", ":tabprev<cr>") | ||
| vim.keymap.set("n", "<s-t>", ":tabnew<cr>") | ||
|
|
||
| -- Copilot | ||
| vim.keymap.set('n', '<leader>cp', ':Copilot panel<cr>') | ||
| vim.keymap.set("n", "<leader>cp", ":Copilot panel<cr>") | ||
|
|
||
| vim.keymap.set('n', '<leader>no', ':set nonu<cr>') | ||
| vim.keymap.set('n', '<leader>nu', ':set nu<cr>') | ||
| vim.keymap.set('n', '<leader>rn', ':set rnu<cr>') | ||
| vim.keymap.set('n', '<leader>nrn', ':set nornu<cr>') | ||
| vim.keymap.set('n', '<leader>nh', ':nohls<cr>') | ||
| vim.keymap.set('n', '<leader>so', ':source ~/.config/nvim/init.lua<cr>') | ||
| vim.keymap.set('n', '<leader>tt', ':TroubleToggle<cr>') | ||
| vim.keymap.set("n", "<leader>no", ":set nonu<cr>") | ||
| vim.keymap.set("n", "<leader>nu", ":set nu<cr>") | ||
| vim.keymap.set("n", "<leader>rn", ":set rnu<cr>") | ||
| vim.keymap.set("n", "<leader>nrn", ":set nornu<cr>") | ||
| vim.keymap.set("n", "<leader>nh", ":nohls<cr>") | ||
| vim.keymap.set("n", "<leader>so", ":source ~/.config/nvim/init.lua<cr>") | ||
| vim.keymap.set("n", "<leader>tt", ":TroubleToggle<cr>") | ||
|
|
||
| -- Copy and paste | ||
|
|
||
| if vim.fn.has('macunix') == 1 then | ||
| vim.opt.clipboard = 'unnamedplus' | ||
| if vim.fn.has("macunix") == 1 then | ||
| vim.opt.clipboard = "unnamedplus" | ||
| end | ||
| vim.cmd('vnoremap <silent> y y`]') | ||
| vim.cmd('vnoremap <silent> p p`]') | ||
| vim.cmd('nnoremap <silent> p p`]') | ||
| vim.cmd("vnoremap <silent> y y`]") | ||
| vim.cmd("vnoremap <silent> p p`]") | ||
| vim.cmd("nnoremap <silent> p p`]") | ||
| vim.cmd('nnoremap <silent> x "_x') | ||
| vim.keymap.set('v', '<Leader>y', '"+y') | ||
| vim.keymap.set('v', '<Leader>d', '"+d') | ||
| vim.keymap.set('n', '<Leader>p', '"+p') | ||
| vim.keymap.set('n', '<Leader>P', '"+P') | ||
|
|
||
| vim.keymap.set("v", "<Leader>y", '"+y') | ||
| vim.keymap.set("v", "<Leader>d", '"+d') | ||
| vim.keymap.set("n", "<Leader>p", '"+p') | ||
| vim.keymap.set("n", "<Leader>P", '"+P') | ||
|
|
||
| -- Split | ||
| vim.keymap.set('', '<leader>sp', ':split<cr>') | ||
| vim.keymap.set('', '<leader>sv', ':vsplit<cr>') | ||
|
|
||
| vim.keymap.set("", "<leader>sp", ":split<cr>") | ||
| vim.keymap.set("", "<leader>sv", ":vsplit<cr>") | ||
|
|
||
| -- File operations | ||
| vim.api.nvim_create_user_command("CopyFullPath", function() | ||
| local path = vim.fn.expand("%:p") | ||
| vim.fn.setreg("+", path) | ||
| vim.cmd('OSCYankRegister +') | ||
| local path = vim.fn.expand("%:p") | ||
| vim.fn.setreg("+", path) | ||
| vim.cmd("OSCYankRegister +") | ||
| end, {}) | ||
| vim.keymap.set('n', '<leader>cf', ':CopyFullPath<cr>') | ||
| vim.keymap.set("n", "<leader>cf", ":CopyFullPath<cr>") | ||
|
|
||
| vim.api.nvim_create_user_command("CopyRelativePath", function() | ||
| local path = vim.fn.expand("%:.") | ||
| vim.fn.setreg("+", path) | ||
| vim.cmd('OSCYankRegister +') | ||
| local path = vim.fn.expand("%:.") | ||
| vim.fn.setreg("+", path) | ||
| vim.cmd("OSCYankRegister +") | ||
| end, {}) | ||
| vim.keymap.set('n', '<leader>cr', ':CopyRelativePath<cr>') | ||
| vim.keymap.set("n", "<leader>cr", ":CopyRelativePath<cr>") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,30 @@ | ||
| return { | ||
| "akinsho/bufferline.nvim", | ||
| dependencies = { "nvim-tree/nvim-web-devicons" }, | ||
| config = function() | ||
| require('bufferline').setup { | ||
| options = { | ||
| offsets = { | ||
| { | ||
| filetype = "neo-tree", | ||
| text = "File explorer", | ||
| highlight = "Directory", | ||
| separator = true -- use a "true" to enable the default, or set your own character | ||
| } | ||
| }, | ||
| numbers = function(opts) | ||
| return string.format('%s', opts.raise(opts.id)) | ||
| end, | ||
| hover = { | ||
| enabled = true, | ||
| delay = 200, | ||
| reveal = {'close'} | ||
| }, | ||
| mode = "tabs", | ||
| diagnostics = "nvim_lsp", | ||
| separator_style = "slant", | ||
| } | ||
| } | ||
| end | ||
| "akinsho/bufferline.nvim", | ||
| event = "VeryLazy", | ||
| dependencies = { "nvim-tree/nvim-web-devicons" }, | ||
| config = function() | ||
| require("bufferline").setup({ | ||
| options = { | ||
| offsets = { | ||
| { | ||
| filetype = "neo-tree", | ||
| text = "File explorer", | ||
| highlight = "Directory", | ||
| separator = true, -- use a "true" to enable the default, or set your own character | ||
| }, | ||
| }, | ||
| numbers = function(opts) | ||
| return string.format("%s", opts.raise(opts.id)) | ||
| end, | ||
| hover = { | ||
| enabled = true, | ||
| delay = 200, | ||
| reveal = { "close" }, | ||
| }, | ||
| mode = "tabs", | ||
| diagnostics = "nvim_lsp", | ||
| separator_style = "slant", | ||
| }, | ||
| }) | ||
| end, | ||
| } |
Oops, something went wrong.