From 645524c898dc55b2fd8585b39c0dab25c7d5077b Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman@ltnglobal.com>
Date: Tue, 12 Sep 2023 15:13:24 -0400
Subject: [PATCH] More macOS true up work

---
 modules/darwin/default.nix       | 18 +++++++++++++-----
 modules/home-manager/default.nix |  7 ++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 00a04b0..928f47c 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -15,19 +15,17 @@
       dog
       dos2unix
       du-dust
-      subversion
-      # git-svn
+      element-desktop
       gotop
-      # helm
       hub
       hugo
       kopia
-      # kubectl
       kubectx
       mas
       mtr
       nmap
-      # node
+      nodejs
+      nodePackages.npm
       openjdk
       rename
       tree
@@ -54,6 +52,8 @@
     ];
     brews = [
       "adr-tools"
+      "helm"
+      "kubernetes-cli"
     ];
     casks = [
       "1password"
@@ -92,6 +92,14 @@
       "zenmap"
       "zoom"
     ];
+    masApps = {
+      "1Password for Safari" = 1569813296;
+      "BetterSnapTool" = 417375580;
+      "Home Assistant" = 1099568401;
+      "HomeCam" = 1292995895;
+      "MeetingBar" = 1532419400;
+      "Microsoft Remote Desktop" = 1295203466;
+    };
   };
 
   nix = {
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 0812718..ee8f1fc 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }: {
   home.stateVersion = "23.11";
-  # home.packages = with pkgs; [
-    #
-  # ];
+  home.packages = with pkgs; [
+    subversion
+  ];
   home.sessionVariables = {
     CLICLOLOR = 1;
     PAGER = "less";
@@ -15,6 +15,7 @@
       enable = true;
       delta.enable = true;
       lfs.enable = true;
+      package = pkgs.gitAndTools.gitFull;
     };
     go = {
       enable = true;