provision/hosts/bulwark/configuration.nix

@@ -18,7 +18,7 @@
   # Modules
   modules = {
     desktop = {
-      enable = true;
+      browser.enable = true;
       gnome.enable = true;
     };
     devel = {

provision/hosts/kestrel/configuration.nix

@@ -34,7 +34,7 @@
   # Modules 
   modules = {
     desktop = {
-      enable = true;
+      browser.enable = true;
       gnome.enable = true;
     };
     devel = {

provision/hosts/osprey/configuration.nix

@@ -25,13 +25,12 @@
     docker-compose
     podman-tui
     dive
-    appgate-sdp
   ];
 
   # Modules 
   modules = {
     desktop = {
-      enable = true;
+      browser.enable = true;
       gnome.enable = true;
     };
     devel = {

provision/hosts/shivan/configuration.nix

@@ -21,7 +21,7 @@
   # Modules
   modules = {
     desktop = {
-      enable = true;
+      browser.enable = true;
       gnome.enable = true;
     };
     devel = {

provision/modules/desktop/browser/bookmarks/chrome.nix

@@ -36,10 +36,4 @@
     { "url" = "https://old.reddit.com/r/nixos/"; name = "nixos-reddit"; }
     { "url" = "https://nixos.wiki/"; name = "nixos-wiki"; }
   ]; }
-  { "name" = "Work"; "children" = [
-    { url = "https://webmail.apps.mil/owa"; name = "WebMail";}
-    { url = "https://dod.teams.microsoft.us/"; name = "Teams";}
-    { url = "https://usaf-my.dps.mil/"; name = "OneDrive";}
-  ]; }
-
 ]

provision/modules/desktop/browser/chrome.nix

@@ -1,16 +1,9 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg1 = config.modules.desktop;
+let cfg = config.modules.desktop.browser;
-    cfg2 = config.modules.programs.chrome;
 in {
-  options.modules.programs.chrome = with lib; {
+  # Enable option declared in firefox.nix
-    enable = lib.mkOption {
+  config = lib.mkIf cfg.enable {
-      type = types.bool;
-      default = true;
-    };
-  };
-
-  config = lib.mkIf (cfg1.enable && cfg2.enable) {
     environment.systemPackages = with pkgs; [
       google-chrome # Web browser developed by Google.
     ];
@@ -53,7 +46,7 @@ in {
         # Setup bookmarks
         "BookmarkBarEnabled" = true;
         "ShowAppsShortcutInBookmarkBar" = false;
-        "ManagedBookmarks" = import ./bookmarks.nix; 
+        "ManagedBookmarks" = import ./bookmarks/chrome.nix; 
       };
     };
 

provision/modules/desktop/browser/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./chrome.nix ./firefox.nix ];
+}

provision/modules/desktop/browser/firefox.nix

@@ -1,17 +1,10 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg1 = config.modules.desktop;
+let cfg = config.modules.desktop.browser;
-    cfg2 = config.modules.programs.firefox;
 in {
-  options.modules.programs.firefox = with lib; {
+  options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
-    enable = lib.mkOption {
+  config = lib.mkIf cfg.enable {
-      type = types.bool;
+    # Install applications for CAC
-      default = true;
-    };
-  };
-
-  config = lib.mkIf (cfg1.enable && cfg2.enable) {
-    # Applications for CAC usage
     environment.systemPackages = with pkgs; [
       opensc
       pcsc-tools
@@ -22,7 +15,7 @@ in {
       programs.firefox = {
         enable = true;
         profiles.default = {
-          bookmarks = import ./bookmarks.nix;
+          bookmarks = import ./bookmarks/firefox.nix;
           isDefault = true;
           name = "default";
           settings = {

provision/modules/desktop/default.nix

@@ -1,14 +1,7 @@
 { config, lib, pkgs, user, inputs, ... }:
+{
+  imports = [ ./browser ./keyd.nix ./gnome.nix ];
 
-let cfg = config.modules.desktop;
-in {
-  imports = [ 
-    ./keyd.nix
-    ./gnome.nix 
-  ];
-
-  options.modules.desktop.enable = lib.mkEnableOption "desktop";
-  config = lib.mkIf cfg.enable {
   environment.systemPackages = with pkgs; [
     bc # Arbitrary-precision arithmetic language.
     fzf # Command-line fuzzy finder for Unix-like operating systems.
@@ -43,5 +36,4 @@ in {
       "application/x-extension-xht" = [ "google-chrome.desktop" ];
       "application/pdf" = [ "google-chrome.desktop" ]; };
   };
-  };
 }

provision/modules/programs/default.nix

@@ -1,8 +1,6 @@
 { ... }:
 {
   imports = [
-    ./chrome
-    ./firefox
     ./git.nix 
     ./chezmoi.nix 
     ./kitty.nix

provision/overlays/appgate-sdp.nix

@@ -1,8 +0,0 @@
-self: super: {
-  appgate-sdp = super.appgate-sdp.overrideAttrs (old: { 
-    src = super.fetchurl { 
-      url = "https://bin.appgate-sdp.com/6.4/client/appgate-sdp_6.4.0_amd64.deb";
-      sha256 = "sha256-0h6Mz3B7fADGL5tGbrKNYpVIAvRu7Xx0n9OvjOeVCds=";
-    }; 
-  }); 
-}