From: Tobias Sachs Date: Thu, 22 Dec 2022 13:43:44 +0000 (+0100) Subject: ... X-Git-Url: https://src.twobees.de/?p=dotfiles.git;a=commitdiff_plain;h=2714a4bd8aa12cd73680a00a2f0a250113e626be ... --- diff --git a/stow/i3/.config/i3/config b/stow/i3/.config/i3/config index 11f2476..51b202d 100644 --- a/stow/i3/.config/i3/config +++ b/stow/i3/.config/i3/config @@ -38,7 +38,7 @@ exec --no-startup-id /usr/bin/firefox # exec --no-startup-id /usr/bin/x2goclient exec --no-startup-id "sleep 10; /usr/bin/nextcloud" exec --no-startup-id "sleep 12; /usr/bin/pass git pull" -exec --no-startup-id nitrogen --set-auto --random ~/.walls/ +exec --no-startup-id nitrogen --set-zoom-fill --random ~/.walls/ exec --no-startup-id "/usr/bin/setxkbmap -layout us,de" exec --no-startup-id "/usr/bin/setxkbmap -option 'grp:alt_shift_toggle'" diff --git a/stow/nvim/.config/nvim/after/plugin/lspsetup.lua b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua new file mode 100644 index 0000000..170bfeb --- /dev/null +++ b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua @@ -0,0 +1,21 @@ +local lsp = require('lsp-zero') + +lsp.preset('recommended') +lsp.configure('sumneko_lua', { + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + } +}) +lsp.setup() + +vim.lsp.handlers["textDocument/publishDiagnostics"] = +vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { + virtual_text = true, -- inline diagnostic on line end + } +) diff --git a/stow/nvim/.config/nvim/init.lua b/stow/nvim/.config/nvim/init.lua index c7360a9..4d72f24 100644 --- a/stow/nvim/.config/nvim/init.lua +++ b/stow/nvim/.config/nvim/init.lua @@ -4,11 +4,9 @@ vim.o.backupdir = data_path .. "/backup//" pcall (require 'plugin_mgr') pcall (require 'set') -pcall (require 'lspsetup') pcall (require 'mappings') pcall (require 'treesitter') pcall (require 'perl') -pcall (require 'theme') pcall (require 'cmp-settings') -- found in ThePrimagen dotfiles: diff --git a/stow/nvim/.config/nvim/lua/lspsetup.lua b/stow/nvim/.config/nvim/lua/lspsetup.lua deleted file mode 100644 index 170bfeb..0000000 --- a/stow/nvim/.config/nvim/lua/lspsetup.lua +++ /dev/null @@ -1,21 +0,0 @@ -local lsp = require('lsp-zero') - -lsp.preset('recommended') -lsp.configure('sumneko_lua', { - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - } - } - } -}) -lsp.setup() - -vim.lsp.handlers["textDocument/publishDiagnostics"] = -vim.lsp.with( - vim.lsp.diagnostic.on_publish_diagnostics, - { - virtual_text = true, -- inline diagnostic on line end - } -) diff --git a/stow/nvim/.config/nvim/lua/plugin_mgr.lua b/stow/nvim/.config/nvim/lua/plugin_mgr.lua index dceb709..39a6707 100644 --- a/stow/nvim/.config/nvim/lua/plugin_mgr.lua +++ b/stow/nvim/.config/nvim/lua/plugin_mgr.lua @@ -13,7 +13,6 @@ local packer_bootstrap = ensure_packer() return require('packer').startup(function(use) use { 'wbthomason/packer.nvim' } - use { 'catppuccin/nvim', as = 'catppuccin' } use({ 'rose-pine/neovim', as = 'rose-pine', diff --git a/stow/nvim/.config/nvim/lua/theme.lua b/stow/nvim/.config/nvim/lua/theme.lua deleted file mode 100644 index 3a779d6..0000000 --- a/stow/nvim/.config/nvim/lua/theme.lua +++ /dev/null @@ -1,3 +0,0 @@ -vim.g.catppuccin_flavour = "frappe" -- latte, frappe, macchiato, mocha -require("catppuccin").setup() -vim.cmd [[colorscheme catppuccin]]