[Lua] Lovr integration fix

lovr-integration.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+
+cd ~/.local/share
+if [[ -d lovr-docs ]] then
+    echo "Already present, updating repo"
+    cd lovr-docs
+    git pull
+else
+    git clone https://github.com/bjornbytes/lovr-docs
+    cd lovr-docs
+fi
+
+lovr api cats

nvim/lua/filetypes.lua

@@ -1,8 +1,14 @@
 vim.filetype.add({
+	extension = {
+		gotmpl = "gotmpl",
+	},
 	pattern = {
 		["compose.*%.ya?ml"] = "yaml.docker-compose",
 		["docker%-compose.*%.ya?ml"] = "yaml.docker-compose",
 		[".*/.gitea/workflows/.*%.ya?ml"] = "yaml.actions",
 		[".*/.github/workflows/.*%.ya?ml"] = "yaml.actions",
+		[".*/templates/.*%.tpl"] = "helm",
+		[".*/templates/.*%.ya?ml"] = "helm",
+		["helmfile.*%.ya?ml"] = "helm",
 	},
 })

nvim/lua/plugins/lsp/ls/c.lua

@@ -16,12 +16,6 @@ lsp.config("clangd", {
     on_attach = opts.on_attach_no_formatting,
 })
 
-lsp.config("cmake", {
-    capabilities = opts.capabilities,
-    on_attach = opts.on_attach,
-})
-
 -- ── Enable configs ───────────────────────────────────────────────
 local enable = vim.lsp.enable
 enable("clangd")
-enable("cmake")

nvim/lua/plugins/lsp/ls/haskell.lua

@@ -0,0 +1,17 @@
+-- ┌                                               ┐
+-- │                    Haskell                    │
+-- └                                               ┘
+local lsp = vim.lsp
+
+local capabilities = require("lsp-options").capabilities
+local on_attach = require("lsp-options").on_attach
+
+lsp.config("hls", {
+    capabilities = capabilities,
+    on_attach = on_attach,
+})
+
+
+-- ── Enable configs ───────────────────────────────────────────────
+local enable = vim.lsp.enable
+enable("hls")

nvim/lua/plugins/lsp/ls/luals.lua

@@ -7,26 +7,31 @@ local capabilities = require("lsp-options").capabilities
 local on_attach = require("lsp-options").on_attach
 
 lsp.config("lua_ls", {
-    capabilities = capabilities,
-    on_attach = on_attach,
-    settings = {
-        Lua = {
-            -- make the language server recognize "vim" global
-            diagnostics = {
-                globals = { "vim" },
-            },
-            workspace = {
-                -- make language server aware of runtime files
-                library = {
-                    [vim.fn.expand("$VIMRUNTIME/lua")] = true,
-                    [vim.fn.stdpath("config") .. "/lua"] = true,
-                },
-            },
-        },
-    },
+	capabilities = capabilities,
+	on_attach = on_attach,
+	settings = {
+		Lua = {
+			-- make the language server recognize "vim" global
+			diagnostics = {
+				globals = { "vim" },
+			},
+			workspace = {
+				-- make language server aware of runtime files
+				library = {
+					vim.fn.expand("$VIMRUNTIME/lua"),
+					vim.fn.stdpath("config") .. "/lua",
+					vim.fn.expand("~/.luarocks/share/lua/5.3"),
+                    -- To use LÖVR, follow https://lovr.org/docs/dev/VS_Code_Setup#manual-installation
+                    -- TL;DR run lovr api cats in the lovr-docs repo and update the path below
+                    -- Then update the blow path (if you have not used the script in this repo)
+					vim.fn.expand("~/.local/share/lovr-docs/api/cats"),
+					"/usr/share/lua/5.3",
+				},
+			},
+		},
+	},
 })
 
-
 -- ── Enable configs ───────────────────────────────────────────────
 local enable = vim.lsp.enable
 enable("lua_ls")

nvim/lua/plugins/lsp/ls/sql.lua

@@ -0,0 +1,17 @@
+-- ┌                                               ┐
+-- │                      SQL                      │
+-- └                                               ┘
+local lsp = vim.lsp
+
+local capabilities = require("lsp-options").capabilities
+local on_attach = require("lsp-options").on_attach
+
+lsp.config("sqlls", {
+    capabilities = capabilities,
+    on_attach = on_attach,
+})
+
+
+-- ── Enable configs ───────────────────────────────────────────────
+local enable = vim.lsp.enable
+enable("sqlls")

nvim/lua/plugins/lsp/ls/web.lua

@@ -46,7 +46,7 @@ lsp.config("vue_ls", {
 
 local vue_plugin = {
 	name = "@vue/typescript-plugin",
-	location = '/usr/lib/node_modules/',
+	location = "/usr/lib/node_modules/",
 	languages = { "vue" },
 	configNamespace = "typescript",
 	enableForWorkspaceTypeScriptVersions = true,
@@ -76,6 +76,14 @@ lsp.config("vtsls", {
 	},
 })
 
+-- ┌                                               ┐
+-- │                     nginx                     │
+-- └                                               ┘
+lsp.config("nginx_language_server", {
+	capabilities = capabilities,
+	on_attach = on_attach,
+})
+
 -- ── Enable configs ───────────────────────────────────────────────
 local enable = vim.lsp.enable
 enable("jsonls")
@@ -84,3 +92,4 @@ enable("cssls")
 enable("phpactor")
 enable("vtsls")
 enable("vue_ls")
+enable("nginx_language_server")

nvim/lua/plugins/lsp/lspconfig.lua

@@ -28,12 +28,14 @@ return {
         require("plugins.lsp.ls.docker")
         require("plugins.lsp.ls.gh-actions")
         require("plugins.lsp.ls.go")
+        require("plugins.lsp.ls.haskell")
         require("plugins.lsp.ls.hypr")
         require("plugins.lsp.ls.low-level")
         require("plugins.lsp.ls.luals")
         require("plugins.lsp.ls.pyright")
         require("plugins.lsp.ls.rust-analyzer")
         require("plugins.lsp.ls.ruby")
+        require("plugins.lsp.ls.sql")
         require("plugins.lsp.ls.text")
         require("plugins.lsp.ls.web")
         -- ───────────────────────────────────────────────────────────────────

nvim/lua/plugins/lsp/mason.lua

@@ -28,12 +28,12 @@ return {
 				"asm_lsp",
 				"bashls",
 				"clangd",
-				"cmake",
 				"cssls",
 				"docker_language_server",
 				"gh_actions_ls",
 				"gopls",
 				"html",
+				"hls",
 				"hyprls",
 				"jdtls",
 				"jsonls",
@@ -43,6 +43,7 @@ return {
 				"pyright",
 				"rust_analyzer",
 				"ruby_lsp",
+                "sqlls",
 				"verible",
 				"vtsls",
 				"vue_ls",

nvim/lua/plugins/util/treesitter.lua

@@ -1,56 +1,59 @@
 return {
-    -- syntax highlighting
-    "nvim-treesitter/nvim-treesitter",
-    branch = "master",
-    event = { "BufRead", "BufNewFile" },
-    build = ":TSUpdate",
-    config = function()
-        require("nvim-treesitter.configs").setup({
-            ensure_installed = {
-                "asm",
-                "bash",
-                "c",
-                "cpp",
-                "css",
-                "html",
-                "hyprlang",
-                "java",
-                "javadoc",
-                "javascript",
-                "jsdoc",
-                "json",
-                "jsonc",
-                -- "latex",
-                "lua",
-                "markdown",
-                "meson",
-                "nginx",
-                "php",
-                "python",
-                "rasi",
-                "requirements",
-                "robots",
-                "ruby",
-                "rust",
-                "scss",
-                "sql",
-                "svelte",
-                "swift",
-                "toml",
-                "typescript",
-                "tsx",
-                "verilog",
-                "vue",
-                "xml",
-                "yaml",
-                "zathurarc",
-            },
-            sync_install = false,
+	-- syntax highlighting
+	"nvim-treesitter/nvim-treesitter",
+	branch = "master",
+	event = { "BufRead", "BufNewFile" },
+	build = ":TSUpdate",
+	config = function()
+		require("nvim-treesitter.configs").setup({
+			ensure_installed = {
+				"asm",
+				"bash",
+				"c",
+				"cpp",
+				"css",
+				"gotmpl",
+				"haskell",
+				"helm",
+				"html",
+				"hyprlang",
+				"java",
+				"javadoc",
+				"javascript",
+				"jsdoc",
+				"json",
+				"jsonc",
+				-- "latex",
+				"lua",
+				"markdown",
+				"meson",
+				"nginx",
+				"php",
+				"python",
+				"rasi",
+				"requirements",
+				"robots",
+				"ruby",
+				"rust",
+				"scss",
+				"sql",
+				"svelte",
+				"swift",
+				"toml",
+				"typescript",
+				"tsx",
+				"verilog",
+				"vue",
+				"xml",
+				"yaml",
+				"zathurarc",
+			},
+			sync_install = false,
 
-            highlight = {
-                enable = true,
-                disable = { "tex" },
-            },
-        })
-    end,
+			highlight = {
+				enable = true,
+				disable = { "tex" },
+			},
+		})
+	end,
 }

nvim/snippets/snippets/tex.json

@@ -1,198 +1,262 @@
 {
-	"prepare LaTeX Document": {
-		"prefix": "latex-prepare",
-		"body": [
-			"\\documentclass{article}\n",
-			"\\input{~/projects/latex/dist/recommended.tex}\n",
-			"\\setup{$1}\n",
-			"\\begin{document}",
-			"\\startDocument",
-			"\\usetcolorboxes",
-			"$2\n\n",
-			"\\end{document}"
-		],
-		"description": "Prepares a full LaTeX Document for use and compiling"
-	},
-	"Fancy table": {
-		"prefix": "table",
-		"body": [
-			"\\begin{tables}{$1}{$2}\n",
-			"\t$3\\\\",
-			"\\end{tables}"
-		],
-		"description": "Insert a table (without environment)"
-	},
-	"Formula": {
-		"prefix": "formula",
-		"body": [
-			"\\begin{formula}[]{$1}",
-			"\t$2",
-			"\\end{formula}"
-		],
-		"description": "Inserts a tcolorbox to provide a formula (red)"
-	},
-	"Definition": {
-		"prefix": "definition",
-		"body": [
-			"\\begin{definition}[]{$1}",
-			"\t$2",
-			"\\end{definition}"
-		],
-		"description": "Inserts a tcolorbox to provide a definition (blue)"
-	},
-	"Recall": {
-		"prefix": "recall",
-		"body": [
-			"\\begin{recall}[]{$1}",
-			"\t$2",
-			"\\end{recall}"
-		],
-		"description": "Inserts a tcolorbox to provide a recall / revision of previous knowledge (yellow)"
-	},
-	"Important Remarks": {
-		"prefix": "remarks",
-		"body": [
-			"\\begin{remark}[]{$1}",
-			"\t$2",
-			"\\end{remark}"
-		],
-		"description": "Inserts a tcolorbox to provide remarks (green), but here numbered"
-	},
-	"Remark (numbered)": {
-		"prefix": "remark",
-		"body": [
-			"\\begin{remarks}[]{$1}",
-			"\t$2",
-			"\\end{remarks}"
-		],
-		"description": "Inserts a tcolorbox to provide remarks (green)"
-	},
-	"Guides": {
-		"prefix": "guides",
-		"body": [
-			"\\begin{guides}[]{$1}{${2:Usage}}",
-			"\t$2",
-			"\\end{guides}"
-		],
-		"description": "Inserts a tcolorbox to provide guides / instructions on how to use (red)"
-	},
-	"Properties": {
-		"prefix": "properties",
-		"body": [
-			"\\begin{properties}[]{$1}",
-			"\t$2",
-			"\\end{properties}"
-		],
-		"description": "Inserts a tcolorbox to inform about properties"
-	},
-	"Restrictions": {
-		"prefix": "restrictions",
-		"body": [
-			"\\begin{restrictions}[]{$1}",
-			"\t$2",
-			"\\end{restrictions}"
-		],
-		"description": "Inserts a tcolorbox to inform about restrictions"
-	},
-	"Intuition": {
-		"prefix": "restrictions",
-		"body": [
-			"\\begin{intuition}[]{$1}",
-			"\t$2",
-			"\\end{intuition}"
-		],
-		"description": "Tcolorbox to highlight sections about intuition"
-	},
-	"Limitations": {
-		"prefix": "limitations",
-		"body": [
-			"\\begin{limitations}[]{$1}",
-			"\t$2",
-			"\\end{limitations}"
-		],
-		"description": "Inserts a tcolorbox to inform about limitations"
-	},
-	"Theorem": {
-		"prefix": "theorem",
-		"body": [
-			"\\begin{theorem}[]{$1}",
-			"\t$2",
-			"\\end{theorem}"
-		],
-		"description": "Inserts a tcolorbox to inform about theorems"
-	},
-	"Lemma": {
-		"prefix": "lemma",
-		"body": [
-			"\\begin{lemma}[]{$1}",
-			"\t$2",
-			"\\end{lemma}"
-		],
-		"description": "Inserts a tcolorbox to inform about lemmas"
-	},
-	"Corollary": {
-		"prefix": "corollary",
-		"body": [
-			"\\begin{corollary}[]{$1}",
-			"\t$2",
-			"\\end{corollary}"
-		],
-		"description": "Inserts a tcolorbox to inform about corollaries"
-	},
-	"Proposition": {
-		"prefix": "proposition",
-		"body": [
-			"\\begin{proposition}[]{$1}",
-			"\t$2",
-			"\\end{proposition}"
-		],
-		"description": "Inserts a tcolorbox to inform about propositions"
-	},
-	"Fact": {
-		"prefix": "fact",
-		"body": [
-			"\\begin{fact}[]{$1}",
-			"\t$2",
-			"\\end{fact}"
-		],
-		"description": "Inserts a tcolorbox to inform about facts"
-	},
-	"Terms": {
-		"prefix": "terms",
-		"body": [
-			"\\begin{terms}[]{$1}",
-			"\t$2",
-			"\\end{terms}"
-		],
-		"description": "Inserts a tcolorbox to inform about terms"
-	},
-	"Proof": {
-		"prefix": "proof",
-		"body": [
-			"\\begin{proof}[]{$1}",
-			"\t$2",
-			"\\end{proof}"
-		],
-		"description": "Inserts a tcolorbox to show a proof"
-	},
-	"Axiom": {
-		"prefix": "axiom",
-		"body": [
-			"\\begin{axiom}[]{$1}",
-			"\t$2",
-			"\\end{axiom}"
-		],
-		"description": "Inserts a tcolorbox to show an axiom"
-	},
-	"Notation": {
-		"prefix": "notation",
-		"body": [
-			"\\begin{notation}[]{$1}",
-			"\t$2",
-			"\\end{notation}"
-		],
-		"description": "Inserts a tcolorbox to show notation"
-	},
+    "prepare LaTeX Document": {
+        "prefix": "latex-prepare",
+        "body": [
+            "\\documentclass{article}\n",
+            "\\input{~/projects/latex/janishutz-helpers.tex}\n",
+            "\\usepackage{lmodern}",
+            "\\setFontType{sans}\n",
+            "\\setup{$1}\n",
+            "\\begin{document}",
+            "\\startDocument\n\n",
+            "$2\n\n",
+            "\\end{document}"
+        ],
+        "description": "Prepares a simple LaTeX Document"
+    },
+    "LaTeX CheatSheet Setup": {
+        "prefix": "latex-cheatsheet",
+        "body": [
+            "\\documentclass{article}\n",
+            "\\input{~/projects/latex/janishutz-helpers.tex}\n",
+            "\\usepackage{lmodern}",
+            "\\setFontType{sans}\n",
+            "\\setupCheatSheet{$1}\n",
+            "\\begin{document}",
+            "\\startDocument\n\n",
+            "$2\n\n",
+            "\\end{document}"
+        ],
+        "description": "Prepares to write a LaTeX CheatSheet"
+    },
+    "Full Summary LaTeX Setup": {
+        "prefix": "latex-summary",
+        "body": [
+            "\\documentclass{article}\n",
+            "\\input{~/projects/latex/janishutz-helpers.tex}\n",
+            "\\usepackage{lmodern}",
+            "\\setFontType{sans}\n",
+            "\\setup{$1}\n",
+            "\\begin{document}",
+            "\\startDocument\n",
+            "\\vspace{1cm}",
+            "\\begin{center}",
+            "\t\\includegraphics[width=0.5\\linewidth]{~/projects/latex/assets/logo.jpg}",
+            "\\end{center}\n\n",
+            "\\vspace{2cm}",
+            "\\begin{center}",
+            "\t\\begin{Large}",
+            "\t\t\\quote{A funny quote by a professor}",
+            "\t\\end{Large}\n",
+            "\t\\hspace{3cm} - Prof. Dr. Professor Name, YEAR",
+            "\\end{center}\n",
+            "\\vspace{1.5cm}",
+            "\\begin{center}",
+            "\tSEMESTER, ETHZ\n",
+            "\t\\begin{Large}",
+            "\t\tSummary of the Script and Lectures",
+            "\t\\end{Large}",
+            "\\end{center}\n\n",
+            "\\newpage",
+            "\\printtoc{Aquamarine}\n\n",
+            "$2\n\n",
+            "\\end{document}"
+        ],
+        "description": "Prepares a full LaTeX Summary"
+    },
+    "LaTeX Beamer Setup": {
+        "prefix": "latex-beamer",
+        "body": [
+            "\\documentclass{beamer}\n",
+            "\\input{~/projects/latex/janishutz-helpers.tex}\n",
+            "\\usepackage{lmodern}",
+            "\\setFontType{sans}\n",
+            "\\title{$1}",
+            "\\author{\\authorTitle}\n",
+            "\\usetheme{default}",
+            "\\usecolortheme{beaver}\n",
+            "\\AtBeginSection[]{",
+            "\t\\begin{frame}",
+            "\t\\frametitle{Table of Contents}",
+            "\t\\tableofcontents[currentsection]",
+            "\t\\end{frame}",
+            "}\n",
+            "\\begin{document}\n",
+            "\\frame{\\titlepage}\n\n",
+            "\\begin{frame}\n",
+            "\t\\frametitle{Table of Contents}",
+            "\t\\tableofcontents",
+            "\\end{frame}\n\n",
+            "\\begin{frame}\n",
+            "\t\\frametitle{$2}",
+            "\t$3",
+            "\\end{frame}\n\n",
+            "\\end{document}"
+        ],
+        "description": "Prepares to write a LaTeX CheatSheet"
+    },
+    "Fancy table": {
+        "prefix": "table",
+        "body": [
+            "\\begin{tables}{$1}{$2}\n",
+            "\t$3\\\\",
+            "\\end{tables}"
+        ],
+        "description": "Insert a table (without environment)"
+    },
+    "Formula": {
+        "prefix": "formula",
+        "body": [
+            "\\begin{formula}[]{$1}",
+            "\t$2",
+            "\\end{formula}"
+        ],
+        "description": "Inserts a tcolorbox to provide a formula (red)"
+    },
+    "Definition": {
+        "prefix": "definition",
+        "body": [
+            "\\begin{definition}[]{$1}",
+            "\t$2",
+            "\\end{definition}"
+        ],
+        "description": "Inserts a tcolorbox to provide a definition (blue)"
+    },
+    "Recall": {
+        "prefix": "recall",
+        "body": [
+            "\\begin{recall}[]{$1}",
+            "\t$2",
+            "\\end{recall}"
+        ],
+        "description": "Inserts a tcolorbox to point out / revise of previous knowledge (yellow)"
+    },
+    "Remark": {
+        "prefix": "remark",
+        "body": [
+            "\\begin{remarks}[]{$1}",
+            "\t$2",
+            "\\end{remarks}"
+        ],
+        "description": "Inserts a tcolorbox to provide remarks (green)"
+    },
+    "Properties": {
+        "prefix": "properties",
+        "body": [
+            "\\begin{properties}[]{$1}",
+            "\t$2",
+            "\\end{properties}"
+        ],
+        "description": "Inserts a tcolorbox to inform about properties"
+    },
+    "Restrictions": {
+        "prefix": "restrictions",
+        "body": [
+            "\\begin{restrictions}[]{$1}",
+            "\t$2",
+            "\\end{restrictions}"
+        ],
+        "description": "Inserts a tcolorbox to inform about restrictions"
+    },
+    "Intuition": {
+        "prefix": "restrictions",
+        "body": [
+            "\\begin{intuition}[]{$1}",
+            "\t$2",
+            "\\end{intuition}"
+        ],
+        "description": "Tcolorbox to highlight sections about intuition"
+    },
+    "Limitations": {
+        "prefix": "limitations",
+        "body": [
+            "\\begin{limitations}[]{$1}",
+            "\t$2",
+            "\\end{limitations}"
+        ],
+        "description": "Inserts a tcolorbox to inform about limitations"
+    },
+    "Theorem": {
+        "prefix": "theorem",
+        "body": [
+            "\\begin{theorem}[]{$1}",
+            "\t$2",
+            "\\end{theorem}"
+        ],
+        "description": "Inserts a tcolorbox to state a theorem"
+    },
+    "Lemma": {
+        "prefix": "lemma",
+        "body": [
+            "\\begin{lemma}[]{$1}",
+            "\t$2",
+            "\\end{lemma}"
+        ],
+        "description": "Inserts a tcolorbox to state a lemma"
+    },
+    "Corollary": {
+        "prefix": "corollary",
+        "body": [
+            "\\begin{corollary}[]{$1}",
+            "\t$2",
+            "\\end{corollary}"
+        ],
+        "description": "Inserts a tcolorbox to state a corollary"
+    },
+    "Proposition": {
+        "prefix": "proposition",
+        "body": [
+            "\\begin{proposition}[]{$1}",
+            "\t$2",
+            "\\end{proposition}"
+        ],
+        "description": "Inserts a tcolorbox to state a proposition"
+    },
+    "Fact": {
+        "prefix": "fact",
+        "body": [
+            "\\begin{fact}[]{$1}",
+            "\t$2",
+            "\\end{fact}"
+        ],
+        "description": "Inserts a tcolorbox to state a fact"
+    },
+    "Terms": {
+        "prefix": "terms",
+        "body": [
+            "\\begin{terms}[]{$1}",
+            "\t$2",
+            "\\end{terms}"
+        ],
+        "description": "Inserts a tcolorbox to inform about terms"
+    },
+    "Proof": {
+        "prefix": "proof",
+        "body": [
+            "\\begin{proof}[]{$1}",
+            "\t$2",
+            "\\end{proof}"
+        ],
+        "description": "Inserts a tcolorbox to show a proof"
+    },
+    "Axiom": {
+        "prefix": "axiom",
+        "body": [
+            "\\begin{axiom}[]{$1}",
+            "\t$2",
+            "\\end{axiom}"
+        ],
+        "description": "Inserts a tcolorbox to show an axiom"
+    },
+    "Notation": {
+        "prefix": "notation",
+        "body": [
+            "\\begin{notation}[]{$1}",
+            "\t$2",
+            "\\end{notation}"
+        ],
+        "description": "Inserts a tcolorbox to show notation"
+    },
     "Example": {
         "prefix": "example",
         "body": [
@@ -211,233 +275,103 @@
         ],
         "description": "Inserts a tcolorbox to show example"
     },
-	"Usage": {
-		"prefix": "usage",
-		"body": [
-			"\\begin{usage}[]{$1}",
-			"\t$2",
-			"\\end{usage}"
-		],
-		"description": "Inserts a tcolorbox to inform about usage"
-	},
-	"Conjugation": {
-		"prefix": "conjugation",
-		"body": [
-			"\\begin{conjugation}[]{$1}",
-			"\t$2",
-			"\\end{conjugation}"
-		],
-		"description": "Inserts a tcolorbox to inform about conjugation"
-	},
-	"Forms": {
-		"prefix": "forms",
-		"body": [
-			"\\begin{forms}[]{$1}",
-			"\t$2",
-			"\\end{forms}"
-		],
-		"description": "Inserts a tcolorbox to inform about forms of e.g. grammatical structures"
-	},
-	"General-Tcolorbox": {
-		"prefix": "general-tcb",
-		"body": [
-			"\\begin{general}[]{${1:title}}{${2:second title}}{${3|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}",
-			"\t$4",
-			"\\end{general}"
-		],
-		"description": "Inserts a tcolorbox for general purposes. First bracket is title, second one is second title, third one colour"
-	},
-	"Simple-Tcolorbox": {
-		"prefix": "simple-tcb",
-		"body": [
-			"\\begin{simplebox}[]{${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}",
-			"\t$2",
-			"\\end{simplebox}"
-		],
-		"description": "Inserts a simple tcolorbox. No title, first argument the colour colour"
-	},
-	"Derivative": {
-		"prefix": "derivative",
-		"body": [
-			"\\frac{\\mbox{d}}{\\mbox{d}x}$1"
-		]
-	},
-	"Example (inline)": {
-		"prefix": "example-inline",
-		"body": [
-			"\\inlineex"
-		]
-	},
-	"Example (short)": {
-		"prefix": "example-short",
-		"body": [
-			"\\shortex"
-		]
-	},
-	"Definition (inline)": {
-		"prefix": "definition-inline",
-		"body": [
-			"\\inlinedef"
-		]
-	},
-	"Definition (short)": {
-		"prefix": "definition-short",
-		"body": [
-			"\\shortdef"
-		]
-	},
-	"Theorem (inline)": {
-		"prefix": "theorem-inline",
-		"body": [
-			"\\inlinetheorem"
-		]
-	},
-	"Theorem (short)": {
-		"prefix": "theorem-short",
-		"body": [
-			"\\shorttheorem"
-		]
-	},
-	"Lemma (inline)": {
-		"prefix": "lemma-inline",
-		"body": [
-			"\\inlinelemma"
-		]
-	},
-	"Lemma (short)": {
-		"prefix": "lemma-short",
-		"body": [
-			"\\shortlemma"
-		]
-	},
-	"Corollary (inline)": {
-		"prefix": "corollary-inline",
-		"body": [
-			"\\inlinecorollary"
-		]
-	},
-	"Corollary (short)": {
-		"prefix": "corollary-short",
-		"body": [
-			"\\shortcorollary"
-		]
-	},
-	"Proposition (inline)": {
-		"prefix": "proposition-inline",
-		"body": [
-			"\\inlineproposition"
-		]
-	},
-	"Proposition (short)": {
-		"prefix": "proposition-short",
-		"body": [
-			"\\shortproposition"
-		]
-	},
-	"Fact (inline)": {
-		"prefix": "fact-inline",
-		"body": [
-			"\\inlinefact"
-		]
-	},
-	"Fact (short)": {
-		"prefix": "fact-short",
-		"body": [
-			"\\shortfact"
-		]
-	},
-	"Axiom (inline)": {
-		"prefix": "axiom-inline",
-		"body": [
-			"\\inlineaxiom"
-		]
-	},
-	"Axiom (short)": {
-		"prefix": "axiom-short",
-		"body": [
-			"\\shortaxiom"
-		]
-	},
-	"Proof (inline)": {
-		"prefix": "proof-inline",
-		"body": [
-			"\\inlineproof"
-		]
-	},
-	"Proof (short)": {
-		"prefix": "proof-short",
-		"body": [
-			"\\shortproof"
-		]
-	},
-	"bold": {
-		"prefix": "#bold",
-		"body": [
-			"\\textbf{$1}"
-		]
-	},
-	"italic": {
-		"prefix": "#i",
-		"body": [
-			"\\textit{$1}"
-		]
-	},
-	"bolditalic": {
-		"prefix": "#bi",
-		"body": [
-			"\\textbf{\\textit{$1}}"
-		]
-	},
-	"underlinie": {
-		"prefix": "#u",
-		"body": [
-			"\\underbar{$1}"
-		]
-	},
-	"angles": {
-		"prefix": "angles",
-		"body": [
-			"\\langle $1 \\rangle"
-		]
-	},
-	"fill-width": {
-		"prefix": "#fill",
-		"body": [
-			"\\hspace{\\fill}$1"
-		]
-	},
-	"Latex-Colour": {
-		"prefix": "colour",
-		"body": [
-			"${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}"
-		]
-	},
-	"Latex-Text-Colour": {
-		"prefix": "colour-text",
-		"body": [
-			"\\color{${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}"
-		]
-	},
-	"Set Language": {
-		"prefix": "setLang",
-		"body": [
-			"\\setLang{$1}"
-		]
-	},
-	"Letter": {
-		"prefix": "latex-letter",
-		"body": [
-			"\\documentclass[12pt,a4paper]{scrlttr2}\n",
-			"\\input{~/projects/latex/dist/letter.tex}\n",
-			"% Subject",
-			"\\setkomavar{subject}{$1}",
-			"\\begin{document}\\raggedright",
-			"\t\\begin{letter}{Company \\\\\\ Name \\\\\\ Address \\\\\\ CH-Place}",
-			"\t\t\\opening{Intro}\n",
-			"\t\t$2\n",
-			"\t\t\\closing{Kind regards}",
-			"\t\\end{letter}",
-			"\\end{document}"
-		]
-	}
+    "Usage": {
+        "prefix": "usage",
+        "body": [
+            "\\begin{usage}[]{$1}",
+            "\t$2",
+            "\\end{usage}"
+        ],
+        "description": "Inserts a tcolorbox to inform about usage"
+    },
+    "General-Tcolorbox": {
+        "prefix": "general-tcb",
+        "body": [
+            "\\begin{general}[]{${1:title}}{${2:second title}}{${3|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}",
+            "\t$4",
+            "\\end{general}"
+        ],
+        "description": "Inserts a tcolorbox for general purposes. First bracket is title, second one is second title, third one colour"
+    },
+    "Simple-Tcolorbox": {
+        "prefix": "simple-tcb",
+        "body": [
+            "\\begin{simplebox}[]{${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}",
+            "\t$2",
+            "\\end{simplebox}"
+        ],
+        "description": "Inserts a simple tcolorbox. No title, first argument the colour colour"
+    },
+    "bold": {
+        "prefix": "#bold",
+        "body": [
+            "\\textbf{$1}"
+        ]
+    },
+    "italic": {
+        "prefix": "#i",
+        "body": [
+            "\\textit{$1}"
+        ]
+    },
+    "bolditalic": {
+        "prefix": "#bi",
+        "body": [
+            "\\textbf{\\textit{$1}}"
+        ]
+    },
+    "underlinie": {
+        "prefix": "#u",
+        "body": [
+            "\\underbar{$1}"
+        ]
+    },
+    "angles": {
+        "prefix": "angles",
+        "body": [
+            "\\langle $1 \\rangle"
+        ]
+    },
+    "fill-width": {
+        "prefix": "#fill",
+        "body": [
+            "\\hspace{\\fill}$1"
+        ]
+    },
+    "Latex-Colour": {
+        "prefix": "colour",
+        "body": [
+            "${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}"
+        ]
+    },
+    "Latex-Text-Colour": {
+        "prefix": "colour-text",
+        "body": [
+            "\\color{${1|red,green,blue,cyan,magenta,yellow,black,gray,white,darkgray,lightgray,brown,lime,olive,orange,pink,purple,teal,violet|}}"
+        ]
+    },
+    "Set Language": {
+        "prefix": "setLang",
+        "body": [
+            "\\setLang{$1}"
+        ]
+    },
+    "Letter": {
+        "prefix": "latex-letter",
+        "body": [
+            "\\documentclass[12pt,a4paper]{scrlttr2}\n",
+            "\\newcommand{\\dir}{~/projects/latex} % IMPORTANT: No trailing slashes!",
+            "\\input{\\dir/include.tex}",
+            "\\load{letter}\n",
+            "% Subject",
+            "\\setkomavar{subject}{$1}",
+            "\\begin{document}\\raggedright",
+            "\t\\begin{letter}{Company \\\\\\ Name \\\\\\ Address \\\\\\ CH-Place}",
+            "\t\t\\opening{Intro}\n",
+            "\t\t$2\n",
+            "\t\t\\closing{Kind regards}",
+            "\t\\end{letter}",
+            "\\end{document}"
+        ]
+    }
 }