Merge branch 'master' into macbook

.config/nvim/lua/user/plugins/lsp/init.lua

@@ -4,16 +4,7 @@ return {
 		config = true
 	},
 	{
-		"williamboman/mason-lspconfig.nvim",
+		"mason-org/mason-lspconfig.nvim",
-	},
-	{
-		"neovim/nvim-lspconfig",
-		event = "BufReadPre BufNewFile",
-		dependencies = {
-			"williamboman/mason.nvim",
-			"williamboman/mason-lspconfig.nvim",
-			"nvimtools/none-ls.nvim",
-		},
 		config = function()
 			require("user.plugins.lsp.mason_lsp_config")
 			require("user.plugins.lsp.diagnostics_config").setup()
@@ -33,16 +24,22 @@ return {
 
 			vim.cmd([[ command! Format execute 'lua vim.lsp.buf.format{async=true}' ]])
 		end,
+		dependencies = {
+			{ "mason-org/mason.nvim", opts = {} },
+			"neovim/nvim-lspconfig",
+		},
+	},
+	{
+		"neovim/nvim-lspconfig",
+		event = "BufReadPre BufNewFile",
+		dependencies = {
+			"nvimtools/none-ls.nvim",
+		},
 	},
 	{
 		"lukas-reineke/lsp-format.nvim",
 		event = "VeryLazy",
 		config = function()
-			local on_attach = function(client)
-				require("lsp-format").on_attach(client)
-			end
-
-			require("lspconfig").gopls.setup { on_attach = on_attach }
 		end
 	},
 	{

.config/nvim/lua/user/plugins/lsp/mason_lsp_config.lua

@@ -4,6 +4,8 @@ vim.lsp.enable({
 	"omnisharp",
 	"pylsp",
 	"rust_analyzer",
+	"luals",
+	"vimls"
 })
 
 -- TODO: this does not work, need to install pylsp-mypy plugin manually
@@ -45,4 +47,20 @@ vim.lsp.config('rust_analyzer', {
 	}
 })
 
+vim.lsp.config('luals', {
+	settings = {
+		Lua = {}
+	}
+})
+
+vim.lsp.config('rust_analyzer', {
+	settings = {
+		["rust-analyzer"] = {
+			cargo = {
+				features = "all",
+			},
+		},
+	}
+})
+
 mason_lspconfig.setup()

.config/sway/config

@@ -28,10 +28,11 @@ exec xrandr --output DP-2 --primary
 
 bar {
 	id 1
+	mode hide
 	tray_output none
-	font Input Nerd Font 9 
+	font Hack Nerd Font 9 
 	status_command "~/Scripts/sway/bar.sh"
-	gaps 0 6 0 0
+	gaps 0 0 0 0
 	colors {
 		# focused_workspace #7E9CD8 #7E9CD8 #AAAAAA
 	}
@@ -76,6 +77,9 @@ bindsym --to-code $mod+m exec $term msg create-window --class in_scratchpad -e n
 bindsym --to-code $mod+e exec $term msg create-window -e neomutt || $term -e neomutt
 bindsym --to-code $mod+n exec $term msg create-window -e newsboat || $term -e newsboat
 
+# toggle showing bar
+bindsym --to-code $mod+minus exec "swaymsg bar 1 mode toggle"
+
 # open windows with id "in_scratchpad" in scratchpad
 for_window [app_id="in_scratchpad"] move container to scratchpad, focus
 

.config/tmux/tmux.conf

@@ -57,6 +57,8 @@ set -g pane-active-border-style "fg=#938AA9"
 
 # status bar
 set-option -g status-style bg=default
+set -g message-command-style bg=default
+set -g message-style bg=default
 set -g status-left '| #S | '
 set -g status-right ''
 set -g status-left-length 500