diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index 99d0d3e..56631db 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -11,8 +11,7 @@ map : w % AsyncRun md2pdf "%" map : w % AsyncRun md2beamer "%" map : w % AsyncRun md2docx % map : !zathura %:r.pdf & -inoremap b ****hi -inoremap i **i +inoremap ;b ****hi command Stab Tabularize /\s\+\zs\s/l1c0 nnoremap ;t :Tabularize /\s\+\zs\s/l1c0 set tw=1000 diff --git a/ftplugin/python.vim b/ftplugin/python.vim index 396f421..0ba4aaa 100644 --- a/ftplugin/python.vim +++ b/ftplugin/python.vim @@ -1,3 +1,3 @@ set colorcolumn=100 nmap ;x [hv]h]hk$;sc -set tw=1000 +set tw=100 diff --git a/init.lua b/init.lua index a0b483a..694cea1 100644 --- a/init.lua +++ b/init.lua @@ -205,7 +205,6 @@ require("lazy").setup({ }, "christoomey/vim-tmux-navigator", "kana/vim-textobj-user", - "mechatroner/rainbow_csv", { "GCBallesteros/vim-textobj-hydrogen", dependencies = { @@ -261,7 +260,7 @@ require("lazy").setup({ highlight = { italic = true, }, - ignore_blank_lines = false, -- ignore blank lines when sending visual select lines + ignore_blank_lines = true, -- ignore blank lines when sending visual select lines }) vim.keymap.set("n", ";rs", "IronRepl") vim.keymap.set("n", ";rr", "IronRestart") @@ -271,7 +270,6 @@ require("lazy").setup({ repl_open_cmd = "horizontal bot 20 split" end, }, - "norcalli/nvim-colorizer.lua", "ixru/nvim-markdown", "KeitaNakamura/tex-conceal.vim", "christoomey/vim-tmux-navigator", @@ -448,7 +446,6 @@ require("lazy").setup({ "cpp", }, }, - taplo = {}, yamlls = {}, -- gopls = {}, jdtls = { @@ -478,7 +475,6 @@ require("lazy").setup({ }, }, }, - arduino_language_server = {}, ltex = { settings = { ltex = { @@ -557,6 +553,7 @@ require("lazy").setup({ "stylua", -- Used to format lua code "black", "clang-format", + "ormolu", "beautysh", "latexindent", "prettier", @@ -684,20 +681,6 @@ require("lazy").setup({ insert(2), text(")"), }), - snip({ - trig = "header", - namr = "header", - dscr = "Yaml header for markdown notes", - }, { - text({ "---", "" }), - text("title: "), - insert(1), - text({ "", "author: Alex Selimov", "" }), - text("tags: ["), - insert(2), - text({ "]", "", "" }), - text({ "---", "" }), - }), }, }) end, @@ -762,18 +745,18 @@ require("lazy").setup({ end, }, }, + { -- You can easily change to a different colorscheme. -- Change the name of the colorscheme plugin below, and then -- change the command in the config to whatever the name of that colorscheme is -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme` + "morhetz/gruvbox", lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins - "zenbones-theme/zenbones.nvim", - dependencies = "rktjmp/lush.nvim", config = function() -- Load the colorscheme here - vim.cmd.colorscheme("zenwritten") + vim.cmd.colorscheme("gruvbox") end, }, @@ -837,83 +820,8 @@ require("lazy").setup({ -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects end, }, - { - "folke/snacks.nvim", - priority = 1000, - lazy = false, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - dashboard = { enabled = true }, - input = { enabled = true }, - terminal = { enabled = true }, - }, - keys = { - { - "T", - function() - Snacks.terminal() - end, - desc = "Toggle Terminal", - }, - }, - }, "airblade/vim-gitgutter", - "tpope/vim-abolish", - { - "danymat/neogen", - setup = { - snippet_engine = "luasnip", - }, - config = function() - require("neogen").setup({}) - local opts = { noremap = true, silent = true } - vim.api.nvim_set_keymap("n", "dg", ":lua require('neogen').generate()", opts) - end, - version = "*", - }, - "dhruvasagar/vim-table-mode", - { - "folke/trouble.nvim", - opts = {}, -- for default options, refer to the configuration section for custom setup. - cmd = "Trouble", - keys = { - { - "xx", - "Trouble diagnostics toggle", - desc = "Diagnostics (Trouble)", - }, - { - "xX", - "Trouble diagnostics toggle filter.buf=0", - desc = "Buffer Diagnostics (Trouble)", - }, - { - "cs", - "Trouble symbols toggle focus=false", - desc = "Symbols (Trouble)", - }, - { - "cl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)", - }, - { - "xL", - "Trouble loclist toggle", - desc = "Location List (Trouble)", - }, - { - "xQ", - "Trouble qflist toggle", - desc = "Quickfix List (Trouble)", - }, - }, - }, }) - -require("colorizer").setup() --Set rustfmt command vim.g["rustfmt_command"] = "rustfmt +nightly" --Disable semantic highlights @@ -928,14 +836,7 @@ vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { vim.bo.filetype = "scorch" end, }) --- ---Testing scorch highlighting -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = "*.sep", - callback = function() - vim.bo.filetype = "sep" - end, -}) + -- Commands to disable formatting require("conform").setup({ format_on_save = function(bufnr) @@ -964,13 +865,3 @@ vim.api.nvim_create_user_command("FormatEnable", function() end, { desc = "Re-enable autoformat-on-save", }) - -function file_exists(name) - local f = io.open(name, "r") - return f ~= nil and io.close(f) -end - -local home = os.getenv("HOME") -if file_exists(home .. "/.config/nvim/light_mode") then - vim.opt.background = "light" -end