From 44b8624d201e70c8418ada5db3c46e9ba130ea30 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Thu, 24 Sep 2026 03:42:34 +0530 Subject: refactor(naming): use kebab-case option names and consistent gopass secret naming --- modules/web/chromium/assertions.nix | 4 ++-- modules/web/chromium/default.nix | 44 ++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 25 deletions(-) (limited to 'modules/web/chromium') diff --git a/modules/web/chromium/assertions.nix b/modules/web/chromium/assertions.nix index 465ebbd..79a9ba1 100644 --- a/modules/web/chromium/assertions.nix +++ b/modules/web/chromium/assertions.nix @@ -3,8 +3,8 @@ { assertions = [ { - assertion = !config.web.chromium.useOpenGL || config.web.chromium.enable; - message = "web.chromium.useOpenGL requires web.chromium.enable."; + assertion = !config.web.chromium.use-opengl || config.web.chromium.enable; + message = "web.chromium.use-opengl requires web.chromium.enable."; } ]; } diff --git a/modules/web/chromium/default.nix b/modules/web/chromium/default.nix index 1e3608c..ae9e97e 100644 --- a/modules/web/chromium/default.nix +++ b/modules/web/chromium/default.nix @@ -4,6 +4,10 @@ pkgs, ... }: +let + cfg = config.web.chromium; + extensionDirs = lib.concatStringsSep "," (lib.mapAttrsToList (_: ext: ext.drv) cfg.extensions); +in { imports = [ ./assertions.nix @@ -20,32 +24,26 @@ defaultText = lib.literalExpression "config.programs.chromium.finalPackage"; description = "Package to use for chromium. Defaults to the wrapped finalPackage from programs.chromium."; }; - useOpenGL = lib.mkEnableOption '' + use-opengl = lib.mkEnableOption '' Use OpenGL APIs for graphics acceleration ''; }; - config = lib.mkIf config.web.chromium.enable { + config = lib.mkIf cfg.enable { programs.chromium = { enable = true; package = pkgs.ungoogled-chromium; - commandLineArgs = - let - extensionDirs = lib.concatStringsSep "," ( - lib.mapAttrsToList (_: ext: ext.drv) config.web.chromium.extensions - ); - in - [ - "--force-dark-mode" - "--force-device-scale-factor=1.15" - # Don't use the gnome password store - "--password-store=basic" - "--load-extension=${extensionDirs}" - ] - ++ lib.optionals config.web.chromium.useOpenGL [ - "--use-angle=opengl" - "--use-cmd-decoder=passthrough" - ]; + commandLineArgs = [ + "--force-dark-mode" + "--force-device-scale-factor=1.15" + # Don't use the gnome password store + "--password-store=basic" + "--load-extension=${extensionDirs}" + ] + ++ lib.optionals cfg.use-opengl [ + "--use-angle=opengl" + "--use-cmd-decoder=passthrough" + ]; }; xdg.mimeApps.defaultApplications = { @@ -94,10 +92,10 @@ credentials_enable_autosignin = false; extensions = { pinned_extensions = [ - config.web.chromium.extensions.browserpass.id - config.web.chromium.extensions.darkreader.id - config.web.chromium.extensions.ublockOrigin.id - config.web.chromium.extensions.vimium.id + cfg.extensions.browserpass.id + cfg.extensions.darkreader.id + cfg.extensions.ublockOrigin.id + cfg.extensions.vimium.id ]; theme = { id = ""; -- cgit v1.2.3