Merge branch 'chromium'

src/system/machines/desktop/modules/home-manager/home.nix

@@ -35,9 +35,12 @@
 
         gui = {
           wm.hyprland.enable = true;
+          browser = {
+            firefox.enable = true;
+            chromium.enable = true;
+          };
 
           alacritty.enable = true;
-          browsers.enable = true;
           corn.enable = true;
           fun.enable = true;
           utils.enable = true;

src/user/modules/gui/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./wm
     ./modules
   ];
 }

src/user/modules/gui/modules/alacritty/default.nix

@@ -3,15 +3,10 @@
 with lib;
 let
   cfg = config.modules.user.gui.alacritty;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.alacritty = { enable = mkEnableOption "user.gui.alacritty"; };
+{ options.modules.user.gui.alacritty = { enable = mkEnableOption "Enable Alacritty terminal"; };
-  config = mkIf (cfg.enable && wm.enable) {
+  config = mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
       settings = import ./config/alacritty.nix { inherit config; };

src/user/modules/gui/modules/browsers/chromium/default.nix

@@ -0,0 +1,44 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.user.gui.browser.chromium;
+
+in
+{ options.modules.user.gui.browser.chromium = { enable = mkEnableOption "Enable Chromium browser"; };
+  config = mkIf cfg.enable {
+    programs = {
+      chromium = {
+        enable = true;
+        package = pkgs.ungoogled-chromium;
+        extensions = [
+          {
+            id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/ublock.crx;
+            version = "1.58.0";
+          }
+          {
+            id = "dbepggeogbaibhgnhhndojpepiihcmeb";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/vimium.crx;
+            version = "2.1.2";
+          }
+          {
+            id = "naepdomgkenhinolocfifgehidddafch";
+            crxPath = /home/${config.user.name}/.config/chromium/Extensions/browserpass.crx;
+            version = "3.8.0";
+          }
+        ];
+      };
+      browserpass = {
+        enable = true;
+      };
+    };
+
+    home = {
+      file.".config/chromium/Extensions" = {
+        source = ./config/extensions;
+        recursive = true;
+      };
+    };
+  };
+}

src/user/modules/gui/modules/browsers/default.nix

@@ -1,22 +1,7 @@
-{ pkgs, lib, config, ... }:
+{
-
+  imports = [
-with lib;
+    ./chromium
-let
+    ./firefox
-  cfg = config.modules.user.gui.browsers;
+    #./tor
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
-
-in
-{ options.modules.user.gui.browsers = { enable = mkEnableOption "user.gui.browsers"; };
-  config = mkIf (cfg.enable && wm.enable) {
-    programs.firefox.enable = true;
-
-    home.packages = with pkgs; [
-     tor-browser
-     brave
   ];
-  };
 }

src/user/modules/gui/modules/browsers/firefox/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.user.gui.browser.firefox;
+
+in
+{ options.modules.user.gui.browser.firefox = { enable = mkEnableOption "Enable Firefox browser"; };
+  config = mkIf cfg.enable {
+    programs.firefox.enable = true;
+  };
+}

src/user/modules/gui/modules/corn/default.nix

@@ -3,15 +3,10 @@
 with lib;
 let
   cfg = config.modules.user.gui.corn;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.corn = { enable = mkEnableOption "user.gui.corn"; };
+{ options.modules.user.gui.corn = { enable = mkEnableOption "Enable Bitcoin client applications"; };
-  config = mkIf (cfg.enable && wm.enable) {
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       trezor-suite
       trezorctl

src/user/modules/gui/modules/default.nix

@@ -6,6 +6,5 @@
     ./fun
     ./utils
     ./writing
-    ./wm
   ];
 }

src/user/modules/gui/modules/fun/default.nix

@@ -3,15 +3,10 @@
 with lib;
 let
   cfg = config.modules.user.gui.fun;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.fun = { enable = mkEnableOption "user.gui.fun"; };
+{ options.modules.user.gui.fun = { enable = mkEnableOption "Enable entertainment apps"; };
-  config = mkIf (cfg.enable && wm.enable) {
+  config = mkIf cfg.enable {
     programs.obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [

src/user/modules/gui/modules/utils/default.nix

@@ -3,21 +3,14 @@
 with lib;
 let
   cfg = config.modules.user.gui.utils;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.utils = { enable = mkEnableOption "user.gui.utils"; };
+{ options.modules.user.gui.utils = { enable = mkEnableOption "Enable desktop utils"; };
-  config = mkIf (cfg.enable && wm.enable) {
+  config = mkIf cfg.enable {
     programs.btop.enable = true;
     home.packages = with pkgs; [
       gimp
       libreoffice
-
-      teams-for-linux
     ];
   };
 }

src/user/modules/gui/modules/wm/hyprland/config/wallpapers

@@ -1 +0,0 @@
-../../../../../../configs/wallpapers/

src/user/modules/gui/modules/wm/sway/config/wallpapers

@@ -1 +0,0 @@
-../../../../../../configs/wallpapers/

src/user/modules/gui/modules/writing/default.nix

@@ -3,15 +3,10 @@
 with lib;
 let
   cfg = config.modules.user.gui.writing;
-  gui = config.modules.user.gui.wm;
-
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
 
 in
-{ options.modules.user.gui.writing = { enable = mkEnableOption "user.gui.writing"; };
+{ options.modules.user.gui.writing = { enable = mkEnableOption "Enable writing tools"; };
-  config = mkIf (cfg.enable && wm.enable) {
+  config = mkIf cfg.enable {
     home.packages = with pkgs; [
       mdbook
       texlive.combined.scheme-tetex

src/user/modules/gui/wm/hyprland/config/wallpapers

@@ -0,0 +1 @@
+../../../../../configs/wallpapers/

src/user/modules/gui/wm/hyprland/default.nix

@@ -98,7 +98,7 @@ in
 
         env = [
           "HYPRCURSOR_SIZE, 24"
-          "GTK_THEME, Qogir"
+          "GTK_THEME, Juno-ocean"
 
           "LIBVA_DRIVER_NAME,nvidia"
           "XDG_SESSION_TYPE,wayland"

src/user/modules/gui/wm/sway/config/wallpapers

@@ -0,0 +1 @@
+../../../../../configs/wallpapers/