From ed81cb1d3421070be38a6cb917526db3b7e6ec8c Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Tue, 12 Sep 2023 21:15:53 -0400
Subject: [PATCH] Nomalize packages between systems

---
 modules/darwin/default.nix       | 21 ---------------------
 modules/home-manager/default.nix | 25 +++++++++++++++++++++++++
 modules/nixos/configuration.nix  | 20 +-------------------
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index fc6a1e5..84a7aae 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -13,27 +13,14 @@ in {
     systemPackages = with pkgs; [
       coreutils
       chart-testing
-      colordiff
-      dog
-      dos2unix
-      du-dust
-      element-desktop
-      gotop
-      hub
       hugo
       kopia
       kubectx
       mas
-      mtr
       nmap
       nodejs
       nodePackages.npm
       openjdk
-      rename
-      tree
-      watch
-      wget
-      yq
     ];
   };
 
@@ -58,12 +45,10 @@ in {
       "kubernetes-cli"
     ];
     casks = [
-      "1password"
       "amethyst"
       "audacity"
       "cakebrew"
       "elgato-stream-deck"
-      "firefox"
       "font-hack-nerd-font"
       "font-inconsolata-g-for-powerline"
       "font-source-code-pro-for-powerline"
@@ -71,9 +56,7 @@ in {
       "iterm2"
       "keepingyouawake"
       "kopiaui"
-      "libreoffice"
       "logseq"
-      "meld"
       "nextcloud"
       "obs"
       "onlyoffice"
@@ -82,16 +65,12 @@ in {
       "qmk-toolbox"
       "raycast"
       "signal"
-      "slack"
-      "tailscale"
       "thunderbird"
       "vagrant"
       "virtualbox"
-      "vivaldi"
       "vlc"
       "whatsapp"
       "zenmap"
-      "zoom"
     ];
     masApps = {
       "1Password for Safari" = 1569813296;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 14b8804..9c21ca1 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,7 +1,31 @@
 { pkgs, ... }: {
   home.stateVersion = "23.11";
   home.packages = with pkgs; [
+    _1password
+    _1password-gui
+    colordiff
+    dog
+    dos2unix
+    du-dust
+    element-desktop
+    gotop
+    htop
+    hub
+    jq
+    libreoffice
+    meld
+    mtr
+    nix-zsh-completions
+    rename
+    slack
     subversion
+    tailscale
+    tree
+    vivaldi
+    watch
+    wget
+    yq
+    zoom-us
   ];
   home.sessionVariables = {
     CLICLOLOR = 1;
@@ -10,6 +34,7 @@
   programs = {
     bat.enable = true;
     eza.enable = true;
+    firefox.enable = true;
     gh.enable = true;
     git = {
       enable = true;
diff --git a/modules/nixos/configuration.nix b/modules/nixos/configuration.nix
index b6a491e..ec2cc64 100644
--- a/modules/nixos/configuration.nix
+++ b/modules/nixos/configuration.nix
@@ -89,9 +89,7 @@ in {
     description = "Gene Liverman";
     extraGroups = [ "networkmanager" "wheel" "dialout" ];
     packages = with pkgs; [
-      firefox
-      slack
-    #  thunderbird
+     tailscale-systray
     ];
   };
 
@@ -103,29 +101,13 @@ in {
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    _1password
-    _1password-gui
-    bat
-    colordiff
     dconf2nix
-    dog
-    dos2unix
     gnomeExtensions.appindicator
     gnomeExtensions.caffeine
     gnomeExtensions.dash-to-panel
     gnomeExtensions.user-themes
-    gotop
-    htop
-    hub
-    mtr
     neofetch
-    nix-zsh-completions
     tilix
-    tree
-    vivaldi
-    watch
-    wget
-    jq
   ];
 
   # Some programs need SUID wrappers, can be configured further or are