From 2a2b3385e11e4ba9c268315052aa4f108f5ea8b2 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 1 Jun 2024 12:00:22 +0200 Subject: [PATCH] Add google-chrome option to chromium module --- home/christoph/default.nix | 20 +++++++++++++------- home/modules/chromium/default.nix | 7 +++++++ home/modules/chromium/options.nix | 1 + 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/home/christoph/default.nix b/home/christoph/default.nix index fa7aef7e..be8c6778 100644 --- a/home/christoph/default.nix +++ b/home/christoph/default.nix @@ -32,7 +32,10 @@ rec { ]; modules = { - chromium.enable = true; + chromium = { + enable = true; + google = false; + }; # emacs = { # enable = false; @@ -125,6 +128,7 @@ rec { "2" = [ "jetbrains-clion" "code-url-handler" + "neovide" ]; "3" = [ "obsidian" @@ -156,6 +160,7 @@ rec { "obsidian" "jetbrains-clion" "code-url-handler" + "neovide" ]; }; @@ -378,14 +383,14 @@ rec { appimage-run # decker # TODO: Build failure - google-chrome # Trash, but required for decker pdf export - (pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@") + # google-chrome # Trash, but required for decker pdf export + # (pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@") cool-retro-term ventoy-full # Bootable USB for many ISOs # geekbench # spotify # NOTE: Uses flatpak - neovide + # neovide # NOTE: Installed in modules/neovim sqlitebrowser # To modify tables dbeaver-bin # To import/export data + diagrams @@ -894,18 +899,19 @@ rec { "com.github.tchx84.Flatseal" "com.discordapp.Discord" "com.spotify.Client" + "com.google.Chrome" ]; uninstallUnmanaged = true; update.auto = { enable = true; - onCalendar = "weekly"; # Default value + onCalendar = "daily"; # Default value: weekly }; overrides = { global = { - # TODO: Makes discord crash + # NOTE: Makes discord crash # Force Wayland by default # Context.sockets = ["wayland" "!x11" "!fallback-x11"]; @@ -916,7 +922,7 @@ rec { XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons"; # Force correct theme for some GTK apps - # GTK_THEME = "Adwaita:dark"; + GTK_THEME = "Adwaita:light"; }; }; }; diff --git a/home/modules/chromium/default.nix b/home/modules/chromium/default.nix index f1453e94..9a4389da 100644 --- a/home/modules/chromium/default.nix +++ b/home/modules/chromium/default.nix @@ -14,6 +14,13 @@ in { options.modules.chromium = import ./options.nix {inherit lib mylib;}; config = mkIf cfg.enable { + home.packages = with pkgs; builtins.concatLists [ + (optionals cfg.google [ + google-chrome # Trash, but required for decker pdf export + (pkgs.writeShellScriptBin "chrome" "exec -a $0 ${google-chrome}/bin/google-chrome-stable $@") + ]) + ]; + programs.chromium = { enable = true; diff --git a/home/modules/chromium/options.nix b/home/modules/chromium/options.nix index 76426ef8..3538bf68 100644 --- a/home/modules/chromium/options.nix +++ b/home/modules/chromium/options.nix @@ -6,4 +6,5 @@ with lib; with mylib.modules; { enable = mkEnableOpt "Chromium"; + google = mkEnableOpt "Google Chrome"; }