From 201e36c823925ccb6d0b608b2ce985ec32b2e276 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 13 Apr 2024 21:39:37 +0200 Subject: rollback dotfiles and fix dotter --- .config/nvim/lua/keymap.lua | 37 ++++++++++-------------- .config/nvim/lua/plug.lua | 66 +++++++++++++++++++++++++++++++++++-------- .config/nvim/lua/settings.lua | 10 +++++-- 3 files changed, 77 insertions(+), 36 deletions(-) (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua index ccab671..5b709cb 100644 --- a/.config/nvim/lua/keymap.lua +++ b/.config/nvim/lua/keymap.lua @@ -12,18 +12,9 @@ vim.api.nvim_set_keymap("n", "ec", ":e $MYVIMRC", {noremap = true}) vim.api.nvim_set_keymap("n", "tn", ":tabnew", {noremap = true}) vim.api.nvim_set_keymap("n", "tc", ":tabclose", {noremap = true}) vim.api.nvim_set_keymap("n", "tt", ":tabnew:terma", {noremap = true}) -vim.api.nvim_set_keymap("n", "Tn", ":tnext", {noremap = true}) -vim.api.nvim_set_keymap("n", "Tp", ":tprevious", {noremap = true}) -vim.api.nvim_set_keymap("n", "Tf", ":tfirst", {noremap = true}) -vim.api.nvim_set_keymap("n", "Tl", ":tlast", {noremap = true}) -vim.api.nvim_set_keymap("n", "tselect", ":tselect", {noremap = true}) -vim.api.nvim_set_keymap("n", "Tc", ":!ctags -R --sort=yes --c++-kins=+p --filed=+iaS --extras=+q . ", {noremap = true}) -vim.api.nvim_set_keymap("n", "f", ":Lexplore", {noremap = true}) -vim.api.nvim_set_keymap("n", "F", ":Lexplore %:p:h", {noremap = true}) - -vim.api.nvim_set_keymap("n", "zt", ":VZKFindTag", {noremap = true}) -vim.api.nvim_set_keymap("n", "zh", ":VZKHistory", {noremap = true}) +vim.api.nvim_set_keymap("n", "f", ":NvimTreeToggle", {noremap = true}) +vim.api.nvim_set_keymap("n", "F", ":NvimTreeFindFileToggle", {noremap = true}) vim.api.nvim_set_keymap("i", "(", "()i", {noremap = true}) vim.api.nvim_set_keymap("i", ")", ":call brackify#putbracket(')')la", {noremap = true}) @@ -31,25 +22,27 @@ vim.api.nvim_set_keymap("i", "[", "[]i", {noremap = true}) vim.api.nvim_set_keymap("i", "]", ":call brackify#putbracket(']')la", {noremap = true}) vim.api.nvim_set_keymap("i", "{", "{}i", {noremap = true}) vim.api.nvim_set_keymap("i", "}", ":call brackify#putbracket('}')la", {noremap = true}) +vim.api.nvim_set_keymap("i", '"', ":call brackify#putquotes('\"')a", {noremap = true}) +vim.api.nvim_set_keymap("i", "'", ":call brackify#putquotes(\"'\")a", {noremap = true}) vim.cmd('autocmd Filetype html inoremap < <>i') vim.cmd('autocmd Filetype html inoremap > :call brackify#putbracket(">")la') +vim.cmd('autocmd FileType tex inoremap " "') +vim.cmd('autocmd FileType tex inoremap \' \'') -vim.api.nvim_set_keymap("i", '"', ":call brackify#putquotes('\"')a", {noremap = true}) -vim.api.nvim_set_keymap("i", "'", ":call brackify#putquotes(\"'\")a", {noremap = true}) vim.api.nvim_set_keymap("v", "(", "s(pa)", {noremap = true}) vim.api.nvim_set_keymap("v", "[", "s[pa]", {noremap = true}) vim.api.nvim_set_keymap("v", "{", "s{pa}", {noremap = true}) vim.api.nvim_set_keymap("v", '"', 's"pa"', {noremap = true}) vim.api.nvim_set_keymap("v", "'", "s'pa'", {noremap = true}) -vim.cmd('autocmd Filetype c nnoremap :CSelNextArg') -vim.cmd('autocmd Filetype rust nnoremap r :!cargo run') -vim.cmd('autocmd Filetype rust nnoremap R :!cargo run --release') -vim.api.nvim_set_keymap("n", "dB", ":GdbBreakpointToggle", {noremap = true}) -vim.api.nvim_set_keymap("n", "dn", ":GdbNext", {noremap = true}) -vim.api.nvim_set_keymap("n", "ds", ":GdbStep", {noremap = true}) -vim.api.nvim_set_keymap("n", "dr", ":GdbRun", {noremap = true}) -vim.api.nvim_set_keymap("n", "dc", ":GdbContinue", {noremap = true}) +vim.api.nvim_set_keymap("i", "a", "ä", {noremap = true}) +vim.api.nvim_set_keymap("i", "A", "Ä", {noremap = true}) +vim.api.nvim_set_keymap("i", "o", "ö", {noremap = true}) +vim.api.nvim_set_keymap("i", "O", "Ö", {noremap = true}) +vim.api.nvim_set_keymap("i", "u", "ü", {noremap = true}) +vim.api.nvim_set_keymap("i", "U", "Ü", {noremap = true}) -vim.cmd("autocmd TextChangedI * lua vim.lsp.omnifunc(1)") +vim.api.nvim_set_keymap("n", "T", ":lua require('cargotest').test_crate()", {noremap = true}) +vim.api.nvim_set_keymap("n", "t", ":lua require('cargotest').test_module()", {noremap = true}) +vim.api.nvim_set_keymap("n", "z", "va{zfzz", {noremap = true}) diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua index 904b496..1a78aa8 100644 --- a/.config/nvim/lua/plug.lua +++ b/.config/nvim/lua/plug.lua @@ -4,16 +4,60 @@ -- ┃ ╹ ╹┗━┛ ┗┛ ╹╹ ╹ ╹ ┗━╸┗━┛┗━┛╹╹ ╹┗━┛ ┃ -- ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ -local Plug = vim.fn['plug#'] - - -vim.call('plug#begin', '~/.local/share/nvim/plugged') - -Plug 'neovim/nvim-lspconfig' -Plug 'nvim-treesitter/nvim-treesitter' -Plug('neoclide/coc.nvim', {branch = 'release'}) -Plug("theRealCarneiro/hyprland-vim-syntax", { ft = "hypr" }) - -vim.call('plug#end') +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) +require("lazy").setup({ + { "nvim-treesitter/nvim-treesitter" }, + { "neovim/nvim-lspconfig" }, + { "L3MON4D3/LuaSnip" }, + { "rafamadriz/friendly-snippets" }, + { "saadparwaiz1/cmp_luasnip" }, + { "hrsh7th/cmp-nvim-lua" }, + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-path" }, + { + 'hrsh7th/nvim-cmp', + event = "InsertEnter", + dependencies = { + { + -- snippet plugin + "L3MON4D3/LuaSnip", + dependencies = "rafamadriz/friendly-snippets", + opts = { history = true, updateevents = "TextChanged,TextChangedI" }, + config = function(_, opts) + require("luasnip").config.set_config(opts) + end, + }, + }, + { + "saadparwaiz1/cmp_luasnip", + "hrsh7th/cmp-nvim-lua", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + }, + }, + { 'cargotest.nvim', url = 'https://git.nathanreiner.xyz/cargotest.nvim' }, + { + "nvim-tree/nvim-tree.lua", + version = "*", + lazy = false, + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("nvim-tree").setup {} + end, + }, +}) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 02cc457..ca2b1e8 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -26,7 +26,9 @@ vim.opt.showcmd = true vim.opt.wildmenu = true vim.opt.hlsearch = true vim.opt.conceallevel = 2 -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "120" +vim.opt.foldmethod = "manual" +vim.opt.cursorline = true vim.cmd('filetype indent on') vim.opt.completeopt = { "menuone", "menu", "longest", "preview", "noinsert", "noselect" } @@ -40,8 +42,6 @@ vim.g.netrw_keepdir = true vim.g.netrw_winsize = 30 vim.cmd('autocmd Filetype netrw setlocal nolist') -vim.g.airline_powerline_fonts = true - vim.cmd("call statusbar#refresh()") local status_ok, configs = pcall(require, "nvim-treesitter.configs") @@ -63,3 +63,7 @@ configs.setup({ enable = true, }, }) + +vim.filetype.add({ + pattern = { [".*/hypr/.*%.conf"] = "hyprlang" }, +}) -- cgit v1.2.3-70-g09d2