From 4fdc7a368af4fd61ab2a7b262a26bad1e1c6878a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 23 Jan 2025 12:26:16 -0500 Subject: [PATCH] Wayland is working on KDE!!! --- flake.lock | 36 +++++++++++++++--------------- modules/nixos/desktop/kde.nix | 6 ++--- modules/nixos/desktop/packages.nix | 1 - modules/nixos/desktop/wayland.nix | 10 ++++----- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 580463a..81f39d7 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737085478, - "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", + "lastModified": 1737517085, + "narHash": "sha256-A5w6+0Zc7b93nbCF6ayHbXIEO0+h+8BR4byYGgTy+tY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", + "rev": "ddf7173ae92b4992c4506b6df4681c0687cc29c3", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1737162735, - "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1737176185, - "narHash": "sha256-TFqr2LJ6gVWAhuIXbN5T2s+hHCQlgVpJY3VPV6XKiDk=", + "lastModified": 1737360510, + "narHash": "sha256-uiTiklpgmxZ7BJlQOvqULU9oCOkk9glmSDGSIkerPcc=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "3d104e57bd1e6374830ee55d377e15d835d84963", + "rev": "cfc19b6d0a0940e600b995827366092405f2bf73", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -198,11 +198,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737404927, + "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", "type": "github" }, "original": { diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index 4fc3c26..b8170c6 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -19,14 +19,14 @@ in gwenview # image viewer ]; xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-kde - pkgs.kdePackages.kwallet + pkgs.kdePackages.xdg-desktop-portal-kde + # pkgs.kdePackages.kwallet ]; environment.systemPackages = with pkgs; [ kdePackages.plasma-browser-integration kdePackages.xdg-desktop-portal-kde konsave # save configs - kdePackages.kwayland + # kdePackages.kwayland ]; services.desktopManager.plasma6.notoPackage = pkgs.fira-code; }; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 83ef353..ed1f3b0 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -15,7 +15,6 @@ in gcc rofimoji # emoji picker feh # image viewer - xdg-desktop-portal # copy to clipboard wl-clipboard-x11 diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 920a5aa..c25d271 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -17,11 +17,11 @@ in xdg.portal = { enable = true; xdgOpenUsePortal = true; - extraPortals = with pkgs;[ - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - xdg-desktop-portal - ]; + # extraPortals = with pkgs;[ + # xdg-desktop-portal-gtk + # xdg-desktop-portal-wlr + # xdg-desktop-portal + # ]; }; }; }