reduce browser options and refactor bookmarks

provision/hosts/bulwark/configuration.nix

@@ -19,32 +19,27 @@
   # Modules
   modules = {
     desktop = {
+      browser.enable = true;
       gnome = {
         enable = true;
         wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/bulwark.png}";
       };
-      browser.enable = true;
     };
     devel = {
       notes.enable = true;
     };
     gaming = {
-      steam.enable = true;
       emulation.enable = true;
-      misc.enable = true;
+      steam.enable = true;
     };
     programs = {
+      chezmoi.apply = true;
       kitty.enable = true;
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
     };
     services = {
       samba-client.enable = true;
     };
     system = {
-      nipr.enable = true;
       ssh.enable = true;
       terminal.enable = true;
     };

provision/hosts/kestrel/configuration.nix

@@ -35,11 +35,11 @@
   # Modules 
   modules = {
     desktop = {
+      browser.enable = true;
       gnome = {
         enable = true;
         wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/kestrel.png}";
       };
-      browser.enable = true;
     };
     devel = {
       engineering.enable = true;
@@ -48,16 +48,13 @@
       tooling.enable = true;
     };
     gaming = {
-      steam.enable = true;
       emulation.enable = true;
-      misc.enable = true;
+      minecraft.enable = true;
+      steam.enable = true;
     };
     programs = {
+      chezmoi.apply = true;
       kitty.enable = true;
-      chezmoi = {
-        enable = true;
-        apply = true;
-      };
     };
     services = {
       peripherals.enable = true;
@@ -66,7 +63,6 @@
     };
     system = {
       backup.enable = true;
-      nipr.enable = true;
       ssh.enable = true;
       terminal.enable = true;
       wireguard-client = {

provision/hosts/shivan/configuration.nix

@@ -22,12 +22,12 @@
   # Modules
   modules = {
     desktop = {
+      browser.enable = true;
       gnome = {
         enable = true;
         # TODO: Add Shivan wallpaper
         wallpaper = "file://${../../../resources/img/wallpapers/gruvbox/bulwark.png}";
       };
-      browser.enable = true;
     };
     devel = {
       engineering.enable = true;
@@ -37,10 +37,7 @@
     };
     programs = {
       kitty.enable = true;
-      chezmoi = {
+      chezmoi.apply = true;
-        enable = true;
-        apply = true;
-      };
     };
     services = {
       peripherals.enable = true;
@@ -48,7 +45,6 @@
       virt-manager.enable = false;
     };
     system = {
-      nipr = true;
       ssh.enable = true;
       terminal.enable = true;
     };

provision/hosts/torus/configuration.nix

@@ -10,6 +10,7 @@
     ./gitea.nix
     ./nextcloud.nix
     ./backup.nix
+    ./jellyfin.nix
   ];
 
   # Use normal kernel
@@ -97,13 +98,7 @@
       tooling.enable = true;
     };
     programs = {
-      chezmoi = {
+      chezmoi.apply = true;
-        enable = true;
-        apply = true;
-      };
-    };
-    services = {
-      jellyfin.enable = true;
     };
     system = {
       backup.enable = true;

provision/hosts/torus/jellyfin.nix

@@ -0,0 +1,6 @@
+{ config, lib, pkgs, user, ... }:
+{
+  services.jellyfin.enable = true;
+  services.jellyfin.openFirewall = true;
+  services.jellyfin.user = "${user}";
+}

provision/hosts/wsl/configuration.nix

@@ -51,10 +51,7 @@ in
       tooling.enable = true;
     };
     programs = {
-      chezmoi = {
+      chezmoi.apply = true;
-        enable = true;
-        apply = true;
-      };
     };
     system = {
       ssh.enable = true;

provision/modules/desktop/browser.nix

@@ -1,95 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.desktop.browser;
-
-in {
-  options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      google-chrome # Web browser developed by Google.
-    ];
-    programs.chromium = {
-      enable = true;
-      extraOpts = {
-
-        # Disable all manner of account-related things.
-        "BrowserSignin" = 0; # disable
-        "BrowserAddPersonEnabled" = false;
-        "BrowserGuestModeEnabled" = false;
-        "UserDisplayName" = "PolicyUser";
-        "UserFeedbackAllowed" = false;
-        "BackgroundModeEnabled" = false;
-        "MetricsReportingEnabled" = false;
-        "BlockExternalExtensions" = true;
-        "AutofillAddressEnabled" = false;
-        "AutofillCreditCardEnabled" = false;
-        "PasswordManagerEnabled" = false;
-        "PromptForDownloadLocation" = true;
-        "SyncDisabled" = true;
-        "SpellcheckEnabled" = true;
-        "SpellcheckLanguage" = [ "en-US" ];
-        "CloudPrintSubmitEnabled" = false;
-        "EnableMediaRouter" = false;
-        "ShowCastIconInToolbar" = false;
-
-        # Install extensions
-        "ExtensionInstallForcelist" = [
-          "ihennfdbghdiflogeancnalflhgmanop" # Gruvbox theme
-          "fkeaekngjflipcockcnpobkpbbfbhmdn" # Copy as Markdown
-          "pcmpcfapbekmbjjkdalcgopdkipoggdi" # MarkDownload
-          "nngceckbapebfimnlniiiahkandclblb" # Bitwarden
-          "icpgjfneehieebagbmdbhnlpiopdcmna" # New Tab Redirect
-          "oahiolknhkbpcolgnpljehalnhblolkm" # Shorts Blocker
-          "hkgfoiooedgoejojocmhlaklaeopbecg" # Picture-in-Picture (by Google)
-          "dbepggeogbaibhgnhhndojpepiihcmeb" # Vimium
-        ];
-
-        # Setup bookmarks
-        "BookmarkBarEnabled" = true;
-        "ShowAppsShortcutInBookmarkBar" = false;
-        "ManagedBookmarks" = [
-          { "toplevel_name" = "Bookmarks"; }
-          { "name" = "Daily"; "children" = [
-            { "url" = "https://lc.tstarr.us"; name = "Chisme Mattermost"; }
-            { "url" = "https://rss.tstarr.us"; name = "Miniflux"; }
-            { "url" = "https://cloud.tstarr.us"; name = "Nextcloud"; }
-            { "url" = "https://git.tstarr.us"; name = "Gitea"; }
-            { "url" = "https://media.tstarr.us/web/index.html#!/home.html"; name = "Jellyfin"; }
-            { "url" = "https://home.tstarr.us"; name = "Home Assistant"; }
-            { "url" = "https://www.youtube.com/feed/subscriptions"; name = "Youtube"; }
-            { "url" = "https://gmail.com/"; name = "Mail"; }
-            { "url" = "https://github.com/"; name = "GitHub"; }
-            { "url" = "https://www.google.com/"; name = "Google"; }
-            { "url" = "https://www.icloud.com/"; name = "iCloud"; }
-          ]; }
-          { "name" = "Games"; "children" = [
-            { "url" = "https://www.protondb.com/"; name = "ProtonDB"; }
-            { "url" = "https://vimm.net/"; name = "Vimm's Lair: Preserving the Classics"; }
-            { "url" = "https://www.dotabuff.com/"; name = "DOTABUFF"; }
-          ]; }
-          { "name" = "Homelab"; "children" = [
-            { "url" = "http://localhost:8384"; name = "Syncthing"; }
-            { "url" = "https://github.com/starr-dusT/dotfiles"; name = "Dotfiles"; }
-            { "url" = "https://rssbridge.tstarr.us"; name = "RSSBridge"; }
-          ]; }
-          { "name" = "Nix"; "children" = [
-            { "url" = "https://nixos.org/nix/manual/"; name = "nix-manual"; }
-            { "url" = "https://nixos.org/nixpkgs/manual/"; name = "nixpkgs-manual"; }
-            { "url" = "https://nixos.org/nixos/manual/"; name = "nixos-manual"; }
-            { "url" = "https://nixos.org/nixos/options.html"; name = "nixos-options"; }
-            { "url" = "https://discourse.nixos.org/"; name = "nixos-discourse"; }
-            { "url" = "https://old.reddit.com/r/nixos/"; name = "nixos-reddit"; }
-            { "url" = "https://nixos.wiki/"; name = "nixos-wiki"; }
-          ]; }
-        ];
-      };
-    };
-
-    networking.firewall.allowedTCPPorts = [ 8080 ];
-    services.static-web-server = {
-      enable = true;
-      listen = "[::]:8080";
-      root = ../../../resources/blank;
-    };
-  };
-}

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

@@ -0,0 +1,37 @@
+# Chrome bookmarks
+
+[
+  { "toplevel_name" = "Bookmarks"; }
+  { "name" = "Daily"; "children" = [
+    { "url" = "https://lc.tstarr.us"; name = "Chisme Mattermost"; }
+    { "url" = "https://rss.tstarr.us"; name = "Miniflux"; }
+    { "url" = "https://cloud.tstarr.us"; name = "Nextcloud"; }
+    { "url" = "https://git.tstarr.us"; name = "Gitea"; }
+    { "url" = "https://media.tstarr.us/web/index.html#!/home.html"; name = "Jellyfin"; }
+    { "url" = "https://home.tstarr.us"; name = "Home Assistant"; }
+    { "url" = "https://www.youtube.com/feed/subscriptions"; name = "Youtube"; }
+    { "url" = "https://gmail.com/"; name = "Mail"; }
+    { "url" = "https://github.com/"; name = "GitHub"; }
+    { "url" = "https://www.google.com/"; name = "Google"; }
+    { "url" = "https://www.icloud.com/"; name = "iCloud"; }
+  ]; }
+  { "name" = "Games"; "children" = [
+    { "url" = "https://www.protondb.com/"; name = "ProtonDB"; }
+    { "url" = "https://vimm.net/"; name = "Vimm's Lair: Preserving the Classics"; }
+    { "url" = "https://www.dotabuff.com/"; name = "DOTABUFF"; }
+  ]; }
+  { "name" = "Homelab"; "children" = [
+    { "url" = "http://localhost:8384"; name = "Syncthing"; }
+    { "url" = "https://github.com/starr-dusT/dotfiles"; name = "Dotfiles"; }
+    { "url" = "https://rssbridge.tstarr.us"; name = "RSSBridge"; }
+  ]; }
+  { "name" = "Nix"; "children" = [
+    { "url" = "https://nixos.org/nix/manual/"; name = "nix-manual"; }
+    { "url" = "https://nixos.org/nixpkgs/manual/"; name = "nixpkgs-manual"; }
+    { "url" = "https://nixos.org/nixos/manual/"; name = "nixos-manual"; }
+    { "url" = "https://nixos.org/nixos/options.html"; name = "nixos-options"; }
+    { "url" = "https://discourse.nixos.org/"; name = "nixos-discourse"; }
+    { "url" = "https://old.reddit.com/r/nixos/"; name = "nixos-reddit"; }
+    { "url" = "https://nixos.wiki/"; name = "nixos-wiki"; }
+  ]; }
+]

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

@@ -0,0 +1,11 @@
+# Firefox bookmarks
+
+[
+  { name = "Managed Bookmarks"; toolbar = true; bookmarks = [
+    { name = "Bookmarks"; bookmarks = [
+      { 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

@@ -0,0 +1,61 @@
+{ config, lib, pkgs, user, ... }:
+
+let cfg = config.modules.desktop.browser;
+in {
+  # Enable option declared in firefox.nix
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      google-chrome # Web browser developed by Google.
+    ];
+
+    programs.chromium = {
+      enable = true;
+      extraOpts = {
+        # Disable all manner of account-related things.
+        "BrowserSignin" = 0; # disable
+        "BrowserAddPersonEnabled" = false;
+        "BrowserGuestModeEnabled" = false;
+        "UserDisplayName" = "PolicyUser";
+        "UserFeedbackAllowed" = false;
+        "BackgroundModeEnabled" = false;
+        "MetricsReportingEnabled" = false;
+        "BlockExternalExtensions" = true;
+        "AutofillAddressEnabled" = false;
+        "AutofillCreditCardEnabled" = false;
+        "PasswordManagerEnabled" = false;
+        "PromptForDownloadLocation" = true;
+        "SyncDisabled" = true;
+        "SpellcheckEnabled" = true;
+        "SpellcheckLanguage" = [ "en-US" ];
+        "CloudPrintSubmitEnabled" = false;
+        "EnableMediaRouter" = false;
+        "ShowCastIconInToolbar" = false;
+
+        # Install extensions
+        "ExtensionInstallForcelist" = [
+          "ihennfdbghdiflogeancnalflhgmanop" # Gruvbox theme
+          "fkeaekngjflipcockcnpobkpbbfbhmdn" # Copy as Markdown
+          "pcmpcfapbekmbjjkdalcgopdkipoggdi" # MarkDownload
+          "nngceckbapebfimnlniiiahkandclblb" # Bitwarden
+          "icpgjfneehieebagbmdbhnlpiopdcmna" # New Tab Redirect
+          "oahiolknhkbpcolgnpljehalnhblolkm" # Shorts Blocker
+          "hkgfoiooedgoejojocmhlaklaeopbecg" # Picture-in-Picture (by Google)
+          "dbepggeogbaibhgnhhndojpepiihcmeb" # Vimium
+        ];
+
+        # Setup bookmarks
+        "BookmarkBarEnabled" = true;
+        "ShowAppsShortcutInBookmarkBar" = false;
+        "ManagedBookmarks" = import ./bookmarks/chrome.nix; 
+      };
+    };
+
+    # Host blank webpage for default new-tab
+    networking.firewall.allowedTCPPorts = [ 8080 ];
+    services.static-web-server = {
+      enable = true;
+      listen = "[::]:8080";
+      root = ../../../../resources/blank;
+    };
+  };
+}

provision/modules/desktop/browser/default.nix

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

provision/modules/desktop/browser/firefox.nix

@@ -0,0 +1,34 @@
+{ config, lib, pkgs, user, ... }:
+
+let cfg = config.modules.desktop.browser;
+in {
+  options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
+  config = lib.mkIf cfg.enable {
+    # Install applications for CAC
+    environment.systemPackages = with pkgs; [
+      opensc
+      pcsc-tools
+      pkcs11helper
+    ];
+
+    home-manager.users.${user} = {
+      programs.firefox = {
+        enable = true;
+        profiles.default = {
+          bookmarks = import ./bookmarks/firefox.nix;
+          isDefault = true;
+          name = "default";
+          settings = {
+            "browser.bookmarks.addedImportButton" = false;
+            "browser.toolbars.bookmarks.visibility" = "always";
+            "browser.newtabpage.activity-stream.feeds.topsites" = false;
+            "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+            "browser.newtabpage.pinned" = [];
+            "browser.tabs.drawInTitlebar" = true;
+            "browser.tabs.inTitlebar" = 1;
+          };
+        };
+      };
+    };
+  };
+}

provision/modules/desktop/default.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, user, inputs, ... }:
 {
-  imports = [ ./keyd.nix ./browser.nix ./gnome.nix ];
+  imports = [ ./browser ./keyd.nix ./gnome.nix ];
 
   environment.systemPackages = with pkgs; [
     bc # Arbitrary-precision arithmetic language.

provision/modules/gaming/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./steam.nix ./misc.nix ./emulation.nix ];
+  imports = [ ./emulation.nix ./minecraft.nix ./steam.nix ];
 }

provision/modules/gaming/minecraft.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, user, ... }:
+
+let cfg = config.modules.gaming.minecraft;
+in {
+  options.modules.gaming.minecraft.enable = lib.mkEnableOption "minecraft";
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ 
+      prismlauncher # Launcher for Prism, a web application framework.
+      jdk17 # Java Development Kit (JDK) version 17.
+    ];
+  };
+}

provision/modules/gaming/misc.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.gaming.misc;
-in {
-  options.modules.gaming.misc.enable = lib.mkEnableOption "misc";
-  config = lib.mkIf cfg.enable {
-
-    environment.systemPackages = with pkgs; [ 
-      sunshine # Utility for streaming Android device display to a computer.
-      moonlight-qt # Qt-based client for NVIDIA GameStream, allowing streaming of PC games to other devices.
-      prismlauncher # Launcher for Prism, a web application framework.
-      jdk17 # Java Development Kit (JDK) version 17.
-    ];
-  };
-}

provision/modules/programs/chezmoi.nix

@@ -3,7 +3,10 @@
 let cfg = config.modules.programs.chezmoi;
 in {
   options.modules.programs.chezmoi = with lib; {
-    enable = lib.mkEnableOption "chezmoi";
+    enable = lib.mkOption {
+      type = with types; bool;
+      default = true;
+    };
     apply = lib.mkOption {
       type = with types; bool;
       default = false;
@@ -12,9 +15,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ 
-      chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control
+      chezmoi 
     ];
-
     # Optionally apply chezmoi dotfiles with home-manager activation
     home-manager.users.${user} = lib.mkIf cfg.apply {
       home.activation.chezmoi = home-manager.lib.hm.dag.entryAfter [ "installPackages" ] ''

provision/modules/programs/git.nix

@@ -1,5 +1,15 @@
-{ config, pkgs, user, lib, ... }:
+{ config, lib, pkgs, user, ... }:
-{
+
+let cfg = config.modules.programs.git;
+in {
+  options.modules.programs.git = with lib; {
+    enable = lib.mkOption {
+      type = with types; bool;
+      default = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       git # Version control system for tracking changes in source code during software development.
       git-annex # Manages files with git, without checking the file contents into git.
@@ -11,5 +21,5 @@
       owner = "${user}";
       group = "users";
     };
+  };
 }
-          

provision/modules/services/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./jellyfin.nix ./peripherals.nix ./samba-client.nix ./virt-manager.nix ];
+  imports = [ ./peripherals.nix ./samba-client.nix ./virt-manager.nix ];
 }

provision/modules/services/jellyfin.nix

@@ -1,11 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.services.jellyfin;
-in {
-  options.modules.services.jellyfin.enable = lib.mkEnableOption "jellyfin";
-  config = lib.mkIf cfg.enable {
-    services.jellyfin.enable = true;
-    services.jellyfin.openFirewall = true;
-    services.jellyfin.user = "${user}";
-  };
-}

provision/modules/system/default.nix

@@ -1,4 +1,4 @@
 { ... }:
 {
-  imports = [ ./backup.nix ./nipr.nix ./ssh.nix ./terminal.nix ./wireguard-client.nix ];
+  imports = [ ./backup.nix ./ssh.nix ./terminal.nix ./wireguard-client.nix ];
 }

provision/modules/system/nipr.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let cfg = config.modules.system.nipr;
-in {
-  options.modules.system.nipr.enable = lib.mkEnableOption "nipr";
-  config = lib.mkIf cfg.enable {
-
-    environment.systemPackages = with pkgs; [
-      opensc
-      pcsc-tools
-      pkcs11helper
-      firefox
-    ];
-  };
-}

provision/modules/system/terminal.nix

@@ -8,7 +8,6 @@ in {
     environment.systemPackages = with pkgs; [
       killall # Command-line utility to terminate processes by name.
       pciutils # Utilities for inspecting and manipulating devices connected to the PCI bus.
-      chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control.
       btop # Terminal-based resource monitor, providing an interactive view of system resources.
       nix-search-cli # Command-line utility for searching the Nix package repository.
       rbw # Command-line interface to the Bitwarden password manager.