From 49f8e7d0a124a2bf66276aa3c597c621c91a07e0 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Wed, 12 Mar 2025 23:13:24 -0700
Subject: [PATCH] migrate firfox chrome and borg

---
 provision/hosts/kestrel/configuration.nix | 1 -
 provision/hosts/torus/configuration.nix   | 3 ---
 provision/modules/desktop/default.nix     | 2 ++
 provision/modules/extra/default.nix       | 1 +
 provision/modules/programs/borg.nix       | 4 ++--
 provision/modules/programs/chrome.nix     | 5 ++---
 provision/modules/programs/default.nix    | 3 ---
 provision/modules/programs/firefox.nix    | 5 ++---
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix
index bcf9af93..71f9e00d 100644
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@@ -47,7 +47,6 @@
       pc.enable = true;
     };
     programs = {
-      borg.enable = true;
       kitty.enable = true;
       virt-manager.enable = true;
     };
diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix
index 008c344d..89380ee7 100644
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@@ -92,9 +92,6 @@
 
   # Modules
   modules = {
-    programs = {
-      borg.enable = true;
-    };
     services = {
       ssh.enable = true;
       syncthing = {
diff --git a/provision/modules/desktop/default.nix b/provision/modules/desktop/default.nix
index 6c3b8748..6f3ece30 100644
--- a/provision/modules/desktop/default.nix
+++ b/provision/modules/desktop/default.nix
@@ -7,6 +7,8 @@ in {
     ./keyd.nix
     ./gnome.nix 
     ./peripherals.nix
+    ../programs/chrome.nix
+    ../programs/firefox.nix
   ];
 
   options.modules.desktop.enable = lib.mkEnableOption "desktop";
diff --git a/provision/modules/extra/default.nix b/provision/modules/extra/default.nix
index d0cc77f6..740de69a 100644
--- a/provision/modules/extra/default.nix
+++ b/provision/modules/extra/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ../programs/beancount.nix
+    ../programs/borg.nix
   ];
   options.modules.extra.enable = lib.mkEnableOption "extra";
 }
diff --git a/provision/modules/programs/borg.nix b/provision/modules/programs/borg.nix
index fed73519..7cedea8b 100644
--- a/provision/modules/programs/borg.nix
+++ b/provision/modules/programs/borg.nix
@@ -1,8 +1,7 @@
 { config, pkgs, user, lib, ... }:
 
-let cfg = config.modules.programs.borg;
+let cfg = config.modules.extra;
 in {
-  options.modules.programs.borg.enable = lib.mkEnableOption "borg";
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       borgbackup # Deduplicating backup program 
@@ -21,6 +20,7 @@ in {
         rm /tmp/docker_images
       '')
     ];
+
     services.borgmatic.enable = true;
   };
 }
diff --git a/provision/modules/programs/chrome.nix b/provision/modules/programs/chrome.nix
index f25d19e0..bc78fdc7 100644
--- a/provision/modules/programs/chrome.nix
+++ b/provision/modules/programs/chrome.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg1 = config.modules.desktop;
-    cfg2 = config.modules.programs.chrome;
+let cfg = config.modules.programs.chrome;
 in {
   options.modules.programs.chrome = with lib; {
     enable = lib.mkOption {
@@ -10,7 +9,7 @@ in {
     };
   };
 
-  config = lib.mkIf (cfg1.enable && cfg2.enable) {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       google-chrome # Web browser developed by Google
     ];
diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix
index fbbaf99e..4d074556 100644
--- a/provision/modules/programs/default.nix
+++ b/provision/modules/programs/default.nix
@@ -2,9 +2,6 @@
 {
   imports = [
     ./appgate-sdp.nix
-    ./borg.nix
-    ./chrome.nix
-    ./firefox.nix
     ./kitty.nix
     ./nvim.nix
     ./virt-manager.nix
diff --git a/provision/modules/programs/firefox.nix b/provision/modules/programs/firefox.nix
index 9f07c0ed..9ec8e21d 100644
--- a/provision/modules/programs/firefox.nix
+++ b/provision/modules/programs/firefox.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, user, ... }:
 
-let cfg1 = config.modules.desktop;
-    cfg2 = config.modules.programs.firefox;
+let cfg = config.modules.programs.firefox;
 in {
   options.modules.programs.firefox = with lib; {
     enable = lib.mkOption {
@@ -10,7 +9,7 @@ in {
     };
   };
 
-  config = lib.mkIf (cfg1.enable && cfg2.enable) {
+  config = lib.mkIf cfg.enable {
     home-manager.users.${user} = {
       programs.firefox = {
         enable = true;