.

27 files changed, 209 insertions, 133 deletions

diff --git a/claws/claws-mail b/claws/claws-mail
index da73064..27fcf12 100755
--- a/claws/claws-mail
+++ b/claws/claws-mail
@@ -1,15 +1,15 @@
 #!/bin/sh
 
-sed -i \
-    "s/^mainwin_maximised=.*$/mainwin_maximised=0/g" \
-    "s/^main_messagewin_x=.*$/main_messagewin_x=256/g" \
-    "s/^main_messagewin_y=.*$/main_messagewin_y=210/g" \
-    "s/^messageview_width=.*$/messageview_width=971/g" \
-    "s/^messageview_height=.*$/messageview_height=513/g" \
-    "s/^mainview_width=.*$/mainview_width=971/g" \
-    "s/^mainview_height=.*$/mainview_height=909/g" \
-    "s/^mainwin_width=.*$/mainwin_width=1291/g" \
-    "s/^mainwin_height=.*$/mainwin_height=909/g" \
-    ~/.claws-mail/clawsrc
+# sed -i \
+#     "s/^mainwin_maximised=.*$/mainwin_maximised=0/g" \
+#     "s/^main_messagewin_x=.*$/main_messagewin_x=256/g" \
+#     "s/^main_messagewin_y=.*$/main_messagewin_y=210/g" \
+#     "s/^messageview_width=.*$/messageview_width=971/g" \
+#     "s/^messageview_height=.*$/messageview_height=513/g" \
+#     "s/^mainview_width=.*$/mainview_width=971/g" \
+#     "s/^mainview_height=.*$/mainview_height=909/g" \
+#     "s/^mainwin_width=.*$/mainwin_width=1291/g" \
+#     "s/^mainwin_height=.*$/mainwin_height=909/g" \
+#     ~/.claws-mail/clawsrc
 
 exec /usr/bin/claws-mail "$@"
diff --git a/drawio/drawio b/drawio/drawio
index fab29b2..ac15fd6 100755
--- a/drawio/drawio
+++ b/drawio/drawio
@@ -10,4 +10,5 @@ else
     args=""
 fi
 
-exec ~/.local/opt/drawio.AppImage $args "$@"
+# exec ~/.local/opt/drawio.AppImage $args "$@"
+exec /usr/bin/drawio $args "$@"
diff --git a/gdb/.gdbinit b/gdb/.gdbinit
new file mode 100644
index 0000000..61d3aa1
--- /dev/null
+++ b/gdb/.gdbinit
@@ -0,0 +1,2 @@
+set debuginfod enabled off
+set listsize 20
diff --git a/install.sh b/install.sh
index 54f878f..f6c5be0 100755
--- a/install.sh
+++ b/install.sh
@@ -33,12 +33,6 @@ mkdir -p $CONFIG_DIR/aerc
 symlink $DOTFILES_DIR/aerc/aerc.conf $CONFIG_DIR/aerc/aerc.conf
 symlink $DOTFILES_DIR/aerc/binds.conf $CONFIG_DIR/aerc/binds.conf
 
-# alacritty
-symlink $DOTFILES_DIR/alacritty $CONFIG_DIR/alacritty
-
-# bspwm
-symlink $DOTFILES_DIR/bspwm $CONFIG_DIR/bspwm
-
 # chromium
 if [ -f /usr/share/applications/chromium.desktop ]; then
     symlink $DOTFILES_DIR/chromium/chromium $BIN_DIR/chromium
@@ -47,9 +41,6 @@ if [ -f /usr/share/applications/chromium.desktop ]; then
         $APP_DIR/chromium.desktop
 fi
 
-# claws
-symlink $DOTFILES_DIR/claws/claws-mail $BIN_DIR/claws-mail
-
 # cudatext
 mkdir -p $CONFIG_DIR/cudatext/settings
 symlink $DOTFILES_DIR/cudatext/user.json $CONFIG_DIR/cudatext/settings/user.json
@@ -71,12 +62,12 @@ symlink $DOTFILES_DIR/fontconfig $CONFIG_DIR/fontconfig
 # foot
 symlink $DOTFILES_DIR/foot $CONFIG_DIR/foot
 
+# gdb
+symlink $DOTFILES_DIR/gdb/.gdbinit $HOME/.gdbinit
+
 # git
 symlink $DOTFILES_DIR/git/.gitconfig $HOME/.gitconfig
 
-# i3
-symlink $DOTFILES_DIR/i3 $CONFIG_DIR/i3
-
 # idasen
 symlink $DOTFILES_DIR/idasen $CONFIG_DIR/idasen
 
@@ -101,6 +92,9 @@ symlink $DOTFILES_DIR/lock/lock.desktop $APP_DIR/lock.desktop
 # neomutt
 symlink $DOTFILES_DIR/neomutt $CONFIG_DIR/neomutt
 
+# neovide
+symlink $DOTFILES_DIR/neovide $CONFIG_DIR/neovide
+
 # numen
 symlink $DOTFILES_DIR/numen $CONFIG_DIR/numen
 
@@ -147,6 +141,10 @@ symlink $DOTFILES_DIR/shell/fish $CONFIG_DIR/fish
 symlink $DOTFILES_DIR/shell/zsh/.zshrc $HOME/.zshrc
 symlink $HOME/.profile $HOME/.zprofile
 
+# sublime-music
+symlink $OPT_DIR/venvs/python312/bin/sublime-music $BIN_DIR/sublime-music
+symlink $DOTFILES_DIR/sublime-music/sublime-music.desktop $APP_DIR/sublime-music.desktop
+
 # sublime-text
 mkdir -p $CONFIG_DIR/sublime-text/Packages/User
 for i in Adaptive.sublime-theme \
diff --git a/kanshi/config b/kanshi/config
index 9750a16..3876217 100644
--- a/kanshi/config
+++ b/kanshi/config
@@ -12,14 +12,14 @@ profile dual {
 
 profile work {
     output eDP-1
-    output 'Dell Inc. DELL U2722DE HFMKDH3'  # DP-5
-    output 'Dell Inc. DELL U2722D 3ZS8XN3'   # DP-6
+    output 'Dell Inc. DELL U2722DE HFMKDH3'
+    output 'Dell Inc. DELL U2722D 3ZS8XN3'
     exec ~/.config/kanshi/work.sh
 }
 
 profile home_tv {
     output eDP-1
-    output 'AOC Q2770 FSUE7HA007776'          # DP-6
-    output 'LG Electronics LG TV 0x00000101'  # DP-5
+    output 'AOC Q2770 FSUE7HA007776'
+    output 'LG Electronics LG TV 0x01010101'
     exec ~/.config/kanshi/home_tv.sh
 }
diff --git a/kanshi/dual.sh b/kanshi/dual.sh
index 3e9ee3e..b9c08cf 100755
--- a/kanshi/dual.sh
+++ b/kanshi/dual.sh
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-display1=eDP-1
-display2=$(swaymsg -t get_outputs -r |
-           jq "map(select(.name != \"$display1\") | .name)[0]" 2> /dev/null |
-           tr -d "\"")
+. $(dirname "$(realpath "$0")")/env.sh
+
+secondary=$(display_names ".name != \"$primary\"")
 
 swaymsg -q reload
 
-swaymsg -q output $display1 pos 0 0 \
-                            res 1920x1080 \
-                            bg ~/.pictures/bg1.jpg stretch
-swaymsg -q output $display2 pos 1920 0 \
-                            bg ~/.pictures/bg2.jpg stretch
+swaymsg -q output $primary pos 0 0 \
+                           res $primary_res \
+                           bg $bg1 stretch
+swaymsg -q output $secondary pos $primary_width 0 \
+                             bg $bg2 stretch
 
 for workspace in 1:1 2:2 3:3 4:4; do
-    swaymsg -q workspace $workspace output $display1
+    swaymsg -q workspace $workspace output $primary
 done
 
 for workspace in 5:a 6:s 7:d 8:f; do
-    swaymsg -q workspace $workspace output $display2
+    swaymsg -q workspace $workspace output $secondary
 done
diff --git a/kanshi/env.sh b/kanshi/env.sh
new file mode 100644
index 0000000..c7ddd5d
--- /dev/null
+++ b/kanshi/env.sh
@@ -0,0 +1,26 @@
+: ${HOME:?}
+
+primary=eDP-1
+
+primary_width=1920
+primary_height=1080
+primary_res=${primary_width}x${primary_height}
+
+bg1=$HOME/.pictures/bg1.jpg
+bg2=$HOME/.pictures/bg2.jpg
+
+
+display_names() {
+    wlr-randr --json | \
+        jq -r "map(select($1)) | .[] | .name" 2>/dev/null
+}
+
+display_widths() {
+    wlr-randr --json | \
+        jq -r "map(select($1)) | .[] | .modes | map(select(.current)) | .[] | .width" 2>/dev/null
+}
+
+display_heights() {
+    wlr-randr --json | \
+        jq -r "map(select($1)) | .[] | .modes | map(select(.current)) | .[] | .height" 2>/dev/null
+}
diff --git a/kanshi/home_tv.sh b/kanshi/home_tv.sh
index 5cb1392..f54128b 100755
--- a/kanshi/home_tv.sh
+++ b/kanshi/home_tv.sh
@@ -1,33 +1,30 @@
 #!/bin/sh
 
-display1=eDP-1
-display3=$(swaymsg -t get_outputs -r |
-           jq -r '.[] | select(.model == "LG TV") | .name')
-display2=$(swaymsg -t get_outputs -r |
-           jq -r ".[] | .name | select(. != \"$display1\" and . != \"$display3\")")
+. $(dirname "$(realpath "$0")")/env.sh
 
-swaymsg -q reload
+tv=$(display_names '.model == "LG TV"')
+secondary=$(display_names ".name != \"$primary\" and .name != \"$tv\"")
+secondary_width=$(display_widths ".name == \"$secondary\"")
 
-swaymsg -q output $display1 pos 0 0 \
-                            res 1920x1080 \
-                            bg ~/.pictures/bg1.jpg stretch
-swaymsg -q output $display2 pos 1920 0 \
-                            bg ~/.pictures/bg2.jpg stretch
+swaymsg -q reload
 
-display2_width=$(swaymsg -t get_outputs -r |
-                 jq -r ".[] | select(.name == \"$display2\") | .current_mode.width")
+swaymsg -q output $primary pos 0 0 \
+                           res $primary_res \
+                           bg $bg1 stretch
+swaymsg -q output $secondary pos $primary_width 0 \
+                             bg $bg2 stretch
 
-swaymsg -q output $display3 pos $((1920 + $display2_width)) 0 \
-                            bg ~/.pictures/bg1.jpg stretch
+swaymsg -q output $tv pos $(($primary_width + $secondary_width)) 0 \
+                      bg $bg1 stretch
 
-for workspace in 1:1 3:3 4:4; do
-    swaymsg -q workspace $workspace output $display1
+for workspace in 1:1 2:2 3:3; do
+    swaymsg -q workspace $workspace output $primary
 done
 
 for workspace in 5:a 6:s 7:d 8:f; do
-    swaymsg -q workspace $workspace output $display2
+    swaymsg -q workspace $workspace output $secondary
 done
 
-for workspace in 2:2; do
-    swaymsg -q workspace $workspace output $display3
+for workspace in 4:4; do
+    swaymsg -q workspace $workspace output $tv
 done
diff --git a/kanshi/single.sh b/kanshi/single.sh
index f126662..5a335af 100755
--- a/kanshi/single.sh
+++ b/kanshi/single.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-display=eDP-1
+. $(dirname "$(realpath "$0")")/env.sh
 
 swaymsg -q reload
 
-swaymsg -q output $display pos 0 0 \
-                           res 1920x1080 \
-                           bg ~/.pictures/bg1.jpg stretch
+swaymsg -q output $primary pos 0 0 \
+                           res $primary_res \
+                           bg $bg1 stretch
 
 for workspace in 1:1 2:2 3:3 4:4 5:a 6:s 7:d 8:f; do
-    swaymsg -q workspace $workspace output $display
+    swaymsg -q workspace $workspace output $primary
 done
diff --git a/kanshi/work.sh b/kanshi/work.sh
index b03bca2..efc86f8 100755
--- a/kanshi/work.sh
+++ b/kanshi/work.sh
@@ -1,27 +1,32 @@
 #!/bin/sh
 
-display1=eDP-1
-display2=DP-5
-display3=DP-6
+. $(dirname "$(realpath "$0")")/env.sh
+
+display_width=2560
+display_height=1440
+display_res=${display_width}x${display_height}
+
+display1=$(display_names '.model == "DELL U2722DE"')
+display2=$(display_names '.model == "DELL U2722D"')
 
 swaymsg reload
 
-swaymsg -q output $display1 pos 0 1440 \
-                            res 1920x1080 \
-                            bg ~/.pictures/bg1.jpg stretch
-swaymsg -q output $display2 pos 0 0 \
-                            res 2560x1440 \
-                            bg ~/.pictures/bg1.jpg stretch
-swaymsg -q output $display3 pos 2560 0 \
-                            res 2560x1440 \
-                            bg ~/.pictures/bg2.jpg stretch
+swaymsg -q output $primary pos 0 1440 \
+                            res $primary_res \
+                            bg $bg1 stretch
+swaymsg -q output $display1 pos 0 0 \
+                            res $display_res \
+                            bg $bg1 stretch
+swaymsg -q output $display2 pos $display_width 0 \
+                            res $display_res \
+                            bg $bg2 stretch
 
-swaymsg -q workspace 1:1 output $display1
+swaymsg -q workspace 1:1 output $primary
 
 for workspace in 2:2 3:3 4:4; do
-    swaymsg -q workspace $workspace output $display2
+    swaymsg -q workspace $workspace output $display1
 done
 
 for workspace in 5:a 6:s 7:d 8:f; do
-    swaymsg -q workspace $workspace output $display3
+    swaymsg -q workspace $workspace output $display2
 done
diff --git a/lite-xl/init.lua b/lite-xl/init.lua
index d077fef..5bcbd1e 100644
--- a/lite-xl/init.lua
+++ b/lite-xl/init.lua
@@ -7,21 +7,29 @@ config.ignore_files = {
   "^%.git/"
 }
 
-
-
-
+config.indent_size = 4
 
 
 
 local fontconfig = require "plugins.fontconfig"
 fontconfig.use {
-    font = { name = 'sans-serif', size = 12 * SCALE },
-    code_font = { name = 'monospace', size = 12 * SCALE },
+    font = { name = 'sans-serif', size = 14 * SCALE },
+    code_font = { name = 'monospace', size = 14 * SCALE },
+}
+
+
+config.plugins.nerdicons = {
+  use_default_dir_icons = true
 }
 
+config.plugins.spellcheck = {
+  enabled = false
+}
 
-config.plugins.nerdicons.use_default_dir_icons = true
-config.plugins.spellcheck.enabled = false
+config.plugins.lineguide = {
+  enabled = true,
+  rulers = { 80 }
+}
 
 ------------------------------ Themes ----------------------------------------
 
diff --git a/lock/lock b/lock/lock
index f7b20cb..d2aa1ae 100755
--- a/lock/lock
+++ b/lock/lock
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
-    swaylock -i ~/.pictures/lock.png
+    exec swaylock -i ~/.pictures/lock.png
 else
-    i3lock -t -i ~/.pictures/lock.png
+    exec i3lock -t -i ~/.pictures/lock.png
 fi
diff --git a/neovide/config.toml b/neovide/config.toml
new file mode 100644
index 0000000..fa3fc29
--- /dev/null
+++ b/neovide/config.toml
@@ -0,0 +1,3 @@
+[font]
+normal = {family = "monospace", style = "W300"}
+size = 16
diff --git a/nvim/init.lua b/nvim/init.lua
index 9e9ebae..80432c7 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -110,7 +110,7 @@ vim.api.nvim_create_autocmd({"BufWritePost"}, {
 
 -- gui settings
 vim.o.linespace = 4
-vim.o.guifont = "monospace:h12"
+-- vim.o.guifont = "monospace:h12"
 
 -- neovide settings
 if vim.g.neovide then
@@ -229,13 +229,18 @@ require('packer').startup {
                 require('lualine').setup()
             end
         }
-
+        
         use {
-            'thaerkh/vim-indentguides',
+            "lukas-reineke/indent-blankline.nvim",
             config = function()
-                vim.g.indent_guides_enable_on_vim_startup = 1
-                vim.g.indent_guides_start_level = 2
-                vim.g.indent_guides_guide_size = 1
+                require("ibl").setup {
+                    indent = {
+                        char = '┊'
+                    },
+                    scope = {
+                        enabled = false
+                    }
+                }
             end
         }
 
@@ -267,6 +272,26 @@ require('packer').startup {
                 vim.keymap.set('', '<leader>fr', telescope.extensions.repo.list)
             end
         }
+        
+        use {
+            "folke/which-key.nvim",
+            config = function()
+                vim.o.timeout = true
+                vim.o.timeoutlen = 500
+                require("which-key").setup {
+                }
+            end
+        }
+
+        use {
+            'mrjones2014/legendary.nvim',
+            requires = { "stevearc/dressing.nvim" },
+            config = function()
+                vim.keymap.set('', '<F9>', vim.cmd.Legendary)
+                require('legendary').setup {
+                }
+            end
+        }
 
         use {
             'mbbill/undotree',
diff --git a/river/init b/river/init
index 8fb3a70..78e1498 100755
--- a/river/init
+++ b/river/init
@@ -11,7 +11,7 @@ mod=Mod4
 riverctl map-pointer normal $mod BTN_LEFT move-view
 riverctl map-pointer normal $mod BTN_RIGHT resize-view
 
-riverctl map normal $mod Return spawn alacritty
+riverctl map normal $mod Return spawn foot
 riverctl map normal $mod Space spawn ~/.dotfiles/wofi/run.sh
 
 riverctl map normal $mod+Shift E exit
@@ -65,6 +65,7 @@ if command -v systemctl > /dev/null; then
 
     systemctl --user restart xdg-desktop-portal
     systemctl --user restart xdg-desktop-portal-wlr
+    systemctl --user restart xdg-desktop-portal-gtk
     systemctl --user restart plasma-kactivitymanagerd
 fi
 
diff --git a/setkbmap/setkbmap b/setkbmap/setkbmap
index d1019b1..c2a5523 100755
--- a/setkbmap/setkbmap
+++ b/setkbmap/setkbmap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -n "$SWAYSOCK" ]; then
-    swaymsg input '*' xkb_layout "$@"
+    exec swaymsg input '*' xkb_layout "$@"
 else
-    setxkbmap "$@"
+    exec setxkbmap "$@"
 fi
diff --git a/shell/.profile b/shell/.profile
index cee7311..5872256 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -23,7 +23,7 @@ append_lua_path() {
 [ -z "$SSH_AUTH_SOCK" ] && \
     export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
 
-# export CHICKEN_REPOSITORY=~/programs/chicken_repository
+# export CHICKEN_INSTALL_REPOSITORY=~/.local/opt/chicken
 # export GDK_BACKEND=wayland
 # export QT_AUTO_SCREEN_SCALE_FACTOR=1
 # export QT_ENABLE_HIGHDPI_SCALING=1
@@ -39,6 +39,9 @@ export VISUAL=nvim
 
 prepend_path ~/.local/opt/river/bin
 prepend_path ~/.local/opt/janet/bin
+prepend_path ~/.local/opt/chibi/bin
+prepend_path ~/.local/opt/gambit/bin
+prepend_path ~/.local/opt/chicken/bin
 prepend_path ~/.local/opt/nnn/bin
 prepend_path ~/.local/bin
 export PATH
diff --git a/sublime-music/sublime-music.desktop b/sublime-music/sublime-music.desktop
new file mode 100644
index 0000000..ad64bae
--- /dev/null
+++ b/sublime-music/sublime-music.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=Sublime music
+Exec=sublime-music
+Categories=Audio;
diff --git a/sublime-text/LSP.sublime-settings b/sublime-text/LSP.sublime-settings
index b5cece1..b324c32 100644
--- a/sublime-text/LSP.sublime-settings
+++ b/sublime-text/LSP.sublime-settings
@@ -1,5 +1,6 @@
 {
     "show_diagnostics_panel_on_save": 0,
+    "show_inlay_hints": false,
 	"clients": {
 		"jedi": {
             "command": ["jedi-language-server"],
diff --git a/sublime-text/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings
index fa63a77..3fef856 100644
--- a/sublime-text/Package Control.sublime-settings
+++ b/sublime-text/Package Control.sublime-settings
@@ -2,27 +2,29 @@
 	"bootstrapped": true,
 	"in_process_packages":
 	[
-	],
+    ],
 	"installed_packages":
 	[
-		"A File Icon",
-		"AutoWrap",
-		"Compare Side-By-Side",
-		"Git",
-		"Janet",
-		"LSP",
-		"MagicPython",
-		"Material Theme",
-		"Origami",
-		"Package Control",
-		"PackageResourceViewer",
-		"Sass",
-		"SideBarEnhancements",
-		"SublimeLinter",
-		"SublimeLinter-contrib-sass-lint",
-		"SublimeLinter-eslint",
-		"SublimeLinter-flake8",
-		"Zeal",
-		"Zig Language",
-	],
+        "A File Icon",
+        "AutoWrap",
+        "Compare Side-By-Side",
+        "Git",
+        "Janet",
+        "LSP",
+        "Material Theme",
+        "Origami",
+        "Package Control",
+        "PackageResourceViewer",
+        "Python 3",
+        "Sass",
+        "Scheme",
+        "SideBarEnhancements",
+        "SublimeLinter",
+        "SublimeLinter-contrib-sass-lint",
+        "SublimeLinter-eslint",
+        "SublimeLinter-flake8",
+        "TreeSitter",
+        "Zeal",
+            "Zig Language",
+    ],
 }
diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings
index c93ef51..2015f7b 100644
--- a/sublime-text/Preferences.sublime-settings
+++ b/sublime-text/Preferences.sublime-settings
@@ -49,13 +49,7 @@
 	"highlight_modified_tabs": true,
 	"ignored_packages":
 	[
-		"AutoWrap",
-		"Compare Side-By-Side",
-		"Material Theme",
-		"Package Control",
-		"PackageResourceViewer",
-		"Python",
-		"SublimeLinter-eslint",
+		"Sass",
 		"Vintage",
 	],
 	"line_padding_bottom": 1,
@@ -75,5 +69,5 @@
 	"update_check": false,
     "sublime_merge_path": null,
     "show_panel_on_build": false,
-	"index_files": true,
+	"index_files": false,
 }
diff --git a/sublime-text/Python.sublime-settings b/sublime-text/Python.sublime-settings
index c9fb4e6..5fe69f3 100644
--- a/sublime-text/Python.sublime-settings
+++ b/sublime-text/Python.sublime-settings
@@ -1,5 +1,5 @@
 {
 	"extensions":
 	[
-	]
+	],
 }
diff --git a/sway/config b/sway/config
index 4cf9201..61ad468 100644
--- a/sway/config
+++ b/sway/config
@@ -15,7 +15,7 @@ assign [app_id="^tmux_term$"] 9:term
 exec ~/.config/sway/init.sh
 
 bindsym {
-    $mod+Return exec alacritty
+    $mod+Return exec foot
     $mod+space exec ~/.dotfiles/wofi/run.sh
     $mod+Tab layout toggle
 
diff --git a/sway/init.sh b/sway/init.sh
index d0c5e49..b478aaa 100755
--- a/sway/init.sh
+++ b/sway/init.sh
@@ -21,6 +21,7 @@ if command -v systemctl > /dev/null; then
 
     systemctl --user restart xdg-desktop-portal
     systemctl --user restart xdg-desktop-portal-wlr
+    systemctl --user restart xdg-desktop-portal-gtk
     systemctl --user restart plasma-kactivitymanagerd
 else
     dbus-update-activation-environment WAYLAND_DISPLAY \
diff --git a/sway/run-sway.sh b/sway/run-sway.sh
index ed0c0d7..763d83f 100755
--- a/sway/run-sway.sh
+++ b/sway/run-sway.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
+exec > ~/.sway.log 2>&1
 
 if ( ( command -v systemctl && systemctl --user is-system-running ) ||
      pgrep -U $(id -u) dbus-daemon ) > /dev/null; then
-    exec sway > ~/.sway.log 2>&1
+    exec sway
 else
-    exec dbus-run-session -- sway > ~/.sway.log 2>&1
+    exec dbus-run-session -- sway
 fi
diff --git a/waybar/river.conf b/waybar/river.conf
index 92530f7..7e6ff01 100644
--- a/waybar/river.conf
+++ b/waybar/river.conf
@@ -21,7 +21,9 @@
         "format-muted": "&#xf075f; mute",
         "scroll-step": 5,
         "on-click": "pavucontrol",
-        "on-click-right": "pulsemixer --toggle-mute"
+        "on-click-right": "pulsemixer --toggle-mute",
+        "ignored-sinks": ["Built-in Audio Digital Stereo (HDMI)",
+                          "Built-in Audio Digital Stereo (HDMI 2)"]
     },
 
     "battery": {
diff --git a/waybar/sway.conf b/waybar/sway.conf
index 11b4daa..d117f96 100644
--- a/waybar/sway.conf
+++ b/waybar/sway.conf
@@ -20,7 +20,9 @@
         "format-muted": "&#xf075f; mute",
         "scroll-step": 5,
         "on-click": "pavucontrol",
-        "on-click-right": "pulsemixer --toggle-mute"
+        "on-click-right": "pulsemixer --toggle-mute",
+        "ignored-sinks": ["Built-in Audio Digital Stereo (HDMI)",
+                          "Built-in Audio Digital Stereo (HDMI 2)"]
     },
 
     "battery": {