From 6f41fee33557a1ab829528af11803cf2177af71e Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 7 Jan 2023 19:40:48 +0100 Subject: [PATCH] packages/nixpak: move chromium directory around --- modules/desktop/package-sets.nix | 2 +- packages/nixpak/ungoogled-chromium/default.nix | 15 +++++++++++---- users/max/home.nix | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/desktop/package-sets.nix b/modules/desktop/package-sets.nix index b777d03..16dcb47 100644 --- a/modules/desktop/package-sets.nix +++ b/modules/desktop/package-sets.nix @@ -25,7 +25,7 @@ xh ]; www = [ - ungoogled-chromium + inputs.self.packages.x86_64-linux.ungoogled-chromium ]; gui-apps = with inputs.self.packages.x86_64-linux; [ amberol diff --git a/packages/nixpak/ungoogled-chromium/default.nix b/packages/nixpak/ungoogled-chromium/default.nix index 38f5cc9..8a5c61c 100644 --- a/packages/nixpak/ungoogled-chromium/default.nix +++ b/packages/nixpak/ungoogled-chromium/default.nix @@ -21,10 +21,17 @@ mkNixPak { (sloth.mkdir (sloth.concat' sloth.appCacheDir "/chromium")) (sloth.concat' sloth.xdgCacheHome "/chromium") ] - (sloth.concat [ - sloth.xdgConfigHome - "/chromium" - ]) + [ + # home-manager does some funny things + (sloth.concat [ + sloth.xdgConfigHome + "/nixpak-ungoogled-chromium" + ]) + (sloth.concat [ + sloth.xdgConfigHome + "/chromium" + ]) + ] (sloth.concat' sloth.homeDir "/Downloads") "/tmp/.X11-unix" (sloth.envOr "XAUTHORITY" "/no-xauth") diff --git a/users/max/home.nix b/users/max/home.nix index 5da58cc..d655d7e 100644 --- a/users/max/home.nix +++ b/users/max/home.nix @@ -42,7 +42,7 @@ let }; # chromium extensions - programs.chromium = import ./home/chromium.nix pkgs.ungoogled-chromium inputs.nix-crx.packages.x86_64-linux; + programs.chromium = import ./home/chromium.nix inputs.self.packages.x86_64-linux.ungoogled-chromium inputs.nix-crx.packages.x86_64-linux; gtk.enable = true; gtk.theme.name = "Adwaita-dark";