From 9a210d53e2042842a09045fe249f39777faa1dde Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Fri, 22 Jul 2022 20:29:28 +0200 Subject: [PATCH] neovim: small patches + bibtex --- files/nvim/.config/nvim/lua/lsp.lua | 2 +- files/nvim/.config/nvim/lua/mappings.lua | 19 ++++++++++-- files/nvim/.config/nvim/lua/plugins.lua | 21 +++++++------ files/nvim/.config/nvim/lua/settings.lua | 1 + files/nvim/.config/nvim/snippets/package.json | 3 +- .../.config/nvim/snippets/snippets/latex.json | 5 ++-- presets/notes.tex | 30 ++++--------------- 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/files/nvim/.config/nvim/lua/lsp.lua b/files/nvim/.config/nvim/lua/lsp.lua index 36b600a..fc9fe19 100644 --- a/files/nvim/.config/nvim/lua/lsp.lua +++ b/files/nvim/.config/nvim/lua/lsp.lua @@ -22,7 +22,7 @@ local navic = require('nvim-navic') -- breadcrumbs -- Normal LSPs -- Install with `:LSPInstall` -local servers = { "pylsp", "sumneko_lua", "hls" } +local servers = { "pylsp", "sumneko_lua", "hls", "clangd" } for _, i in ipairs(servers) do lsp[i].setup({ on_attach = function(client, bufnr) diff --git a/files/nvim/.config/nvim/lua/mappings.lua b/files/nvim/.config/nvim/lua/mappings.lua index 06f18ff..b29d39f 100644 --- a/files/nvim/.config/nvim/lua/mappings.lua +++ b/files/nvim/.config/nvim/lua/mappings.lua @@ -72,7 +72,23 @@ wk.register({ i = { e = { "Emoji" }, m = { "Math symbol" }, - n = { "Nerd Font" }, + n = { "Nerd Font icon" }, + } + } +}) + +-- Comment.nvim +require('Comment').setup({ + opleader = { + line = 'cl', + block = 'cb', + } +}) +wk.register({ + [""] = { + c = { + l = { "Line comment" }, + b = { "Block comment" }, } } }) @@ -114,4 +130,3 @@ cmp.setup({ }), }, }) - diff --git a/files/nvim/.config/nvim/lua/plugins.lua b/files/nvim/.config/nvim/lua/plugins.lua index 04f9cd9..75be21d 100644 --- a/files/nvim/.config/nvim/lua/plugins.lua +++ b/files/nvim/.config/nvim/lua/plugins.lua @@ -17,10 +17,10 @@ return require('packer').startup(function(use) use({ 'sainnhe/everforest', config = function() + vim.cmd("set termguicolors") vim.cmd("set background=light") vim.cmd("let g:everforest_background = 'hard'") vim.cmd("colorscheme everforest") - vim.cmd("set termguicolors") end, }) @@ -192,11 +192,11 @@ return require('packer').startup(function(use) -- Load friendly-snippets require('luasnip.loaders.from_vscode').lazy_load() -- Load own snippets - require("luasnip.loaders.from_vscode").lazy_load({ paths = { "./snippets" }}) + require("luasnip.loaders.from_vscode").lazy_load({ paths = { "./snippets" } }) end, }) - -- which-key + -- which-key (Show key combos) use { "folke/which-key.nvim", config = function() @@ -211,12 +211,7 @@ return require('packer').startup(function(use) use({ "numToStr/Comment.nvim", config = function() - require('Comment').setup({ - opleader = { - line = 'cl', - block = 'cb', - } - }) + require('Comment').setup() end, }) @@ -244,6 +239,14 @@ return require('packer').startup(function(use) end, } + -- show colors + use({ + "norcalli/nvim-colorizer.lua", + config = function() + require 'colorizer'.setup() + end + }) + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if packer_bootstrap then diff --git a/files/nvim/.config/nvim/lua/settings.lua b/files/nvim/.config/nvim/lua/settings.lua index 2f6ddde..39e1264 100644 --- a/files/nvim/.config/nvim/lua/settings.lua +++ b/files/nvim/.config/nvim/lua/settings.lua @@ -11,6 +11,7 @@ opt.smartindent = true -- Autoindent new lines opt.showmode = false -- Disable status on most bottom row opt.clipboard = "unnamed" -- Copy & Paste with system clipboard opt.list = true -- Show trailing whitespaces +opt.wrap = false -- Show trailing whitespaces vim.opt.undofile = true -- Save undo history vim.o.mouse = 'a' -- Enable mouse diff --git a/files/nvim/.config/nvim/snippets/package.json b/files/nvim/.config/nvim/snippets/package.json index 448a737..b99f182 100644 --- a/files/nvim/.config/nvim/snippets/package.json +++ b/files/nvim/.config/nvim/snippets/package.json @@ -7,7 +7,8 @@ "snippets": [ { "language": [ - "tex" + "tex", + "plaintex" ], "path": "./snippets/latex.json" } diff --git a/files/nvim/.config/nvim/snippets/snippets/latex.json b/files/nvim/.config/nvim/snippets/snippets/latex.json index bbb981d..8668c5b 100644 --- a/files/nvim/.config/nvim/snippets/snippets/latex.json +++ b/files/nvim/.config/nvim/snippets/snippets/latex.json @@ -4,10 +4,11 @@ "body": [ "\\input{/home/marc/.dots/presets/notes.tex}", "", - "\\title{$1}", - "\\subtitle{$1}", + "\\title{$1 \\\\\\[0.2em] \\large $2}", "\\author{Marco Thomas}", "", + "% \\bibliography{}", + "", "\\begin{document}", "", "\\maketitle", diff --git a/presets/notes.tex b/presets/notes.tex index 9657fc4..e7a5a27 100644 --- a/presets/notes.tex +++ b/presets/notes.tex @@ -16,32 +16,16 @@ \usepackage{xcolor} \usepackage{color} -%%% lorem ipsum +%%% bibtex - cite with \autocite{}, will show in footnote +\usepackage[style=verbose-ibid,backend=bibtex]{biblatex} +\usepackage{csquotes} + +%%% lorem ipsum text \usepackage{blindtext} %%% figures in text flow \usepackage{wrapfig} -%%% make \paragraph{} and \subparagraph{} look like a normal subsection -%\makeatletter -%\renewcommand\paragraph{% -% \@startsection{paragraph}{4}{0mm}% -% {-\baselineskip}% -% {.5\baselineskip}% -% {\normalfont\normalsize\bfseries}} -%\makeatother -% -%\makeatletter -%\renewcommand\subparagraph{% -% \@startsection{subparagraph}{4}{0mm}% -% {-\baselineskip}% -% {.5\baselineskip}% -% {\normalfont\normalsize\bfseries}} -%\makeatother -% -%\setcounter{tocdepth}{5} -%\setcounter{secnumdepth}{5} - %%% links in toc etc \usepackage{hyperref} @@ -76,10 +60,6 @@ %%% theorem-style environments \usepackage{proof} -%\usepackage[skins]{tcolorbox} - -% just saved, not using anymore -%\tcolorboxenvironment{definition}{blanker, before skip=10pt,after skip=10pt} \theoremstyle{definition} \newtheorem{definition}{Definition}[section] \newtheorem{example}{Beispiel}[section]