From b42b7b2755311992534e644269857dee12409bb5 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 21 Jan 2025 22:16:20 +0100 Subject: [PATCH 1/3] Make vesktop run in wayland mode --- overlay.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/overlay.nix b/overlay.nix index a3d5f70..f2a3322 100644 --- a/overlay.nix +++ b/overlay.nix @@ -83,6 +83,10 @@ let glib-compile-schemas $out/share/glib-2.0/schemas ''; }); + + vesktop = prev.vesktop.overrideAttrs (attrs: { + postFixup = builtins.replaceStrings [ "NIXOS_OZONE_WL" "--enable-wayland-ime=true" ] [ "WAYLAND_DISPLAY" "--enable-wayland-ime=true --wayland-text-input-version=3" ] attrs.postFixup; + }); }; overlay-libs = final: prev: { @@ -135,6 +139,3 @@ in # Bug fixes ] # we assign the overlay created before to the overlays of nixpkgs. - - - From cf0e90cb5961d9122aaa34fd3060c3fbfdfca6ae Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 21 Jan 2025 23:06:24 +0100 Subject: [PATCH 2/3] Remove GTK_IM_MODULE so it uses wayland --- home/modules/programs/my-niri.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/programs/my-niri.nix b/home/modules/programs/my-niri.nix index 0e4ed22..d8efd36 100644 --- a/home/modules/programs/my-niri.nix +++ b/home/modules/programs/my-niri.nix @@ -96,7 +96,6 @@ in QT_QPA_PLATFORM = "wayland"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_IM_MODULE = "fcitx"; - GTK_IM_MODULE = "fcitx"; # Til text-input is merged # export NIXOS_OZONE_WL=1 # Until text-input is merged DISPLAY = xwayland-display; } // lib.optionalAttrs osConfig.services.desktopManager.plasma6.enable { From 357866e46bf176d30107ad70cb4af600d858947b Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 21 Jan 2025 22:16:28 +0100 Subject: [PATCH 3/3] Update nix-gaming --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 1ff9f9e..f51006d 100644 --- a/flake.lock +++ b/flake.lock @@ -416,11 +416,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1723945279, - "narHash": "sha256-3W+/u3v/e0dTOxht6wW6pL+kr44e8Amb8A1Z3Bx8BUE=", + "lastModified": 1737337163, + "narHash": "sha256-Z9hc25iV+jhH0AlvsrG65KqLEd726/HVvalSiqNQLqA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "bcf8116981cc332c2734d4c82a034f115780853d", + "rev": "e5559b3a91433c21eb64792b78134582b3bd77f2", "type": "github" }, "original": { @@ -1017,14 +1017,14 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-stable": { @@ -1253,16 +1253,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1736549401, - "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", - "owner": "nixos", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1592,11 +1592,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1723697867, - "narHash": "sha256-LTfbJXR8x35oZ8Mo3R0WTVEp9toWpVfzD21xCSr64IM=", + "lastModified": 1737484151, + "narHash": "sha256-pONHsVIyIHbjyv51JQW3Nv9JeuqiVEuINyH+HnN4f8Q=", "ref": "refs/heads/main", - "rev": "c71a45ad53036f4c668bcbe1be7a49f9d3460151", - "revCount": 699, + "rev": "0cac244cc89ee69bf33ad60a3953cfde188ee8a6", + "revCount": 907, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/"