...

1 files changed, 14 insertions, 9 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2cfaa620..842f7538 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -1,4 +1,7 @@
 { flake, flakeInputs, userName, pkgs, customUtils, lib, config, sources, ... }@inputs:
+
+with lib;
+
 let
   cfg = config.home-manager.users.${userName};
   xmonad = import ./xmonad pkgs.haskell.packages.ghc8107;
@@ -29,16 +32,18 @@ let
         --prefix PATH : ${pkgs.pulseaudio}/bin
     '';
   };
-  wrapElectron = { package, bin ? package.meta.mainProgram or package.pname or (pkgs.lib.strings.nameFromURL package.name "-"), outBin ? bin }: pkgs.runCommand "${package.name}-wrapped" { buildInputs = with pkgs; [ makeWrapper ]; } ''
+  wrapElectron = { package, bin ? package.meta.mainProgram or package.pname or (pkgs.lib.strings.nameFromURL package.name "-"), outBin ? bin, sandbox ? true }: pkgs.runCommand "${package.name}-wrapped" { buildInputs = with pkgs; [ makeWrapper ]; } ''
     mkdir -p "$out/bin"
     makeWrapper ${package}/bin/${bin} $out/bin/${outBin} \
-      --add-flags '--force-device-scale-factor=1.6'
+      --add-flags '--force-device-scale-factor=1.6' \
+      ${optionalString (!sandbox) "--add-flags '--no-sandbox'"}
   '';
-  
+
   wrappedChrome = wrapElectron { package = pkgs.google-chrome; outBin = "google-chrome"; };
   wrappedZulip = wrapElectron { package = pkgs.zulip; bin = "zulip"; outBin = "zulip"; };
   wrappedElementDesktop = wrapElectron { package = pkgs.element-desktop; bin = "element-desktop"; outBin = "element"; };
   wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; };
+  wrappedYTMDesktop = wrapElectron { package = pkgs.ytmdesktop; sandbox = false; };
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
     mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
@@ -47,7 +52,7 @@ in {
   config = {
     services.xserver = {
       displayManager.defaultSession = "none+xmonad";
-        
+
       windowManager.session = [{
         name = "xmonad";
         start = ''
@@ -155,7 +160,7 @@ in {
 
         zsh.initExtra = "source ${./zshrc}";
         zsh.dirHashes = let
-          flakeHashes = lib.mapAttrs' (n: v: lib.nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
+          flakeHashes = mapAttrs' (n: v: nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
           inputNames = {
             "nixpkgs" = "nixos";
           };
@@ -193,7 +198,7 @@ in {
           enable = true;
           client = {
             enable = true;
-            arguments = lib.mkForce ["-a" "\"\""];
+            arguments = mkForce ["-a" "\"\""];
           };
         };
         gpg-agent = {
@@ -318,7 +323,7 @@ in {
           fira fira-code powerline-fonts nerdfonts pavucontrol keepassxc
           sxiv xclip mumble pulseaudio-ctl pamixer libnotify synergy
           xorg.xbacklight screen-message
-          ytmdesktop qt5ct playerctl evince
+          wrappedYTMDesktop qt5ct playerctl evince
           thunderbird wrappedZulip zoom-us steam steam-run wireshark
           virt-manager rclone cached-nix-shell xournal xmonad worktime
           fira-code-symbols libreoffice xournalpp wrappedChrome
@@ -403,8 +408,8 @@ in {
         defaultApplications = let
           filters = {
           };
-          filter = n: v: (filters.${n} or lib.id) (lib.filter (d: d != "emacs.desktop") v);
-        in lib.mapAttrs filter (cfg.lib.xdg.mimeAssociations [
+          doFilter = n: v: (filters.${n} or id) (filter (d: d != "emacs.desktop") v);
+        in mapAttrs doFilter (cfg.lib.xdg.mimeAssociations [
           cfg.programs.zathura.package
           pkgs.sxiv
           cfg.programs.emacs.package