From bf5a386188c42992ec99345a05fe52b6a8aedf51 Mon Sep 17 00:00:00 2001 From: "Gustavo \"Guz\" L de Mello" Date: Sun, 9 Feb 2025 12:21:41 -0300 Subject: [PATCH] feat: remove unucessary code --- packages/nixpak/bitwarden-desktop.nix | 8 ++--- packages/nixpak/brave.nix | 44 +++++++++++++++++++++++++++ packages/nixpak/default.nix | 15 +++++++-- 3 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 packages/nixpak/brave.nix diff --git a/packages/nixpak/bitwarden-desktop.nix b/packages/nixpak/bitwarden-desktop.nix index 1fdf02e..3ef6261 100644 --- a/packages/nixpak/bitwarden-desktop.nix +++ b/packages/nixpak/bitwarden-desktop.nix @@ -1,7 +1,7 @@ { - pkgs, - lib, mkNixPak, + pkgs, + ... }: mkNixPak { config = {sloth, ...}: { @@ -25,10 +25,6 @@ mkNixPak { network = true; shareIpc = true; - env = { - "XDG_CURRENT_DESKTOP" = sloth.env "XDG_CURRENT_DESKTOP"; - }; - bind.rw = [ (sloth.concat' sloth.xdgConfigHome "/Bitwarden") ]; diff --git a/packages/nixpak/brave.nix b/packages/nixpak/brave.nix new file mode 100644 index 0000000..088fe40 --- /dev/null +++ b/packages/nixpak/brave.nix @@ -0,0 +1,44 @@ +{ + mkNixPak, + pkgs, + ... +}: +mkNixPak { + config = {sloth, ...}: { + app.package = pkgs.brave; + + imports = [ + ./modules/gui-base.nix + ]; + + dbus.policies = { + "org.freedesktop.FileManager1" = "talk"; + "org.freedesktop.Notifications" = "talk"; + "org.freedesktop.ScreenSaver" = "talk"; + "org.freedesktop.secrets" = "talk"; + "org.kde.kwalletd5" = "talk"; + "org.kde.kwalletd6" = "talk"; + "org.gnome.SessionManager" = "talk"; + "org.gnome.ScreenSaver" = "talk"; + "org.gnome.Mutter.IdleMonitor.*" = "talk"; + "org.cinnamon.ScreenSaver" = "talk"; + "org.mate.ScreenSaver" = "talk"; + "org.xfce.ScreenSaver" = "talk"; + "org.mpris.MediaPlayer2.brave.*" = "own"; + }; + + bubblewrap = { + network = true; + shareIpc = true; + + bind.rw = [ + (sloth.concat' sloth.xdgConfigHome "/BraveSoftware") + (sloth.concat' sloth.xdgCacheHome "/BraveSoftware") + + "/etc/brave" + + (sloth.concat' sloth.homeDir "/Downloads") + ]; + }; + }; +} diff --git a/packages/nixpak/default.nix b/packages/nixpak/default.nix index dc71ea2..752bc99 100644 --- a/packages/nixpak/default.nix +++ b/packages/nixpak/default.nix @@ -1,14 +1,25 @@ { inputs, - pkgs, lib, + pkgs, + self, + ... }: let mkNixPak = inputs.nixpak.lib.nixpak { inherit lib pkgs; }; - bitwarden-desktop = import ./bitwarden-desktop.nix {inherit pkgs lib mkNixPak;}; + bitwarden-desktop = import ./bitwarden-desktop.nix {inherit lib mkNixPak pkgs self;}; + zen = import ./zen-browser.nix {inherit lib mkNixPak pkgs self;}; + brave = import ./brave.nix {inherit lib mkNixPak pkgs self;}; in { bitwarden-desktop = bitwarden-desktop.config.script; bitwarden-desktop-env = bitwarden-desktop.config.env; + + # Currently borked: "Filed to create a ProcessSingleton for your profile directory" + # brave = brave.config.script; + # brave-env = brave.config.env; + + zen-browser = zen.config.script; + zen-browser-env = zen.config.env; }