refactor browser to program

provision/hosts/bulwark/configuration.nix

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

provision/hosts/kestrel/configuration.nix

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

provision/hosts/osprey/configuration.nix

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

provision/hosts/shivan/configuration.nix

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

provision/modules/desktop/browser/default.nix

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

provision/modules/desktop/default.nix

@@ -1,7 +1,14 @@
 { 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.
@@ -36,4 +43,5 @@
         "application/x-extension-xht" = [ "google-chrome.desktop" ];
         "application/pdf" = [ "google-chrome.desktop" ]; };
     };
+  };
 }

provision/modules/programs/chrome/bookmarks.nix

@@ -36,4 +36,10 @@
     { "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/programs/chrome/default.nix

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

provision/modules/programs/default.nix

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

provision/modules/programs/firefox/default.nix

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

provision/overlays/appgate-sdp.nix

@@ -0,0 +1,8 @@
+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=";
+    }; 
+  }); 
+}