steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(graphical-fullblown): add some and and use vanilla pkgs for signal and session

Browse source
This commit is contained in:
steveej 2023-10-01 11:09:33 +02:00
parent 6fd885ab7b
commit a550ff143f
1 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

83
nix/home-manager/configuration/graphical-fullblown.nix
View file

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