migrate firfox chrome and borg

provision/hosts/kestrel/configuration.nix

@@ -47,7 +47,6 @@
       pc.enable = true;
     };
     programs = {
-      borg.enable = true;
       kitty.enable = true;
       virt-manager.enable = true;
     };

provision/hosts/torus/configuration.nix

@@ -92,9 +92,6 @@
 
   # Modules
   modules = {
-    programs = {
-      borg.enable = true;
-    };
     services = {
       ssh.enable = true;
       syncthing = {

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";

provision/modules/extra/default.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     ../programs/beancount.nix
+    ../programs/borg.nix
   ];
   options.modules.extra.enable = lib.mkEnableOption "extra";
 }

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;
   };
 }

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
     ];

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

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;