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

.config/newsboat/config

@@ -39,5 +39,3 @@ miniflux-url "https://miniflux.woopwoopserver.com/"
 
 miniflux-login "woopwoop"
 miniflux-passwordeval "pass show miniflux"
-
-reload-threads 5

.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",

.config/sway/config

@@ -43,7 +43,6 @@ bar {
 # you can get the names of your outputs by running: swaymsg -t get_outputs
 output DP-2 position 0 0 mode 2560x1440@144Hz
 output HDMI-A-1 position 2560 360 mode 1920x1080@60Hz
-output HDMI-A-2 position 4480 360 mode 1920x1080@60Hz disable
 # output * bg /home/nikita/Pictures/wallpapers/nord-street.png fill
 
 
@@ -84,12 +83,8 @@ 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
 
-
-# for_window [title="Steam Big Picture Mode" class="steam"] exec "/home/nikita/Scripts/sway/enable_tv_gaming_mode.sh"
-
-# assign [class="steam" title="^(?!.*Steam Big Picture Mode).*"] workspace 15
-# for_window [class="steam" title="^(?!.*Steam Big Picture Mode).*"] exec "/home/nikita/Scripts/sway/disable_tv_gaming_mode.sh"
-
+# # open apps in specified workspaces
+assign [class="steam"] workspace 15
 
 assign [app_id="DBeaver"] workspace 22
 assign [class="jetbrains-datagrip"]  workspace 23
@@ -105,8 +100,6 @@ bindsym --to-code $mod+SHIFT+BackSpace exec ~/Scripts/tofi/powermenu.sh
 # vpn selector
 bindsym --to-code $mod+SHIFT+v exec ~/Scripts/tofi/select_vpn.sh
 
-bindsym --to-code $mod+SHIFT+g exec ~/Scripts/tofi/select_desktop_mode.sh
-
 # start search in browser
 bindsym --to-code $mod+slash exec ~/Scripts/general/bin/browser_search_web
 
@@ -157,8 +150,6 @@ workspace 27 output HDMI-A-1
 workspace 28 output HDMI-A-1
 workspace 29 output HDMI-A-1
 
-workspace 31 output HDMI-A-2
-
 # move mouse to focused window/workspace
 mouse_warping output
 focus_wrapping workspace
@@ -262,13 +253,11 @@ bindsym --to-code $mod+Shift+bracketleft exec playerctl -p mpd volume 0.05-
 bindsym --to-code $mod+Shift+bracketright exec playerctl -p mpd volume 0.05+
 bindsym --to-code $mod+Shift+y exec playerctl -p mpd shuffle Toggle
 
-set $sink "alsa_output.pci-0000_29_00.0.analog-stereo"
-
 # special keys to adjust volume via pulseaudio
-bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink toggle
-bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume $sink -5%
-bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink +5%
-bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink toggle
+bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+bindsym --to-code --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
 bindsym --to-code --locked XF86AudioPlay exec playerctl play-pause
 bindsym --to-code --locked XF86AudioPause exec playerctl play-pause
 bindsym --to-code --locked XF86AudioNext exec playerctl next

.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

@@ -22,7 +22,7 @@ bindkey '^j' down-line-or-history
 alias v="nvim"
 alias ta='tmux at || tmux'
 alias ls="ls --color"
-alias homeaudio="ncmpcpp -h 192.168.1.100"
+alias homeaudio="ncmpcpp -h 192.168.0.100"
 alias lg="lazygit"
 alias acpoet='source $( poetry env list --full-path | grep Activated | cut -d" " -f1 )/bin/activate'
 alias rutracker='RUTRACKER_USERNAME=$(pass show rutracker | grep -oP "username:\K.*") RUTRACKER_PASSWORD=$(pass show rutracker | head -n 1) rust_rutracker_cli'
@@ -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/'