updoodles

vinnymeller · Jun 9, 2024 · a248fdc · a248fdc
1 parent b8a4306
commit a248fdc
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 56 deletions.
diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf
@@ -67,7 +67,7 @@ bind R source-file ~/.nixdots/dotfiles/.tmux.conf \; display "Reloaded!"
 bind f run-shell "tmux neww twm"
 bind F run-shell "tmux neww twm -l"
 bind o display-popup -E "twm"
-bind o display-popup -E "twm -l"
+bind O display-popup -E "twm -l"
 bind e run-shell "tmux switch -t $TWM_DEFAULT"
 bind g run-shell "tmux neww twm -g"
 bind s run-shell "tmux neww twm -e"

diff --git a/dotfiles/nvim/lua/plugins/autopairs.lua b/dotfiles/nvim/lua/plugins/autopairs.lua
@@ -1 +1,2 @@
 require("nvim-autopairs").setup()
+require("nvim-ts-autotag").setup()
diff --git a/dotfiles/nvim/lua/plugins/lsp.lua b/dotfiles/nvim/lua/plugins/lsp.lua
@@ -145,6 +145,7 @@ require("lspconfig").html.setup({
 local basic_servers = {
 	"ccls",
 	"dockerls",
+	"gopls",
 	"hls",
 	"nil_ls",
 	"ocamllsp",
@@ -175,6 +176,10 @@ local languages = {
 	-- 	prettier_d,
 	-- 	eslint,
 	-- },
+	go = {
+		require("efmls-configs.formatters.gofmt"),
+		require("efmls-configs.formatters.goimports"),
+	},
 	lua = {
 		require("efmls-configs.formatters.stylua"),
 	},

diff --git a/dotfiles/nvim/lua/plugins/treesitter.lua b/dotfiles/nvim/lua/plugins/treesitter.lua
@@ -18,9 +18,6 @@ require("nvim-treesitter.configs").setup({
 	--
 
 	auto_install = true,
-	autotag = {
-		enable = true,
-	},
 	parser_install_dir = "$HOME/.local/share/treesitter",
 	matchup = {
 		enable = true,

diff --git a/flake.lock b/flake.lock
diff --git a/programs/ncvim/default.nix b/programs/ncvim/default.nix
@@ -72,6 +72,7 @@ let
             fzf
             gcc
             git
+            gopls
             haskellPackages.haskell-language-server
             imagemagick
             isort