refactor: clean up options definitions

Author: 99linesofcode

hosts/luna/disko.nix

@@ -37,8 +37,6 @@ in
                 settings = {
                   allowDiscards = true;
                 };
-                # TODO: generate prior to nixos-anywhere install
-                # passwordFile = "/tmp/secret.key"; # commenting will cause Disko to prompt for a passphrase
                 content = {
                   type = "btrfs";
                   extraArgs = [ "-f" ];

modules/.gitkeep

@@ -5,8 +5,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.PLACEHOLDER.enable = mkEnableOption "PLACEHOLDER";
+  options.host.PLACEHOLDER = {
+    enable = mkEnableOption "PLACEHOLDER";
   };
 
   config = mkIf cfg.enable {

modules/avahi.nix

@@ -5,8 +5,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.avahi.enable = mkEnableOption "avahi";
+  options.host.avahi = {
+    enable = mkEnableOption "avahi";
   };
 
   config = mkIf cfg.enable {

modules/bluetooth.nix

@@ -9,8 +9,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.bluetooth.enable = mkEnableOption "bluetooth";
+  options.host.bluetooth = {
+    enable = mkEnableOption "bluetooth";
   };
 
   config = mkIf cfg.enable {

modules/borgmatic.nix

@@ -0,0 +1,25 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.host.borgmatic;
+in
+with lib;
+{
+  options.host.borgmatic = {
+    enable = mkEnableOption "borgmatic";
+  };
+
+  config = mkIf cfg.enable {
+    services.borgmatic = {
+      enable = true;
+      settings = {
+        repositories = [
+          {
+            label = "Google Drive";
+            path = "rclone:gdrive/backup";
+          }
+        ];
+      };
+    };
+  };
+}

modules/btrfs.nix

@@ -5,8 +5,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.btrfs.enable = mkEnableOption "BTRFS partitioning";
+  options.host.btrfs = {
+    enable = mkEnableOption "BTRFS partitioning";
   };
 
   config = mkIf cfg.enable {

modules/catt.nix

@@ -10,8 +10,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.catt.enable = mkEnableOption "Cast All The Things - Chromecast";
+  options.host.catt = {
+    enable = mkEnableOption "Cast All The Things - Chromecast";
   };
 
   config = mkIf cfg.enable {

modules/default.nix

@@ -8,8 +8,8 @@ with lib;
 {
   imports = moduleFilePaths;
 
-  options = {
-    host.root = mkOption {
+  options.host = {
+    root = mkOption {
       type = types.path;
       description = "nix store path declaration";
     };

modules/efi.nix

@@ -5,8 +5,8 @@ let
 in
 with lib;
 {
-  options = {
-    host.efi.enable = mkEnableOption "booting via EFI";
+  options.host.efi = {
+    enable = mkEnableOption "booting via EFI";
   };
 
   config = mkIf cfg.enable {

modules/encryption.nix

@@ -1,26 +1,31 @@
- {config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.host.encryption;
 in
-  with lib;
+with lib;
 {
-  options = {
-    host.encryption.enable = mkEnableOption "LUKS filesystem encryption";
+  options.host.encryption = {
+    enable = mkEnableOption "LUKS filesystem encryption";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages =  with pkgs; [
+    environment.systemPackages = with pkgs; [
       cryptsetup
     ];
 
-    boot.initrd =  {
+    boot.initrd = {
       luks.devices = {
-          "pool0_0" = {
-             allowDiscards = true;
-             bypassWorkqueues = true;
-          };
+        "pool0_0" = {
+          allowDiscards = true;
+          bypassWorkqueues = true;
+        };
       };
     };
   };
-}
+}