From 58118e7ab8d05dd970cb57a6df77d2d694e072e3 Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Sat, 25 Mar 2023 09:21:37 -0700
Subject: [PATCH] Updated carbon config to reuse custom modules

Also cleaned up system packages in both gospel and carbon systems.
---
 systems/x86_64-linux/carbon/default.nix | 25 ++++++++++++++-----------
 systems/x86_64-linux/gospel/default.nix |  2 --
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix
index a6df33b..5be8293 100644
--- a/systems/x86_64-linux/carbon/default.nix
+++ b/systems/x86_64-linux/carbon/default.nix
@@ -13,13 +13,21 @@
     ./vpn.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
+  aa = {
+    nix.enable = true;
 
-  # Make ready for nix flakes
-  nix.package = pkgs.nixVersions.stable;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
+    suites.desktop.enable = true;
+    suites.gaming.enable = true;
+
+    tools.git.enable = true;
+    tools.zsh.enable = true;
+    tools.exa.enable = true;
+
+    apps.neovim.enable = true;
+    apps.tmux.enable = true;
+
+    services.printing.enable = true;
+  };
 
   networking = {
     hostName = "carbon"; # Define your hostname.
@@ -88,15 +96,10 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
-    vim_configurable # Using this instead of vim for python3 support
     wget
-    firefox
     wl-clipboard
     stow
-    tmux
     zsh
-    home-manager
     sanoid
     killall
     usbutils
diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index ce303e9..397542a 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -61,9 +61,7 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
-    git
     killall
     usbutils
     pavucontrol