From 644897dfa78eb49601634ee15e70ac8a72df969d Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Mon, 20 Nov 2023 15:30:17 +0100 Subject: [PATCH] feat: use newest paperwm extension for gnome 44 --- modules/desktop/gnome/default.nix | 39 +++++++++++++++++++++++-------- modules/desktop/gnome/home.nix | 1 + 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/modules/desktop/gnome/default.nix b/modules/desktop/gnome/default.nix index ca0268e..02a4aa4 100644 --- a/modules/desktop/gnome/default.nix +++ b/modules/desktop/gnome/default.nix @@ -4,7 +4,33 @@ { config, lib, pkgs, ... }: -{ +let + paperwm = pkgs.stdenv.mkDerivation (finalAttrs: rec { + pname = "gnome-shell-extension-paperwm"; + version = "44.15.1"; + + src = pkgs.fetchFromGitHub { + owner = "paperwm"; + repo = "PaperWM"; + rev = "v${version}"; + hash = "sha256-89tW/3TLx7gvjnQfpfH8fkaxx7duYXRiCi5bkBRm9UU="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/gnome-shell/extensions/paperwm@paperwm.github.com" + cp -r . "$out/share/gnome-shell/extensions/paperwm@paperwm.github.com" + + runHook postInstall + ''; + + passthru.extensionUuid = "paperwm@paperwm.github.com"; + }); +in { programs = { zsh.enable = true; dconf.enable = true; @@ -32,16 +58,9 @@ gnomeExtensions.clipboard-history gnomeExtensions.forge gnomeExtensions.switcher + gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 - (gnomeExtensions.paperwm.overrideAttrs (rec { - version = "44.15.1"; - src = pkgs.fetchFromGitHub { - owner = "paperwm"; - repo = "PaperWM"; - rev = "v${version}"; - hash = "sha256-89tW/3TLx7gvjnQfpfH8fkaxx7duYXRiCi5bkBRm9UU="; - }; - })) + # paperwm ]; gnome.excludePackages = (with pkgs; [ # Gnome ignored packages gnome-tour diff --git a/modules/desktop/gnome/home.nix b/modules/desktop/gnome/home.nix index 9ad33fb..8dc58cc 100644 --- a/modules/desktop/gnome/home.nix +++ b/modules/desktop/gnome/home.nix @@ -30,6 +30,7 @@ "Vitals@CoreCoding.com" "clipboard-history@alexsaveau.dev" "switcher@landau.fi" + "instantworkspaceswitcher@amalantony.net" ]; }; -- 2.48.1