From 807765954143750679a81b921fe428f30b446a33 Mon Sep 17 00:00:00 2001 From: Richard Steinbrueck Date: Mon, 11 Nov 2024 10:16:49 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=BE=20save!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .Brewfile | 8 +- .config/nvim/lazy-lock.json | 34 ++-- .config/nvim/lua/plugins/lsp-config.lua | 225 ++++++++++++------------ .config/nvim/lua/plugins/notes.lua | 30 ++++ .config/nvim/lua/plugins/obsidian.lua | 26 --- bin/1p-find | 2 +- 6 files changed, 168 insertions(+), 157 deletions(-) create mode 100644 .config/nvim/lua/plugins/notes.lua delete mode 100644 .config/nvim/lua/plugins/obsidian.lua diff --git a/.Brewfile b/.Brewfile index 444a0de..b3dff54 100644 --- a/.Brewfile +++ b/.Brewfile @@ -12,6 +12,7 @@ tap "buildpacks/tap" tap "caarlos0/tap" tap "charmbracelet/tap" tap "comcast/opensource" +tap "cyclonedx/cyclonedx" tap "denisidoro/tools" tap "derailed/k9s" tap "derailed/popeye" @@ -76,6 +77,7 @@ brew "autorestic" brew "awscli" brew "b2-tools" brew "bandwhich" +brew "icu4c@76" brew "node" brew "bash-language-server" brew "bat" @@ -139,6 +141,7 @@ brew "git-absorb" brew "git-delta" brew "git-lfs" brew "gitleaks" +brew "gitwatch" brew "gnu-sed" brew "gnu-tar" brew "qt" @@ -233,6 +236,8 @@ brew "spack" brew "ssllabs-scan" brew "sslscan" brew "subversion" +brew "superfile" +brew "syft" brew "telnet" brew "testssl" brew "tflint" @@ -273,6 +278,7 @@ brew "buildpacks/tap/pack" brew "caarlos0/tap/svu" brew "charmbracelet/tap/glow" brew "comcast/opensource/snowdrift" +brew "cyclonedx/cyclonedx/cyclonedx-cli" brew "denisidoro/tools/navi" brew "eddieantonio/eddieantonio/imgcat" brew "emqx/mqttx/mqttx-cli" @@ -354,6 +360,7 @@ cask "font-ubuntu-nerd-font" cask "font-victor-mono-nerd-font" cask "fork" cask "gitbutler" +cask "google-chrome" cask "gpg-suite" cask "hammerspoon" cask "iina" @@ -362,7 +369,6 @@ cask "karabiner-elements" cask "keycastr" cask "kitty" cask "obs" -cask "obsidian" cask "phoenix" cask "prusaslicer" cask "qmk-toolbox" diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 1f204fd..b16a6a6 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2c08f32a570c07b8130144813266e21393da80d3" }, + "LuaSnip": { "branch": "master", "commit": "2737edc9e674e537dc0a97e3405658d57d2d31ed" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -12,17 +12,17 @@ "cmp-rg": { "branch": "master", "commit": "d6cea15ad504369ec98f3de73b9631dfdd23a671" }, "cmp-tabnine": { "branch": "main", "commit": "c0167cdc86c15e782c5461ee62aebee89231c2ed" }, "cmp-tmux": { "branch": "main", "commit": "95b1b921802e6f60627b3e76afb9380fddd87f9a" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "94fa7885a06a67f0a8bfa03e064619d05d1ba496" }, - "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" }, + "dressing.nvim": { "branch": "master", "commit": "6ef1ca479d37d4ff66f13eed44d08912caff483a" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "2d725fdd7fe4a612fa3171ca0a965f455d8dc325" }, + "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "lazy.nvim": { "branch": "main", "commit": "b1134ab82ee4279e31f7ddf7e34b2a99eb9b7bc9" }, "lspkind-nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown-table-mode.nvim": { "branch": "main", "commit": "870d0449c1c78c673faa9637a63036f9537b4caa" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, @@ -31,37 +31,37 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.nvim": { "branch": "stable", "commit": "64e95aa77587d04f97a5579b2106a82a08a7d968" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "neogit": { "branch": "master", "commit": "42ebd2ae70ce31b485e7dea99504796498cb18f8" }, + "neogit": { "branch": "master", "commit": "8e1e301c2e33c60375850bcf22ba1fb77b684b97" }, "nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" }, - "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "noice.nvim": { "branch": "main", "commit": "4d48c360a19b3920a4041868530fd4b99919fa0c" }, "none-ls.nvim": { "branch": "main", "commit": "dcc8cd4efdcb29275681a3c95786a816330dbca6" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-genghis": { "branch": "main", "commit": "081b0c13cfe5a818dc43442b2a8013133f4b0b50" }, + "nvim-genghis": { "branch": "main", "commit": "3998362b132885d599fefb1c285e40807f5b9677" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, - "nvim-lspconfig": { "branch": "master", "commit": "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40" }, + "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-spectre": { "branch": "master", "commit": "08be31c104df3b4b049607694ebb2b6ced4f928b" }, - "nvim-treesitter": { "branch": "master", "commit": "39016abc99853c3e9d70f1bec7e2fa661b9a81bf" }, + "nvim-treesitter": { "branch": "master", "commit": "425b58968340bd5b4621c2a0d626c73556516d3d" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "openingh.nvim": { "branch": "main", "commit": "613c18967d42202f3e2a9ac788caf62a402e7c1a" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "2aa7f746a6a048738eace3f1c9e834243b9faad6" }, "qmk.nvim": { "branch": "main", "commit": "ad51cb15e607da0983fcf9882d38a2aafac32149" }, - "render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" }, - "schemastore.nvim": { "branch": "main", "commit": "f4988f1b370600f87ad8549e68dd6e4914db31ca" }, + "render-markdown.nvim": { "branch": "main", "commit": "bee16b21bf47b64ceda8c9bb281d4b576d329c0f" }, + "schemastore.nvim": { "branch": "main", "commit": "5f0639d68cbea3ab8a9a24a51a5f984d86ea8438" }, "screenkey.nvim": { "branch": "main", "commit": "0589de3c857721e150ea694cfe66d6d0e8aecacb" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, + "telekasten.nvim": { "branch": "main", "commit": "6a10a7929421d6e696e46bbc5aa5627a8cbcf61d" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, + "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, "tmux.nvim": { "branch": "main", "commit": "307bad95a1274f7288aaee09694c25c8cbcd6f1a" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" }, + "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" }, "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, "vim-dadbod-ssh": { "branch": "master", "commit": "9bce775ee76c3dd6d7508dcd9eb276b36133d710" }, diff --git a/.config/nvim/lua/plugins/lsp-config.lua b/.config/nvim/lua/plugins/lsp-config.lua index 0dae53b..ed15e49 100644 --- a/.config/nvim/lua/plugins/lsp-config.lua +++ b/.config/nvim/lua/plugins/lsp-config.lua @@ -1,119 +1,120 @@ return { - { "b0o/schemastore.nvim" }, - { - "jay-babu/mason-null-ls.nvim", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { "williamboman/mason.nvim", "nvimtools/none-ls.nvim" }, - config = function() - require("mason-null-ls").setup({ - ensure_installed = { - "stylua", - "jq", - "black", - "isort", - "yamlfmt", - "ansiblelint", - "markdownlint", - "pylint", - }, - }) + { "b0o/schemastore.nvim" }, + { + "jay-babu/mason-null-ls.nvim", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { "williamboman/mason.nvim", "nvimtools/none-ls.nvim" }, + config = function() + require("mason-null-ls").setup({ + ensure_installed = { + "stylua", + "jq", + "black", + "isort", + "yamlfmt", + "ansiblelint", + "markdownlint", + "pylint", + }, + }) - local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) - local null_ls = require("null-ls") - null_ls.setup({ - on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - vim.lsp.buf.format({ async = false }) - end, - }) - end - end, - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.isort, - null_ls.builtins.completion.spell, - -- FIXME: pylint dont find modules in pyenv - -- null_ls.builtins.diagnostics.pylint, - null_ls.builtins.diagnostics.markdownlint, - null_ls.builtins.formatting.markdownlint, - }, - }) - end, - }, - { "williamboman/mason.nvim", config = true }, - { - "WhoIsSethDaniel/mason-tool-installer.nvim", - dependencies = { "williamboman/mason.nvim" }, - config = true, - }, - { - "williamboman/mason-lspconfig.nvim", - dependencies = { "williamboman/mason.nvim" }, - opts = { - ensure_installed = { - "lua_ls", - "bashls", - "dockerls", - "docker_compose_language_service", - "html", - "jsonls", - "yamlls", - "marksman", - "pyright", - "ansiblels", - }, - automatic_installation = true, - }, - }, - { - "neovim/nvim-lspconfig", - dependencies = { "hrsh7th/cmp-nvim-lsp", "hrsh7th/nvim-cmp" }, - config = function() - local capabilities = require("cmp_nvim_lsp").default_capabilities() + local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) + local null_ls = require("null-ls") + null_ls.setup({ + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + vim.lsp.buf.format({ async = false }) + end, + }) + end + end, + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.black, + null_ls.builtins.formatting.isort, + null_ls.builtins.completion.spell, + -- FIXME: pylint dont find modules in pyenv + -- null_ls.builtins.diagnostics.pylint, + null_ls.builtins.diagnostics.markdownlint, + null_ls.builtins.formatting.markdownlint, + }, + }) + end, + }, + { "williamboman/mason.nvim", config = true }, + { + "WhoIsSethDaniel/mason-tool-installer.nvim", + dependencies = { "williamboman/mason.nvim" }, + config = true, + }, + { + "williamboman/mason-lspconfig.nvim", + dependencies = { "williamboman/mason.nvim" }, + opts = { + ensure_installed = { + "lua_ls", + "bashls", + "dockerls", + "docker_compose_language_service", + "html", + "jsonls", + "yamlls", + "marksman", + "pyright", + "ansiblels", + }, + automatic_installation = true, + }, + }, + { + "neovim/nvim-lspconfig", + dependencies = { "hrsh7th/cmp-nvim-lsp", "hrsh7th/nvim-cmp" }, + config = function() + local capabilities = require("cmp_nvim_lsp").default_capabilities() - local lspconfig = require("lspconfig") - lspconfig.lua_ls.setup({ capabilities = capabilities }) - lspconfig.bashls.setup({ capabilities = capabilities }) - lspconfig.dockerls.setup({ capabilities = capabilities }) - lspconfig.html.setup({ capabilities = capabilities }) + local lspconfig = require("lspconfig") + lspconfig.lua_ls.setup({ capabilities = capabilities }) + lspconfig.bashls.setup({ capabilities = capabilities }) + lspconfig.dockerls.setup({ capabilities = capabilities }) + lspconfig.html.setup({ capabilities = capabilities }) + lspconfig.gopls.setup({ capabilities = capabilities }) - lspconfig.jsonls.setup({ - capabilities = capabilities, - settings = { - settings = { - json = { schemas = require("schemastore").json.schemas(), validate = { enable = true } }, - }, - }, - }) - lspconfig.yamlls.setup({ - settings = { - yaml = { - keyOrdering = false, - schemaStore = { - -- You must disable built-in schemaStore support if you want to use - -- this plugin and its advanced options like `ignore`. - enable = false, - -- Avoid TypeError: Cannot read properties of undefined (reading 'length') - url = "", - }, - schemas = require("schemastore").yaml.schemas(), - }, - }, - }) + lspconfig.jsonls.setup({ + capabilities = capabilities, + settings = { + settings = { + json = { schemas = require("schemastore").json.schemas(), validate = { enable = true } }, + }, + }, + }) + lspconfig.yamlls.setup({ + settings = { + yaml = { + keyOrdering = false, + schemaStore = { + -- You must disable built-in schemaStore support if you want to use + -- this plugin and its advanced options like `ignore`. + enable = false, + -- Avoid TypeError: Cannot read properties of undefined (reading 'length') + url = "", + }, + schemas = require("schemastore").yaml.schemas(), + }, + }, + }) - lspconfig.marksman.setup({ capabilities = capabilities }) - lspconfig.pyright.setup({ capabilities = capabilities }) - lspconfig.ansiblels.setup({ capabilities = capabilities }) + lspconfig.marksman.setup({ capabilities = capabilities }) + lspconfig.pyright.setup({ capabilities = capabilities }) + lspconfig.ansiblels.setup({ capabilities = capabilities }) - vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) - vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) - vim.keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, {}) - end, - }, + vim.keymap.set("n", "K", vim.lsp.buf.hover, {}) + vim.keymap.set("n", "gd", vim.lsp.buf.definition, {}) + vim.keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, {}) + end, + }, } diff --git a/.config/nvim/lua/plugins/notes.lua b/.config/nvim/lua/plugins/notes.lua new file mode 100644 index 0000000..bd167c4 --- /dev/null +++ b/.config/nvim/lua/plugins/notes.lua @@ -0,0 +1,30 @@ +return { + { + "renerocksai/telekasten.nvim", + dependencies = { "nvim-telescope/telescope.nvim" }, + cmd = { "Telekasten" }, + -- stylua: ignore + keys = { + { 'nn', function() require('telekasten').goto_thisweek() end }, + { 'nN', function() require('telekasten').new_note() end }, + { 'nf', function() require('telekasten').find_notes() end }, + { 'na', function() require('telekasten').search_notes() end }, + { 'N', function() require('telekasten').panel() end }, + }, + opts = { + home = vim.fn.expand("~/notes/"), + dailies = vim.fn.expand("~/notes/daily"), + weeklies = vim.fn.expand("~/notes/weekly"), + templates = vim.fn.expand("~/notes/templates"), + extension = ".md", + + follow_creates_nonexisting = true, + dailies_create_nonexisting = true, + weeklies_create_nonexisting = true, + + template_new_note = vim.fn.expand("~/notes/templates/new_note.md"), + template_new_daily = vim.fn.expand("~/notes/templates/daily.md"), + template_new_weekly = vim.fn.expand("~/notes/templates/weekly.md"), + }, + }, +} diff --git a/.config/nvim/lua/plugins/obsidian.lua b/.config/nvim/lua/plugins/obsidian.lua deleted file mode 100644 index ff8d432..0000000 --- a/.config/nvim/lua/plugins/obsidian.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - "epwalsh/obsidian.nvim", - version = "v3.9.0", -- recommended, use latest release instead of latest commit - -- lazy = true, - -- event = { - -- "BufReadPre " .. vim.fn.expand("~") .. "/notes/*.md", - -- "BufNewFile " .. vim.fn.expand("~") .. "/notes/*.md", - -- }, - dependencies = { - "nvim-lua/plenary.nvim", - }, - opts = { - workspaces = { - { - name = "notes", - path = "~/notes/", - }, - }, - completion = { - -- Set to false to disable completion. - nvim_cmp = true, - -- Trigger completion at 2 chars. - min_chars = 2, - }, -- see below for full list of options 👇 - }, -} diff --git a/bin/1p-find b/bin/1p-find index 2d0e582..5e89455 100755 --- a/bin/1p-find +++ b/bin/1p-find @@ -1,4 +1,4 @@ #!/bin/bash eval $(op signin) -op item list | fzf | cut -f 1 -d ' ' | xargs -I{} op item get {} --field password | pbcopy +op item list | fzf | cut -f 1 -d ' ' | xargs -I{} op item get {} --reveal --field password | pbcopy