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

.config/mpv/mpv.conf

@@ -117,7 +117,7 @@
 #slang=en
 
 # Play Finnish audio if available, fall back to English otherwise.
-alang=en
+#alang=fi,en
 
 # Change subtitle encoding. For Arabic subtitles use 'cp1256'.
 # If the file seems to be valid UTF-8, prefer UTF-8.
@@ -142,5 +142,3 @@ alang=en
 --sub-auto=all
 
 --sub-file-paths=sub:subtitles
-
-sub-scale=1.5

.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/plugins/treesitter.lua

@@ -3,11 +3,9 @@ return {
 		"nvim-treesitter/nvim-treesitter",
 		build = ":TSUpdate",
 		lazy = false,
-		branch = 'main',
 		-- init = function(plugin)
 		-- 	require("nvim-treesitter")
 		-- end,
-		-- TODO: old options format, need to reconfigure
 		opts = {
 			ensure_installed = { "python", "rust", "javascript" }, -- one of "all" or a list of languages
 			ignore_install = { "phpdoc", "comment", "rst" },    -- List of parsers to ignore installing
@@ -36,13 +34,8 @@ return {
 				},
 			},
 		},
-		config = function(_, opts)
+		config = function (_, opts)
-			-- enable treesitter highlighting
+			require("nvim-treesitter.configs").setup(opts)
-			vim.api.nvim_create_autocmd("FileType", {
-				callback = function(args)
-					pcall(vim.treesitter.start, args.buf)
-				end,
-			})
 		end
 	},
 }

.config/sway/config

@@ -1,9 +1,7 @@
 # shortcut bindings to app and directions
 set $mod Mod4
 set $term alacritty
-# set $menu tofi-drun | xargs swaymsg exec --
+set $menu tofi-drun | xargs swaymsg exec --
-# set $menu tofi_prefix_hack && tofi-drun | xargs swaymsg exec --
-set $menu j4-dmenu-desktop --i3-ipc --dmenu=bemenu
 
 set $left h
 set $down j
@@ -27,14 +25,10 @@ exec ~/Scripts/ntfy/ntfy_subscribe.sh &
 xwayland force
 exec xrandr --output DP-2 --primary
 
-# set swaysock env to make swaymsg commands accessible for systemd
-exec --no-startup-id systemctl --user set-environment SWAYSOCK=$SWAYSOCK
-exec --no-startup-id systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
 
 bar {
 	id 1
-	# TODO enable after bemenu focus bug fix
+	mode hide
-	# mode hide
 	tray_output none
 	font Hack Nerd Font 9 
 	status_command "~/Scripts/sway/bar.sh"
@@ -49,14 +43,13 @@ 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
 
 
 # input configuration
 # you can get the names of your inputs by running: swaymsg -t get_inputs
 # read `man 5 sway-input` for more information about this section.
-input "1133:16505:Logitech_G_Pro" {
+input type:pointer {
 	pointer_accel 0
 	accel_profile "flat"
 }
@@ -90,19 +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
 
-
+# # open apps in specified workspaces
-# for_window [title="Steam Big Picture Mode" class="steam"] exec "/home/nikita/Scripts/sway/enable_tv_gaming_mode.sh"
+assign [class="steam"] workspace 15
-
-# 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"
-
-
-# dont idle screen when any app in fullscreen is open
-for_window [shell=".*"] inhibit_idle fullscreen
-# dont idle screen when any steam game is visible
-for_window [class="steam_app_.*"] inhibit_idle visible
-
-
 
 assign [app_id="DBeaver"] workspace 22
 assign [class="jetbrains-datagrip"]  workspace 23
@@ -110,8 +92,7 @@ assign [app_id="taxsee.im.desktop*"] workspace 24
 
 assign [app_id="Element"] workspace number 25
 assign [class="Element"] workspace number 25
-
+assign [app_id="librewolf"] workspace number 12
-exec ~/Scripts/sway/browser_workspace_assign.sh
 
 # powermenu
 bindsym --to-code $mod+SHIFT+BackSpace exec ~/Scripts/tofi/powermenu.sh
@@ -119,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
 
@@ -171,16 +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
-workspace 32 output HDMI-A-2
-workspace 33 output HDMI-A-2
-workspace 34 output HDMI-A-2
-workspace 35 output HDMI-A-2
-workspace 36 output HDMI-A-2
-workspace 37 output HDMI-A-2
-workspace 38 output HDMI-A-2
-workspace 39 output HDMI-A-2
-
 # move mouse to focused window/workspace
 mouse_warping output
 focus_wrapping workspace
@@ -236,17 +205,6 @@ bindsym --to-code --no-warn $mod+Alt+7 workspace 27
 bindsym --to-code --no-warn $mod+Alt+8 workspace 28
 bindsym --to-code --no-warn $mod+Alt+9 workspace 29
 
-bindsym --to-code --no-warn $mod+Ctrl+1 workspace 31
-bindsym --to-code --no-warn $mod+Ctrl+2 workspace 32
-bindsym --to-code --no-warn $mod+Ctrl+3 workspace 33
-bindsym --to-code --no-warn $mod+Ctrl+4 workspace 34
-bindsym --to-code --no-warn $mod+Ctrl+5 workspace 35
-bindsym --to-code --no-warn $mod+Ctrl+6 workspace 36
-bindsym --to-code --no-warn $mod+Ctrl+7 workspace 37
-bindsym --to-code --no-warn $mod+Ctrl+8 workspace 38
-bindsym --to-code --no-warn $mod+Ctrl+9 workspace 39
-
-
 # does not work, 
 # bindsym --to-code --no-warn $mod+Shift_R+1 workspace 21
 # bindsym --to-code --no-warn $mod+Shift_R+2 workspace 22
@@ -295,22 +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_pc "alsa_output.pci-0000_29_00.0.analog-stereo"
-set $sink_tv "alsa_output.pci-0000_2f_00.1.hdmi-stereo-extra3"
-set $sink_combined "combined_output"
-
 # special keys to adjust volume via pulseaudio
-bindsym --to-code --locked XF86AudioMute exec pactl set-sink-mute $sink_pc 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 XF86AudioLowerVolume exec pactl set-sink-volume $sink_pc -5%
+bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
-bindsym --to-code --locked XF86AudioRaiseVolume exec pactl set-sink-volume $sink_pc +5%
+bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
-
-bindsym --to-code --locked $mod+XF86AudioLowerVolume exec pactl set-sink-volume $sink_tv -2.5%
-bindsym --to-code --locked $mod+XF86AudioRaiseVolume exec pactl set-sink-volume $sink_tv +2.5%
-
-bindsym --to-code --locked $mod+XF86AudioMute exec pactl set-sink-mute $sink_tv toggle
-
-bindsym --to-code --locked XF86AudioMicMute exec pactl set-source-mute $sink_pc 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

.config/transmission-daemon/settings.json

@@ -36,21 +36,14 @@
     "peer-port-random-on-start": false,
     "peer-socket-tos": "le",
     "pex-enabled": true,
-    "pidfile": "",
     "port-forwarding-enabled": true,
     "preallocation": 1,
-    "preferred_transports": [
-        "utp",
-        "tcp"
-    ],
     "prefetch-enabled": true,
-    "proxy_url": null,
     "queue-stalled-enabled": true,
     "queue-stalled-minutes": 30,
-    "ratio-limit": 2.0,
+    "ratio-limit": 2,
     "ratio-limit-enabled": false,
     "rename-partial-files": false,
-    "reqq": 2000,
     "rpc-authentication-required": false,
     "rpc-bind-address": "0.0.0.0",
     "rpc-enabled": true,
@@ -72,22 +65,15 @@
     "script-torrent-done-seeding-filename": "",
     "seed-queue-enabled": false,
     "seed-queue-size": 10,
-    "sequential_download": false,
-    "sleep-per-seconds-during-verify": 100,
     "speed-limit-down": 100,
     "speed-limit-down-enabled": false,
     "speed-limit-up": 100,
     "speed-limit-up-enabled": false,
     "start-added-torrents": true,
-    "start_paused": false,
     "tcp-enabled": true,
     "torrent-added-verify-mode": "fast",
-    "torrent_complete_verify_enabled": false,
     "trash-original-torrent-files": false,
     "umask": "022",
     "upload-slots-per-torrent": 8,
-    "utp-enabled": true,
+    "utp-enabled": true
-    "watch-dir": "",
-    "watch-dir-enabled": false,
-    "watch-dir-force-generic": false
 }

.zprofile

@@ -7,9 +7,13 @@ 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"
 
-export BEMENU_SCALE='1.1'
+# >>> coursier install directory >>>
-export BEMENU_OPTS='--tf #7bc6e2 --hf #7bc6e2 --fn "Input Mono" 12 --hp 8 --ignorecase --single-instance --wrap'
+export PATH="$PATH:/Users/nikitabykov/Library/Application Support/Coursier/bin"
+# <<< coursier install directory <<<
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 if command -v dbus-update-activation-environment >/dev/null; then
   dbus-update-activation-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE

.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'