From 37a8db745c42e174a33ef516d1af0071cd02f67c Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Fri, 11 Oct 2024 14:31:59 +0200
Subject: .vimrc: re-enable gopls for vim-go

---
 .config/sway/config |  9 ++++++---
 .vimrc              | 16 ++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 8246156..1227919 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -88,7 +88,7 @@ bindswitch lid:on exec swaylock -c "#103040"
     bindsym $mod+Return exec $term
 
     # Kill focused window
-    bindsym $mod+Shift+q kill
+    bindsym $mod+q kill
 
     # Start your launcher
     bindsym $mod+d exec $menu
@@ -175,8 +175,8 @@ bindswitch lid:on exec swaylock -c "#103040"
     bindsym $mod+v splitv
 
     # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
+    # bindsym $mod+s layout stacking
+    # bindsym $mod+w layout tabbed
     bindsym $mod+e layout toggle split
 
     # Make the current focus fullscreen
@@ -227,6 +227,9 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+# Floating windows
+for_window [title="About Mozilla Firefox"] floating enable
+
 #
 # Status Bar:
 #
diff --git a/.vimrc b/.vimrc
index 8fbe518..c449c64 100644
--- a/.vimrc
+++ b/.vimrc
@@ -27,15 +27,15 @@ autocmd filetype vimki set autowrite
 autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR>
 
 " vim-go plugin
-"let g:go_def_mode = "gopls"
-"let g:go_info_mode = "gopls"
-"let g:go_list_type = "quickfix"
-"let g:go_fmt_command = "gopls"
-"let g:go_gopls_gofumpt = 1
+let g:go_def_mode = "gopls"
+let g:go_info_mode = "gopls"
+let g:go_list_type = "quickfix"
+let g:go_fmt_command = "gopls"
+let g:go_gopls_gofumpt = 1
 
-let g:go_gopls_enabled = 0
-let g:go_def_mode = "godef"
-let g:go_fmt_command = "goimports"
+"let g:go_gopls_enabled = 0
+"let g:go_def_mode = "godef"
+"let g:go_fmt_command = "goimports"
 let g:go_metalinter_command = "golangci-lint"
 "autocmd FileType go syntax on
 autocmd FileType go nmap <leader>b <Plug>(go-build)
-- 
cgit v1.2.3