Merge branch 'master' of git.woopwoopserver.com:woopwoop/dotfiles into macbook

.config/nvim/lua/user/keymaps.lua

@@ -49,8 +49,5 @@ keymap("n", "<S-h>", ":tabprevious<CR>", opts)
 -- Copy to clipboard
 keymap("v", "<C-c>", "\"+y", opts)
 
--- Copy relative path of current ile to clipboard
-keymap("n", "<C-y>", ":let @+ = expand(\"%\")<CR>", opts)
-
 --Close buffer
 -- keymap("n", "<C-w>", ":bd | bp <CR>", opts)

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

@@ -4,7 +4,16 @@ return {
 		config = true
 	},
 	{
-		"mason-org/mason-lspconfig.nvim",
+		"williamboman/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()
@@ -24,17 +33,6 @@ 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",

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

@@ -4,8 +4,6 @@ vim.lsp.enable({
 	"omnisharp",
 	"pylsp",
 	"rust_analyzer",
-	"luals",
-	"vimls"
 })
 
 -- TODO: this does not work, need to install pylsp-mypy plugin manually
@@ -47,20 +45,4 @@ 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/nvim/lua/user/plugins/snipptes.lua

@@ -1,18 +1,11 @@
 return {
 	{
 		"L3MON4D3/LuaSnip",
-		lazy = false,
-		opts = {
-			region_check_events = "CursorHold,InsertLeave,InsertEnter",
-			-- those are for removing deleted snippets, also a common problem
-			delete_check_events = "TextChanged,InsertEnter",
-		},
-		config = function(_, opts)
-			local luasnip = require("luasnip")
-			luasnip.setup(opts)
-		end,
+		event = "VeryLazy",
+		config = true,
 		dependencies = {
 			"rafamadriz/friendly-snippets",
+			-- "dsznajder/vscode-es7-javascript-react-snippets",
 		}
 	}
 }

.config/proxy/config.pac

@@ -2,8 +2,8 @@ function FindProxyForURL(url, host) {
     // Proxy server (customize this line)
     var proxy = "PROXY 91.199.147.158:3128";
 
+    // Domains related to ChatGPT/OpenAI
     var proxy_domains = [
-        // Domains related to ChatGPT/OpenAI
         "chatgpt.com",
         "chat.openai.com",
         "openai.com",
@@ -11,7 +11,6 @@ function FindProxyForURL(url, host) {
         "platform.openai.com",
         "auth0.openai.com",
 
-        // Youtube related domains
         "*.youtube.com",
         "youtube.com",
         "*.googlevideo.com",

.zprofile

@@ -3,14 +3,15 @@ export PATH=~/.local/bin:~/.cargo/bin:$PATH
 export EDITOR=nvim
 export SUDO_EDITOR=/usr/bin/nvim
 export XDG_CURRENT_DESKTOP=Sway
-export XDG_SESSION_DESKTOP=sway
-export XDG_SESSION_TYPE=wayland
 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"
 
-if command -v dbus-update-activation-environment >/dev/null; then
-  dbus-update-activation-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE
-fi
+# >>> 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

@@ -31,7 +31,6 @@ alias toggle_vpn='sudo toggle_vpn'
 alias rr='ranger'
 
 # naviagtion aliases
-alias masters='cd /home/nikita/Documents/woopvault/University/masters/indicators_monitoring'
 alias dots='cd ~/dotfiles'
 alias notes='cd ~/Documents/woopvault/'
 alias work='cd ~/Code/maxim/'