Merge branch 'master' into macbook

.config/alacritty/alacritty.toml

@@ -2,22 +2,22 @@
 TERM = "xterm-256color"
 
 [font]
-size = 12.0
+size = 14
 
 [font.normal]
-family = "Input Nerd Font"
+family = "Hack Nerd Font Mono"
 style = "Regular"
 
 [font.bold]
-family = "Input Nerd Font"
+family = "Hack Nerd Font Mono"
 style = "Bold"
 
 [font.bold_italic]
-family = "Input Nerd Font"
+family = "Hack Nerd Font Mono"
 style = "Bold Italic"
 
 [font.italic]
-family = "Input Nerd Font"
+family = "Hack Nerd Font Mono"
 style = "Italic"
 
 [font.offset]

.config/ncmpcpp/bindings

@@ -10,4 +10,5 @@ def_key "l"
   enter_directory
 def_key "h"
   jump_to_parent_directory
-
+def_key "4"
+  show_lyrics

.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

@@ -43,7 +43,6 @@ set -g @tpm_plugins ' \
 	tmux-plugins/tmux-sensible \
 	tmux-plugins/tmux-resurrect \
 	tmux-plugins/tmux-yank \
-	Nybkox/tmux-kanagawa \
 	tmux-plugins/tmux-continuum \
 '
 
@@ -52,14 +51,20 @@ set -g @continuum-save-interval '30'
 
 set -g @resurrect-processes 'false'
 
-set -g @kanagawa-ignore-window-colors true
+# border colours
+set -g pane-border-style "fg=#282728"
+set -g pane-active-border-style "fg=#938AA9"
 
-set -g @kanagawa-plugins " "
+# status bar
-set -g @kanagawa-show-battery false
+set-option -g status-style bg=default
-set -g @kanagawa-day-month true
+set -g message-command-style bg=default
-set -g @kanagawa-show-timezone false
+set -g message-style bg=default
-set -g @kanagawa-time-format "%R"
+set -g status-left '| #S | '
+set -g status-right ''
+set -g status-left-length 500
 
+set -g window-status-format "#I:#W  "
+set -g window-status-current-format "#[fg=red]#I#[fg=default]:#W* "
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.config/tmux/plugins/tpm/tpm'

.zprofile

@@ -5,6 +5,13 @@ export SUDO_EDITOR=/usr/bin/nvim
 export XDG_CURRENT_DESKTOP=Sway
 export HOMEBREW_NO_AUTO_UPDATE=true
 export ELECTRON_OZONE_PLATFORM_HINT=auto
+# Created by `pipx` on 2024-10-08 14:33:09
+export PATH="$PATH:/Users/nikitabykov/.local/bin"
+
+# >>> coursier install directory >>>
+export PATH="$PATH:/Users/nikitabykov/Library/Application Support/Coursier/bin"
+# <<< coursier install directory <<<
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 if [[ -z $DISPLAY && $TTY = /dev/tty1 ]]; then
 	 exec sway

.zshrc

@@ -48,7 +48,7 @@ source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
 autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit
 
-ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd completion)
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
 # Load a few important annexes, without Turbo
 # (this is currently required for annexes)