diff --git a/common/sway.nix b/common/sway.nix index 903f35d..5687423 100644 --- a/common/sway.nix +++ b/common/sway.nix @@ -87,6 +87,8 @@ done export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export _JAVA_AWT_WM_NONREPARENTING=1 export MOZ_ENABLE_WAYLAND=1 +# export WLR_RENDERER=vulkan +# export DRI_PRIME=1 # export MESA_LOADER_DRIVER_OVERRIDE="zink" ''; }; diff --git a/flake.lock b/flake.lock index f7177a4..e41cb0c 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1712410564, - "narHash": "sha256-SaieRX6F81W84WA973bA8NGAybjomH01y79FLLj5l6c=", + "lastModified": 1712743609, + "narHash": "sha256-sbp5oZgxQGNegFqUGtsSvFyb2oZ86G/cCjwY137MnlU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "658cc876186c56526ebacaa5954e3c88fb7e3577", + "rev": "ec3a7e608929f4570a5152c1226f54275452b731", "type": "github" }, "original": { @@ -331,11 +331,11 @@ ] }, "locked": { - "lastModified": 1712296875, - "narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", + "lastModified": 1712521891, + "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", + "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712361380, - "narHash": "sha256-1cEiFtUvjBlp4J4kCvlsEobrTEsAzRBhRNvG8N1XH9w=", + "lastModified": 1712602331, + "narHash": "sha256-pM6sB2ltcy7jtog/gv1tbpT1ZDTdmrxfXPE9mbp/zO8=", "owner": "martinvonz", "repo": "jj", - "rev": "93cebcd0c0e910b8b7de606982efa8430a94676e", + "rev": "13592ce49eaa245a740c7a8cd0ca8ea622c4fe95", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1712150496, - "narHash": "sha256-24MK9P+3OIBeaVsyy6r/W77/9TVLCQGDF8RVOCkK4Uk=", + "lastModified": 1712600195, + "narHash": "sha256-RvmOMmJjPc6if0kVLPXWyWIddzLG1yUPkL6PDrEvTrM=", "owner": "YaLTeR", "repo": "niri", - "rev": "8be938197486acb2af4ba91aae0fac57619a46c8", + "rev": "e448cfb0efee0efbfc769662ee77ad22a347dc02", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { diff --git a/sway/bar/config b/sway/bar/config index a6218d6..c5daaa2 100644 --- a/sway/bar/config +++ b/sway/bar/config @@ -6,7 +6,7 @@ "spacing": 4, // Gaps between modules (4px) // Choose the order of the modules "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], - "modules-center": [], // "sway/window"], + "modules-center": ["wlr/taskbar"], // "sway/window"], "modules-right": ["custom/media", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "battery", "clock", "tray"], "keyboard-state": { "numlock": true, @@ -17,6 +17,22 @@ "unlocked": "" } }, + "wlr/taskbar": { + "format": "{icon}", + "icon-size": 14, + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "ignore-list": [ + ], + "app_ids-mapping": { + "firefoxdeveloperedition": "firefox-developer-edition", + "firefox.*": "Firefox" + }, + "rewrite": { + "Firefox Web Browser": "Firefox" + } + }, "sway/mode": { "format": "{}" }, diff --git a/sway/sway-conf.nix b/sway/sway-conf.nix index 071cd44..02f5008 100644 --- a/sway/sway-conf.nix +++ b/sway/sway-conf.nix @@ -7,6 +7,7 @@ brightnessctl wl-clipboard swaymux + dunst ]; grimmShared.sway = {