Compare commits

..

No commits in common. "master" and "feature/lua-configs" have entirely different histories.

3 changed files with 7 additions and 94 deletions

View File

@ -11,8 +11,7 @@ map <C-b> : w % <Bar> AsyncRun md2pdf "%" <CR>
map <A-p> : w % <Bar> AsyncRun md2beamer "%" <CR> map <A-p> : w % <Bar> AsyncRun md2beamer "%" <CR>
map <A-b> : w % <Bar> AsyncRun md2docx % <CR> map <A-b> : w % <Bar> AsyncRun md2docx % <CR>
map <C-z> : !zathura %:r.pdf & <CR> map <C-z> : !zathura %:r.pdf & <CR>
inoremap <leader>b ****<esc>hi inoremap ;b ****<esc>hi
inoremap <leader>i **<esc>i
command Stab Tabularize /\s\+\zs\s/l1c0 command Stab Tabularize /\s\+\zs\s/l1c0
nnoremap ;t :Tabularize /\s\+\zs\s/l1c0<CR> nnoremap ;t :Tabularize /\s\+\zs\s/l1c0<CR>
set tw=1000 set tw=1000

View File

@ -1,3 +1,3 @@
set colorcolumn=100 set colorcolumn=100
nmap ;x [hv]h]hk$;sc nmap ;x [hv]h]hk$;sc
set tw=1000 set tw=100

View File

@ -205,7 +205,6 @@ require("lazy").setup({
}, },
"christoomey/vim-tmux-navigator", "christoomey/vim-tmux-navigator",
"kana/vim-textobj-user", "kana/vim-textobj-user",
"mechatroner/rainbow_csv",
{ {
"GCBallesteros/vim-textobj-hydrogen", "GCBallesteros/vim-textobj-hydrogen",
dependencies = { dependencies = {
@ -261,7 +260,7 @@ require("lazy").setup({
highlight = { highlight = {
italic = true, 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", "<cmd>IronRepl<cr>") vim.keymap.set("n", ";rs", "<cmd>IronRepl<cr>")
vim.keymap.set("n", ";rr", "<cmd>IronRestart<cr>") vim.keymap.set("n", ";rr", "<cmd>IronRestart<cr>")
@ -271,7 +270,6 @@ require("lazy").setup({
repl_open_cmd = "horizontal bot 20 split" repl_open_cmd = "horizontal bot 20 split"
end, end,
}, },
"norcalli/nvim-colorizer.lua",
"ixru/nvim-markdown", "ixru/nvim-markdown",
"KeitaNakamura/tex-conceal.vim", "KeitaNakamura/tex-conceal.vim",
"christoomey/vim-tmux-navigator", "christoomey/vim-tmux-navigator",
@ -557,6 +555,7 @@ require("lazy").setup({
"stylua", -- Used to format lua code "stylua", -- Used to format lua code
"black", "black",
"clang-format", "clang-format",
"ormolu",
"beautysh", "beautysh",
"latexindent", "latexindent",
"prettier", "prettier",
@ -762,18 +761,18 @@ require("lazy").setup({
end, end,
}, },
}, },
{ -- You can easily change to a different colorscheme. { -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then -- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is -- 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` -- 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 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 priority = 1000, -- make sure to load this before all the other start plugins
"zenbones-theme/zenbones.nvim",
dependencies = "rktjmp/lush.nvim",
config = function() config = function()
-- Load the colorscheme here -- Load the colorscheme here
vim.cmd.colorscheme("zenwritten") vim.cmd.colorscheme("gruvbox")
end, end,
}, },
@ -837,83 +836,8 @@ require("lazy").setup({
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
end, 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 = {
{
"<leader>T",
function()
Snacks.terminal()
end,
desc = "Toggle Terminal",
},
},
},
"airblade/vim-gitgutter", "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", "<Leader>dg", ":lua require('neogen').generate()<CR>", 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 = {
{
"<leader>xx",
"<cmd>Trouble diagnostics toggle<cr>",
desc = "Diagnostics (Trouble)",
},
{
"<leader>xX",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
desc = "Buffer Diagnostics (Trouble)",
},
{
"<leader>cs",
"<cmd>Trouble symbols toggle focus=false<cr>",
desc = "Symbols (Trouble)",
},
{
"<leader>cl",
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
desc = "LSP Definitions / references / ... (Trouble)",
},
{
"<leader>xL",
"<cmd>Trouble loclist toggle<cr>",
desc = "Location List (Trouble)",
},
{
"<leader>xQ",
"<cmd>Trouble qflist toggle<cr>",
desc = "Quickfix List (Trouble)",
},
},
},
}) })
require("colorizer").setup()
--Set rustfmt command --Set rustfmt command
vim.g["rustfmt_command"] = "rustfmt +nightly" vim.g["rustfmt_command"] = "rustfmt +nightly"
--Disable semantic highlights --Disable semantic highlights
@ -964,13 +888,3 @@ vim.api.nvim_create_user_command("FormatEnable", function()
end, { end, {
desc = "Re-enable autoformat-on-save", 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