diff --git a/src/system/machines/workstation/modules/home-manager/home.nix b/src/system/machines/workstation/modules/home-manager/home.nix index b0af087..19ef64e 100644 --- a/src/system/machines/workstation/modules/home-manager/home.nix +++ b/src/system/machines/workstation/modules/home-manager/home.nix @@ -39,7 +39,7 @@ wm.sway.enable = true; browser = { - firefox.enable = true; + chromium.enable = true; }; alacritty.enable = true; diff --git a/src/system/machines/workstation/system.nix b/src/system/machines/workstation/system.nix index 4c7289d..ae0c614 100644 --- a/src/system/machines/workstation/system.nix +++ b/src/system/machines/workstation/system.nix @@ -90,6 +90,8 @@ with lib; }; services = { + teamviewer.enable = true; + timesyncd = lib.mkDefault { enable = true; servers = [ diff --git a/src/user/modules/gui/modules/browsers/chromium/config/extensions/browserpass.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/browserpass.crx deleted file mode 100644 index de1cdbc..0000000 Binary files a/src/user/modules/gui/modules/browsers/chromium/config/extensions/browserpass.crx and /dev/null differ diff --git a/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx deleted file mode 100644 index 83b75ae..0000000 Binary files a/src/user/modules/gui/modules/browsers/chromium/config/extensions/ublock.crx and /dev/null differ diff --git a/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx b/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx deleted file mode 100644 index bdcead1..0000000 Binary files a/src/user/modules/gui/modules/browsers/chromium/config/extensions/vimium.crx and /dev/null differ diff --git a/src/user/modules/gui/modules/browsers/chromium/default.nix b/src/user/modules/gui/modules/browsers/chromium/default.nix index ec67982..bf9c59c 100644 --- a/src/user/modules/gui/modules/browsers/chromium/default.nix +++ b/src/user/modules/gui/modules/browsers/chromium/default.nix @@ -8,24 +8,40 @@ in { options.modules.user.gui.browser.chromium = { enable = mkEnableOption "Enable Chromium browser"; }; config = mkIf cfg.enable { programs = { - chromium = { + chromium = rec { enable = true; package = pkgs.ungoogled-chromium; - extensions = [ - { + extensions = + let + vrs = package.version; + in + [ + rec { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - crxPath = /home/${config.user.name}/.config/chromium/Extensions/ublock.crx; - version = "1.58.0"; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=${vrs}&acceptformat=crx2,crx3&x=id%3D${id}%26uc"; + name = "ublock_${version}.crx"; + sha256 = "0ycnkna72n969crgxfy2lc1qbndjqrj46b9gr5l9b7pgfxi5q0ll"; + }; + version = "1.62.0"; } - { + rec { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; - crxPath = /home/${config.user.name}/.config/chromium/Extensions/vimium.crx; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=${vrs}&acceptformat=crx2,crx3&x=id%3D${id}%26uc"; + name = "vimium_${version}.crx"; + sha256 = "0m8xski05w2r8igj675sxrlkzxlrl59j3a7m0r6c8pwcvka0r88d"; + }; version = "2.1.2"; } - { + rec { id = "naepdomgkenhinolocfifgehidddafch"; - crxPath = /home/${config.user.name}/.config/chromium/Extensions/browserpass.crx; - version = "3.8.0"; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=${vrs}&acceptformat=crx2,crx3&x=id%3D${id}%26uc"; + name = "browserpass_${version}.crx"; + sha256 = "074sc9hxh7vh5j79yjhsrnhb5k4dv3bh5vip0jr30hkkni7nygbd"; + }; + version = "3.9.0"; } ]; }; @@ -33,12 +49,5 @@ in enable = true; }; }; - - home = { - file.".config/chromium/Extensions" = { - source = ./config/extensions; - recursive = true; - }; - }; }; }