From 40b0deae61ec63dd666f718f5e2616d9ee84f872 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Sun, 9 Jun 2024 14:40:02 -0400 Subject: [PATCH] update --- hosts/macbook/home.nix | 1 + modules/home-manager/neovim/nvim/init.lua | 2 +- modules/home-manager/neovim/nvim/lua/plugins/lsp.lua | 9 +++++++++ modules/home-manager/wezterm/default.nix | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 21ba26b..4303c4e 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -45,6 +45,7 @@ kubectl k9s kubeseal + velero fluxcd wireguard-tools kompose diff --git a/modules/home-manager/neovim/nvim/init.lua b/modules/home-manager/neovim/nvim/init.lua index 3831c72..4862416 100644 --- a/modules/home-manager/neovim/nvim/init.lua +++ b/modules/home-manager/neovim/nvim/init.lua @@ -25,7 +25,7 @@ g.maplocalleader = " " -- Load plugins require('lazy').setup('plugins') -vim.cmd 'colorscheme catppuccin-mocha' +vim.cmd 'colorscheme catppuccin-frappe' -- Load core settings opt.termguicolors = true -- Enable colors in terminal diff --git a/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua b/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua index 5c7729d..b944018 100644 --- a/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua +++ b/modules/home-manager/neovim/nvim/lua/plugins/lsp.lua @@ -97,7 +97,16 @@ return { root_dir = lsp.util.root_pattern('tailwind.config.js', 'tailwind.config.cjs', 'tailwind.config.mjs', 'tailwind.config.ts') }) + -- html + lsp.html.setup({}) + -- go lsp.gopls.setup({}) + lsp.golangci_lint_ls.setup{} + + -- templ + vim.filetype.add({ extension = { templ = "templ" } }) + lsp.templ.setup{} + end, } diff --git a/modules/home-manager/wezterm/default.nix b/modules/home-manager/wezterm/default.nix index c2c05b0..3a7f820 100644 --- a/modules/home-manager/wezterm/default.nix +++ b/modules/home-manager/wezterm/default.nix @@ -5,7 +5,7 @@ enable = true; extraConfig = '' return { - color_scheme = 'catppuccin-mocha', + color_scheme = 'catppuccin-frappe', -- font = wezterm.font('PragmataPro Liga'), font_size = 16, use_fancy_tab_bar = false,