From 91dab9ced8c8556b969f3d2f62722bff80eeab53 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Wed, 1 May 2024 11:14:00 +0900
Subject: [PATCH] Updates

---
 nixos/common/packages/default.nix | 29 +++++++++++++++++++++++++++++
 nixos/common/packages/small.nix   | 23 +++++++++++++++++++++++
 nixos/default.nix                 |  2 +-
 nixos/minimal.nix                 |  2 +-
 nixos/small.nix                   |  2 +-
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 nixos/common/packages/default.nix
 create mode 100644 nixos/common/packages/small.nix

diff --git a/nixos/common/packages/default.nix b/nixos/common/packages/default.nix
new file mode 100644
index 00000000..49c6f646
--- /dev/null
+++ b/nixos/common/packages/default.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }: {
+  imports = [ ./small.nix ];
+
+  # List packages installed in system profile
+  environment.systemPackages = with pkgs; [
+    nfs-utils    # nfs network share tools
+    nixfmt       # Formatting nix output
+    sbctl        # Secureboot Control
+    wget         # WebGet
+    killall      # Killall
+    curl         # Curl - For web requests
+    ncdu         # ncurses style browser for du/dust
+    du-dust      # better UI for 'du"
+    home-manager # manage dotfiles
+    iftop        # interface top - network usage
+    nload        # network load - Network usage graphs
+    iotop        # I/O top viewer - disk r/w, etc
+    fx           # Pretty print JSON
+    nodejs       # Required by fx
+    parted       # Disk partitioner / Formatter
+    e2fsprogs    # disk format utilities, like mkfs.ext4
+    openssl      # Used to generate certs, random strings, etc
+    tree         # CLI directory display software
+    nmap         # network mapping / discovery software
+    busybox      # General linux commands, nslookup, dig, etc
+    busybox      # Linux utilities
+    ethtool      # Ethernet troubleshooting:with
+  ];
+}
diff --git a/nixos/common/packages/small.nix b/nixos/common/packages/small.nix
new file mode 100644
index 00000000..cf5f7393
--- /dev/null
+++ b/nixos/common/packages/small.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }: { 
+  # List packages installed in system profile
+  environment.systemPackages = with pkgs; [
+    tmux         # terminal multiplexer
+    rbw          # CLI app for Bitwarden
+    dconf        # Required for stylix
+    ripgrep      # Better grep
+    git          # git!
+    bat          # Like cat, but with syntax highlighting
+    eza          # like ls, but prettier
+    duf          # replacement / prettier UI for df
+    gnupg        # GNU Privacy Guard
+    screen       # Terminal screen manager
+    btop         # like htop, but prettier
+    sshpass      # ssh password helper
+    fd           # alternative to "Find"
+    cryptsetup   # used to open LUKS devices
+    fish         # Shell
+    fastfetch    # system information viewer
+    zoxide       # Souped up "cd"
+    rsync        # copy/sync 
+  ];
+}
diff --git a/nixos/default.nix b/nixos/default.nix
index 2223ec94..a2fa2c90 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -14,7 +14,7 @@
 
     # Software
     ./common/software/cli/clean-hm.nix
-    ./common/software/packages
+    ./common/packages
 
     # NixOS Modules
     ./common/modules/fonts.nix           # Font Configs
diff --git a/nixos/minimal.nix b/nixos/minimal.nix
index cef30ead..969d7ea2 100644
--- a/nixos/minimal.nix
+++ b/nixos/minimal.nix
@@ -8,7 +8,7 @@
     ./common/services/fail2ban.nix
     
     # Software
-    ./common/software/packages/small.nix
+    ./common/packages/small.nix
 
     # NixOS Modules
     ./common/modules/networking.nix      # Initial Networking configs
diff --git a/nixos/small.nix b/nixos/small.nix
index 87793214..ca861e0e 100644
--- a/nixos/small.nix
+++ b/nixos/small.nix
@@ -13,7 +13,7 @@
     
     # Software
     ./common/software/cli/clean-hm.nix
-    ./common/software/packages/small.nix
+    ./common/packages/small.nix
 
     # NixOS Modules
     ./common/modules/networking.nix      # Initial Networking configs