Vim changes

Signed-off-by: TiagoRG <tiago.rgarcia@ua.pt>
This commit is contained in:
Tiago Garcia 2024-03-03 00:00:41 +00:00 committed by Tiago Garcia
parent c493e25a30
commit ad15079ec7
Signed by: TiagoRG
GPG Key ID: DFCD48E3F420DB42
12 changed files with 80 additions and 26 deletions

View File

@ -1,5 +1,8 @@
local lsp = require("lsp-zero") local lsp = require("lsp-zero")
vim.opt.pumheight = 10
vim.opt.pumwidth = 30
lsp.preset("recommended") lsp.preset("recommended")
-- Fix Undefined global 'vim' -- Fix Undefined global 'vim'

View File

@ -18,7 +18,8 @@ require('lualine').setup {
} }
}, },
sections = { sections = {
lualine_a = { 'fileformat', 'mode' }, -- lualine_a = { 'fileformat', 'mode' },
lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff', 'diagnostics' }, lualine_b = { 'branch', 'diff', 'diagnostics' },
lualine_c = { 'filename', 'aerial' }, lualine_c = { 'filename', 'aerial' },
lualine_x = { 'filesize', 'filetype' }, lualine_x = { 'filesize', 'filetype' },

View File

@ -18,7 +18,7 @@ require("tabset").setup({
} }
}, },
{ {
filetypes = { "Makefile", "make" }, filetypes = { "Makefile", "make", "snippets" },
config = { config = {
tabwidth = 4, tabwidth = 4,
expandtab = false expandtab = false

View File

@ -25,7 +25,7 @@ require 'nvim-treesitter.configs'.setup {
rainbow = { rainbow = {
enable = true, enable = true,
-- list of languages you want to disable the plugin for -- list of languages you want to disable the plugin for
disable = { 'jsx', 'cpp' }, disable = { 'jsx' },
-- Which query to use for finding delimiters -- Which query to use for finding delimiters
query = 'rainbow-parens', query = 'rainbow-parens',
-- Highlight the entire buffer all at once -- Highlight the entire buffer all at once

View File

@ -1 +1 @@
rose-pine monokai-pro

View File

@ -13,6 +13,7 @@ return require('packer').startup(function(use)
} }
use 'olimorris/onedarkpro.nvim' use 'olimorris/onedarkpro.nvim'
use 'Mofiqul/vscode.nvim' use 'Mofiqul/vscode.nvim'
use 'Mofiqul/dracula.nvim'
-- Essentials -- Essentials
use { use {
@ -66,7 +67,6 @@ return require('packer').startup(function(use)
use('wakatime/vim-wakatime') use('wakatime/vim-wakatime')
use('andweeb/presence.nvim') use('andweeb/presence.nvim')
-- Little friend -- Little friend
use("github/copilot.vim") use("github/copilot.vim")
@ -80,7 +80,6 @@ return require('packer').startup(function(use)
"nvim-telescope/telescope.nvim" "nvim-telescope/telescope.nvim"
} }
} }
use "Pocco81/AutoSave.nvim"
use 'TiagoRG/liveshare.nvim' use 'TiagoRG/liveshare.nvim'
end) end)

View File

@ -1,10 +1,17 @@
--vim.keymap.set("n", "<leader>e", vim.cmd.E) --vim.keymap.set("n", "<leader>e", vim.cmd.E)
vim.keymap.set("n", "<leader>w", vim.cmd.w) vim.keymap.set("n", "<leader>w", vim.cmd.w)
vim.keymap.set({ "n", "i" }, "<C-S>", vim.cmd.w) vim.keymap.set({ "n", "i" }, "<C-S>", vim.cmd.w)
vim.keymap.set("n", "<leader>o", "o<Esc>")
vim.keymap.set("n", "<leader>O", "O<Esc>")
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
vim.keymap.set("n", "<C-h>", "<C-w>h")
vim.keymap.set("n", "<C-j>", "<C-w>j")
vim.keymap.set("n", "<C-k>", "<C-w>k")
vim.keymap.set("n", "<C-l>", "<C-w>l")
vim.keymap.set("v", "<Tab>", ">gv") vim.keymap.set("v", "<Tab>", ">gv")
vim.keymap.set("v", "<S-Tab>", "<gv") vim.keymap.set("v", "<S-Tab>", "<gv")
@ -29,10 +36,10 @@ vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
vim.keymap.set("n", "<leader>af", "ggVG") vim.keymap.set("n", "<leader>af", "ggVG")
vim.keymap.set("n", "<leader>ab", "GVgg") vim.keymap.set("n", "<leader>ab", "GVgg")
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz") -- vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz") -- vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz") -- vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz") -- vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
vim.keymap.set("v", "<leader>rs", [[:s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) vim.keymap.set("v", "<leader>rs", [[:s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.keymap.set("n", "<leader>ra", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) vim.keymap.set("n", "<leader>ra", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])

View File

@ -4,17 +4,23 @@ vim.g.mouse = "a"
vim.opt.updatetime = 50 vim.opt.updatetime = 50
vim.opt.wrap = false vim.opt.wrap = false
vim.opt.nu = true vim.opt.number = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
vim.opt.scrolloff = 10
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes"
vim.opt.scrolloff = 10
vim.opt.colorcolumn = "0" vim.opt.colorcolumn = "0"
vim.opt.cursorline = true
vim.opt.hlsearch = true
vim.opt.incsearch = true
vim.opt.ignorecase = true
vim.opt.scs = true
vim.opt.smartindent = true vim.opt.smartindent = true
vim.opt.autoindent = true
vim.opt.hls = true vim.opt.showmode = false
vim.opt.is = true vim.opt.wildmenu = true
vim.opt.ic = true
vim.opt.swapfile = false vim.opt.swapfile = false
vim.opt.backup = false vim.opt.backup = false
@ -25,6 +31,5 @@ vim.opt.termguicolors = true
vim.opt.isfname:append("@-@") vim.opt.isfname:append("@-@")
vim.opt.guitablabel = "\\[%N\\]\\ %t\\ %M" vim.opt.guitablabel = "\\[%N\\]\\ %t\\ %M"
vim.g.copilot_node_command = "/usr/bin/nodenv" vim.g.copilot_node_command = "/usr/bin/nodenv"
vim.g.copilot_assume_mapped = true vim.g.copilot_assume_mapped = true

View File

@ -74,11 +74,6 @@ end
time([[try_loadstring definition]], false) time([[try_loadstring definition]], false)
time([[Defining packer_plugins]], true) time([[Defining packer_plugins]], true)
_G.packer_plugins = { _G.packer_plugins = {
["AutoSave.nvim"] = {
loaded = true,
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/AutoSave.nvim",
url = "https://github.com/Pocco81/AutoSave.nvim"
},
["ChatGPT.nvim"] = { ["ChatGPT.nvim"] = {
loaded = true, loaded = true,
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/ChatGPT.nvim", path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/ChatGPT.nvim",
@ -139,6 +134,11 @@ _G.packer_plugins = {
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/copilot.vim", path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/copilot.vim",
url = "https://github.com/github/copilot.vim" url = "https://github.com/github/copilot.vim"
}, },
["dracula.nvim"] = {
loaded = true,
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/dracula.nvim",
url = "https://github.com/Mofiqul/dracula.nvim"
},
["friendly-snippets"] = { ["friendly-snippets"] = {
loaded = true, loaded = true,
path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/friendly-snippets", path = "/home/tiagorg/.local/share/nvim/site/pack/packer/start/friendly-snippets",

View File

@ -0,0 +1,28 @@
snippet detports
.equ ADDR_BASE, 0xBF88
.equ TRISB, 0x6040
.equ PORTB, 0x6050
.equ LATB, 0x6060
.equ TRISC, 0x6080
.equ PORTC, 0x6090
.equ LATC, 0x60A0
.equ TRISD, 0x60C0
.equ PORTD, 0x60D0
.equ LATD, 0x60E0
.equ TRISE, 0x6100
.equ PORTE, 0x6110
.equ LATE, 0x6120
snippet detsyscalls
.equ INKEY, 1
.equ GETCHAR, 2
.equ PUTCHAR, 3
.equ READ_INT, 4
.equ READ_INT10, 5
.equ PRINT_INT, 6
.equ PRINT_INT10, 7
.equ PRINT_STR, 8
.equ READ_STR, 9
.equ EXIT, 10
.equ READ_CORE_TIMER, 11
.equ RESET_CORE_TIMER, 12

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
# Vim stuff # Vim stuff
.vim/.netrwhist .vim/.netrwhist
.vim/undodir/ .vim/undodir/
.vim/pack/

20
.vimrc
View File

@ -1,18 +1,21 @@
set nu set number
set relativenumber set relativenumber
set signcolumn=yes set signcolumn=auto
set colorcolumn=0 set colorcolumn=0
set cursorline
set smartindent set smartindent
set tabstop=4 set tabstop=4
set shiftwidth=4 set shiftwidth=4
set ls=2 set ls=2
set hls set hlsearch
set is set incsearch
set ic set ignorecase
set scrolloff=10 set scrolloff=10
set wildmenu
let g:mapleader=" " let g:mapleader=" "
syntax on syntax on
@ -20,6 +23,13 @@ colorscheme onedark
nnoremap <leader>w :w<CR> nnoremap <leader>w :w<CR>
nnoremap <leader>e :E<CR> nnoremap <leader>e :E<CR>
nnoremap <leader>o o<Esc>
nnoremap <leader>O O<Esc>
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
nnoremap <C-l> <C-w>l
xnoremap J :move '>+1<CR>gv=gv xnoremap J :move '>+1<CR>gv=gv
xnoremap K :move '<-2<CR>gv=gv xnoremap K :move '<-2<CR>gv=gv