From 7a3222a63f9355e6d32ececc246414555a0b1d31 Mon Sep 17 00:00:00 2001 From: Hans Goor Date: Sun, 8 Feb 2026 13:46:11 +0100 Subject: [PATCH] Fix ZSH config and update Nvim. --- stowers/git/dot-gitignore | 2 -- stowers/nvim/dot-config/nvim/lazy-lock.json | 26 +++++++++---------- .../dot-config/nvim/lua/eyedevelop/init.lua | 2 +- .../nvim/lua/eyedevelop/lsp/config.lua | 6 +++++ .../nvim/lua/eyedevelop/lsp/haskell.lua | 3 +++ .../nvim/lua/eyedevelop/lsp/init.lua | 6 +++++ .../{lsp_settings.lua => lsp/markup.lua} | 10 +++---- .../nvim/lua/eyedevelop/lsp/pyright.lua | 3 +++ .../nvim/lua/eyedevelop/lsp/rust_analyzer.lua | 10 +++++++ stowers/ssh/dot-ssh/conf.d/msg.conf | 4 +++ stowers/zsh/dot-zshrc | 4 --- 11 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/config.lua create mode 100644 stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/haskell.lua create mode 100644 stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/init.lua rename stowers/nvim/dot-config/nvim/lua/eyedevelop/{lsp_settings.lua => lsp/markup.lua} (76%) create mode 100644 stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/pyright.lua create mode 100644 stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/rust_analyzer.lua create mode 100644 stowers/ssh/dot-ssh/conf.d/msg.conf diff --git a/stowers/git/dot-gitignore b/stowers/git/dot-gitignore index f9789a2..a1a061a 100644 --- a/stowers/git/dot-gitignore +++ b/stowers/git/dot-gitignore @@ -2,8 +2,6 @@ .DS_Store .AppleDouble .LSOverride -Icon[ -] # Thumbnails ._* diff --git a/stowers/nvim/dot-config/nvim/lazy-lock.json b/stowers/nvim/dot-config/nvim/lazy-lock.json index ac6ed74..e83865c 100644 --- a/stowers/nvim/dot-config/nvim/lazy-lock.json +++ b/stowers/nvim/dot-config/nvim/lazy-lock.json @@ -1,22 +1,22 @@ { "blamer.nvim": { "branch": "master", "commit": "920eee3913091bd929d83e7bf52a815351a0559c" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "indent-o-matic": { "branch": "master", "commit": "764da1f30b5bb4a49035c3abc9a586322296b812" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "neovim": { "branch": "main", "commit": "e62a61166ebfa2e5fdad4993310b290ac9b905c1" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "db8fef885009fdec0daeff3e5dda92e1f539611e" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, + "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "schemastore.nvim": { "branch": "main", "commit": "c8af3f44c68757344b4dcb82e2ac48892b1be765" }, + "schemastore.nvim": { "branch": "main", "commit": "ff73799fc8df725d51eada87a113581ba4d3717b" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, - "vim-gitgutter": { "branch": "main", "commit": "488c0555e47e2aabe273c635f7dd233e985311a6" } + "undotree": { "branch": "master", "commit": "fc28931fbfba66ab75d9af23fe46ffbbb9de6e8c" }, + "vim-gitgutter": { "branch": "main", "commit": "0acb772e76064cc406664ab595b58b3fac76488a" } } diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua index 30b1a3f..536648f 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/init.lua @@ -1,4 +1,4 @@ require("eyedevelop.remap") require("eyedevelop.pm") require("eyedevelop.settings") -require("eyedevelop.lsp_settings") +require("eyedevelop.lsp") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/config.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/config.lua new file mode 100644 index 0000000..f0a7738 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/config.lua @@ -0,0 +1,6 @@ +vim.lsp.config("*", { + capabilities = require("cmp_nvim_lsp").default_capabilities(), + inlay_hints = { + enabled = true, + }, +}) diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/haskell.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/haskell.lua new file mode 100644 index 0000000..f5ace29 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/haskell.lua @@ -0,0 +1,3 @@ +vim.lsp.config("hls", {}) + +vim.lsp.enable("hls") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/init.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/init.lua new file mode 100644 index 0000000..cf4c252 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/init.lua @@ -0,0 +1,6 @@ +require("eyedevelop.lsp.config") + +require("eyedevelop.lsp.markup") +require("eyedevelop.lsp.pyright") +require("eyedevelop.lsp.haskell") +require("eyedevelop.lsp.rust_analyzer") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/markup.lua similarity index 76% rename from stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua rename to stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/markup.lua index a752e59..f5812fa 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp_settings.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/markup.lua @@ -1,10 +1,3 @@ -vim.lsp.config("*", { - capabilities = require("cmp_nvim_lsp").default_capabilities(), - inlay_hints = { - enabled = true, - }, -}) - vim.lsp.config("yamlls", { settings = { yaml = { @@ -27,3 +20,6 @@ vim.lsp.config("jsonls", { }, }, }) + +vim.lsp.enable("yamlls") +vim.lsp.enable("jsonls") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/pyright.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/pyright.lua new file mode 100644 index 0000000..12e6965 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/pyright.lua @@ -0,0 +1,3 @@ +vim.lsp.config("pyright", {}) + +vim.lsp.enable("pyright") diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/rust_analyzer.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/rust_analyzer.lua new file mode 100644 index 0000000..1481eab --- /dev/null +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/lsp/rust_analyzer.lua @@ -0,0 +1,10 @@ +vim.lsp.config("rust_analyzer", { + cmd = { + "docker", "run", "--rm", "-i", + "-v", vim.fn.getcwd() .. ":" .. vim.fn.getcwd(), + "-w", vim.fn.getcwd(), + "docker.io/lspcontainers/rust-analyzer:latest" + } +}) + +vim.lsp.enable("rust_analyzer") diff --git a/stowers/ssh/dot-ssh/conf.d/msg.conf b/stowers/ssh/dot-ssh/conf.d/msg.conf new file mode 100644 index 0000000..1b6b225 --- /dev/null +++ b/stowers/ssh/dot-ssh/conf.d/msg.conf @@ -0,0 +1,4 @@ +Host msg-webcam + HostName 130.89.121.19 + Port 15022 + User msg diff --git a/stowers/zsh/dot-zshrc b/stowers/zsh/dot-zshrc index 3898531..dc556c6 100644 --- a/stowers/zsh/dot-zshrc +++ b/stowers/zsh/dot-zshrc @@ -16,12 +16,8 @@ export PATH="${PATH}:${HOME}/.local/bin" HISTFILE=~/.histfile HISTSIZE=1000 SAVEHIST=1000 -setopt notify -unsetopt autocd beep nomatch -bindkey -v zstyle :compinstall filename "${HOME}/.zshrc" - autoload -Uz compinit compinit