From a550ff143fcc40e15a91f0e802894e92d4d5a88e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sun, 1 Oct 2023 11:09:33 +0200
Subject: [PATCH] feat(graphical-fullblown): add some and and use vanilla pkgs
 for signal and session

---
 .../configuration/graphical-fullblown.nix     | 83 ++++++++++---------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index d30e7a7..1de7f72 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -24,7 +24,9 @@ in {
     # ../profiles/experimental-desktop.nix
 
     ../programs/redshift.nix
+
     ../programs/gpg-agent.nix
+    ../programs/pass.nix
 
     # ../programs/espanso.nix
 
@@ -33,7 +35,6 @@ in {
 
     ../programs/libreoffice.nix
     ../programs/neovim.nix
-    ../programs/pass.nix
     ../programs/vscode
 
     # TODO: bump these to 23.05 and make it work
@@ -62,6 +63,7 @@ in {
       nix-index
       nix-prefetch-scripts
       # nix-prefetch-github
+      nix-tree
 
       # Version Control Systems
       gitFull
@@ -114,46 +116,48 @@ in {
       # FIXME: depends on insecure openssl 1.1.1t
       # kotatogram-desktop
       tdesktop
-      (let
-        version = "6.20.0-beta.1";
-      in
-        pkgsUnstableSmall.signal-desktop-beta.overrideAttrs (old: {
-          inherit version;
-          src = builtins.fetchurl {
-            url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-            sha256 = "0xkagnldagfxnpv4c23yd9w0kz1y719m1sj9vqn8mnr1zfn7j62a";
-          };
-          preFixup =
-            old.preFixup
-            + ''
-              gappsWrapperArgs+=(
-                --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
-                --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform}}"
-              )
-            '';
-        }))
+      pkgsUnstableSmall.signal-desktop-beta
+      #(let
+      #  version = "6.20.0-beta.1";
+      #in
+      #  pkgsUnstableSmall.signal-desktop-beta.overrideAttrs (old: {
+      #    # inherit version;
+      #    # src = builtins.fetchurl {
+      #    #   url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
+      #    #   sha256 = "0xkagnldagfxnpv4c23yd9w0kz1y719m1sj9vqn8mnr1zfn7j62a";
+      #    # };
+      #    preFixup =
+      #      old.preFixup
+      #      + ''
+      #        gappsWrapperArgs+=(
+      #          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
+      #          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform}}"
+      #        )
+      #      '';
+      #  }))
 
+      pkgsUnstableSmall.session-desktop
       # --add-flags "--enable-features=UseOzonePlatform"
       # --add-flags "--ozone-platform=wayland"
-      (pkgsUnstableSmall.session-desktop.overrideAttrs (old: {
-        nativeBuildInputs =
-          old.nativeBuildInputs
-          ++ [
-            pkgs.wrapGAppsHook
-          ];
+      # (pkgsUnstableSmall.session-desktop.overrideAttrs (old: {
+      #   nativeBuildInputs =
+      #     old.nativeBuildInputs
+      #     ++ [
+      #       pkgs.wrapGAppsHook
+      #     ];
 
-        preFixup =
-          (old.preFixup or "")
-          + ''
-            gappsWrapperArgs+=(
-              --add-flags "--enable-features=UseOzonePlatform"
-              --add-flags "--ozone-platform=wayland"
-              # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
-              # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations}}"
-              # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform}}"
-            )
-          '';
-      }))
+      #   preFixup =
+      #     (old.preFixup or "")
+      #     + ''
+      #       gappsWrapperArgs+=(
+      #         --add-flags "--enable-features=UseOzonePlatform"
+      #         --add-flags "--ozone-platform=wayland"
+      #         # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
+      #         # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations}}"
+      #         # --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform}}"
+      #       )
+      #     '';
+      # }))
 
       #(pkgsUnstableSmall.session-desktop.overrideAttrs(old: {
       #    nativeBuildInputs = old.nativeBuildInputs ++ [
@@ -206,9 +210,12 @@ in {
       wireshark
       wireguard-tools
 
-      # Code Editors
+      # Code Editing and Programming
       xclip
       xsel
+      pkgsUnstableSmall.lapce
+      pkgsUnstableSmall.helix
+      pkgsUnstableSmall.nil
 
       # Image/Graphic/Design Tools
       gnome.eog