From 5f0a1d60989101f5fdcdbaa85e2f6aa2015024c4 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Fri, 9 May 2025 18:15:36 -0400
Subject: [PATCH] fix: additional tweaks

---
 common/utilities/default.nix     | 20 ++++++++++++++++++++
 machines/terra/configuration.nix |  1 +
 modules/containers.nix           |  1 +
 nixos/ags/home.nix               | 26 ++++++++++++--------------
 user/modules/git.nix             |  3 +++
 5 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 common/utilities/default.nix

diff --git a/common/utilities/default.nix b/common/utilities/default.nix
new file mode 100644
index 0000000..96f9f65
--- /dev/null
+++ b/common/utilities/default.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.my.utilities;
+in {
+  options.my.utilities = {
+    enable = lib.mkEnableOption "utilities";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      wget
+      zip
+      unzip
+    ];
+  };
+}
diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix
index dc7621f..9357afe 100644
--- a/machines/terra/configuration.nix
+++ b/machines/terra/configuration.nix
@@ -72,6 +72,7 @@
   my.hyprland.enable = true;
   my.libreoffice.enable = true;
   my.steam.enable = true;
+  my.utilities.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.michael = {
diff --git a/modules/containers.nix b/modules/containers.nix
index 83ff2b1..f5596db 100644
--- a/modules/containers.nix
+++ b/modules/containers.nix
@@ -11,5 +11,6 @@
   environment.systemPackages = with pkgs; [
     docker-client
     docker-compose
+    distrobox
   ];
 }
diff --git a/nixos/ags/home.nix b/nixos/ags/home.nix
index c2ffe95..bf11c30 100644
--- a/nixos/ags/home.nix
+++ b/nixos/ags/home.nix
@@ -18,20 +18,18 @@ in {
     programs.ags = {
       enable = true;
 
-      extraPackages = with pkgs; [
-        bun
-        which
-        fzf
-        # inputs.matugen.packages.${system}.default
-        slurp
-        wf-recorder
-        wl-clipboard
-        wayshot
-        swappy
-        pavucontrol
-        networkmanager
-        gtk3
-      ];
+      extraPackages =
+        (with pkgs; [
+          fzf
+        ])
+        ++ (with inputs.ags.packages.${pkgs.system}; [
+          battery
+          hyprland
+          mpris
+          network
+          tray
+          wireplumber
+        ]);
     };
 
     home.packages = with pkgs; [
diff --git a/user/modules/git.nix b/user/modules/git.nix
index e3f966b..a569765 100644
--- a/user/modules/git.nix
+++ b/user/modules/git.nix
@@ -5,8 +5,11 @@
 }: {
   home.packages = with pkgs; [
     git-lfs
+    lazygit
   ];
 
+  home.shellAliases.lg = "lazygit";
+
   # Use pkgs.gitAndTools.gitFull in order to get libsecret support
   programs.git = {
     enable = true;