10 files changed, 18 insertions, 57 deletions
diff --git a/snowfall/modules/nixos/apps/jq/default.nix b/snowfall/modules/nixos/apps/jq/default.nix
deleted file mode 100644
index 8e85750..0000000
--- a/snowfall/modules/nixos/apps/jq/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ options, config, lib, pkgs, namespace, ... }:
-
-with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.killall;
-in {
-  options.${namespace}.apps.jq = with types; {
-    enable = mkEnableOption "jq";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      jq
-    ];
-  };
-}
diff --git a/snowfall/modules/nixos/apps/killall/default.nix b/snowfall/modules/nixos/apps/killall/default.nix
deleted file mode 100644
index 6eee199..0000000
--- a/snowfall/modules/nixos/apps/killall/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ options, config, lib, pkgs, namespace, ... }:
-
-with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.killall;
-in {
-  options.${namespace}.apps.killall = with types; {
-    enable = mkEnableOption "killall";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      killall
-    ];
-  };
-}
diff --git a/snowfall/modules/nixos/apps/wget/default.nix b/snowfall/modules/nixos/apps/wget/default.nix
deleted file mode 100644
index 48dc3b8..0000000
--- a/snowfall/modules/nixos/apps/wget/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ options, config, lib, pkgs, namespace, ... }:
-
-with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.wget;
-in {
-  options.${namespace}.apps.wget = with types; {
-    enable = mkEnableOption "wget";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      wget
-    ];
-  };
-}
diff --git a/snowfall/modules/nixos/suites/common/default.nix b/snowfall/modules/nixos/suites/common/default.nix
index cbd4ba3..5d06456 100644
--- a/snowfall/modules/nixos/suites/common/default.nix
+++ b/snowfall/modules/nixos/suites/common/default.nix
@@ -12,10 +12,12 @@ in {
       hardware = {
         keyboard.enable = true;
       };
-      
-      apps = {
+
+      tools = {
         bash.enable = true;
         vim.enable = true;
+        git.enable = true;
+        misc.enable = true;
       };
     };
   };
diff --git a/snowfall/modules/nixos/apps/bash/default.nix b/snowfall/modules/nixos/tools/bash/default.nix
index 7589cfb..d3ec4bc 100644
--- a/snowfall/modules/nixos/apps/bash/default.nix
+++ b/snowfall/modules/nixos/tools/bash/default.nix
@@ -1,10 +1,10 @@
 { options, config, lib, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.bash;
+  cfg = config.${namespace}.tools.bash;
 in {
-  options.${namespace}.apps.bash = with types; {
-    enable = mkEnableOption "bash";
+  options.${namespace}.tools.bash = with types; {
+    enable = mkEnableOption "tools";
   };
 
   config = mkIf cfg.enable {
diff --git a/snowfall/modules/nixos/apps/bash/git-prompt.sh b/snowfall/modules/nixos/tools/bash/git-prompt.sh
index 5330e76..5330e76 100644
--- a/snowfall/modules/nixos/apps/bash/git-prompt.sh
+++ b/snowfall/modules/nixos/tools/bash/git-prompt.sh
diff --git a/snowfall/modules/nixos/apps/bash/prompt.sh b/snowfall/modules/nixos/tools/bash/prompt.sh
index ff3ebe0..ff3ebe0 100644
--- a/snowfall/modules/nixos/apps/bash/prompt.sh
+++ b/snowfall/modules/nixos/tools/bash/prompt.sh
diff --git a/snowfall/modules/nixos/apps/git/default.nix b/snowfall/modules/nixos/tools/git/default.nix
index e7a2afa..c619658 100644
--- a/snowfall/modules/nixos/apps/git/default.nix
+++ b/snowfall/modules/nixos/tools/git/default.nix
@@ -1,9 +1,9 @@
 { options, config, lib, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.git;
+  cfg = config.${namespace}.tools.git;
 in {
-  options.${namespace}.apps.git = with types; {
+  options.${namespace}.tools.git = with types; {
     enable = mkEnableOption "git";
   };
 
diff --git a/snowfall/modules/nixos/apps/moreutils/default.nix b/snowfall/modules/nixos/tools/misc/default.nix
index 9722c31..a06a141 100644
--- a/snowfall/modules/nixos/apps/moreutils/default.nix
+++ b/snowfall/modules/nixos/tools/misc/default.nix
@@ -1,15 +1,19 @@
 { options, config, lib, pkgs, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.moreutils;
+  cfg = config.${namespace}.tools.misc;
 in {
-  options.${namespace}.apps.moreutils = with types; {
-    enable = mkEnableOption "moreutils";
+  options.${namespace}.tools.misc = with types; {
+    enable = mkEnableOption "misc tools";
   };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
+      jq
+      killall
       moreutils
+      unzip
+      wget
     ];
   };
 }
diff --git a/snowfall/modules/nixos/apps/vim/default.nix b/snowfall/modules/nixos/tools/vim/default.nix
index 816aeda..9aa0a2c 100644
--- a/snowfall/modules/nixos/apps/vim/default.nix
+++ b/snowfall/modules/nixos/tools/vim/default.nix
@@ -1,9 +1,9 @@
 { options, config, lib, pkgs, namespace, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.apps.vim;
+  cfg = config.${namespace}.tools.vim;
 in {
-  options.${namespace}.apps.vim = with types; {
+  options.${namespace}.tools.vim = with types; {
     enable = mkEnableOption "vim";
   };