79 files changed, 111 insertions, 82 deletions
diff --git a/modules/communication/default.nix b/modules/communication/default.nix
new file mode 100644
index 0000000..ade90bb
--- /dev/null
+++ b/modules/communication/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./email
+    ./neomutt
+  ];
+}
diff --git a/modules/programs/email/default.nix b/modules/communication/email/default.nix
index 3a57cf0..3a57cf0 100644
--- a/modules/programs/email/default.nix
+++ b/modules/communication/email/default.nix
diff --git a/modules/programs/neomutt/assertions.nix b/modules/communication/neomutt/assertions.nix
index 989d273..989d273 100644
--- a/modules/programs/neomutt/assertions.nix
+++ b/modules/communication/neomutt/assertions.nix
diff --git a/modules/programs/neomutt/default.nix b/modules/communication/neomutt/default.nix
index 3626341..3626341 100644
--- a/modules/programs/neomutt/default.nix
+++ b/modules/communication/neomutt/default.nix
diff --git a/modules/programs/neomutt/theme.nix b/modules/communication/neomutt/theme.nix
index 52845ee..52845ee 100644
--- a/modules/programs/neomutt/theme.nix
+++ b/modules/communication/neomutt/theme.nix
diff --git a/modules/default.nix b/modules/default.nix
index 4cb90af..3a601ee 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,10 +2,24 @@
 
 {
   imports = [
+    ./communication
     ./desktop
+    ./development
+    ./file-management
     ./fonts
     ./gaming
+    ./media
+    ./office
     ./scripts
-    ./programs
+    ./security
+    ./system
+    ./terminal
+    ./web
   ];
+
+  config = {
+    xdg.mimeApps = {
+      enable = true;
+    };
+  };
 }
diff --git a/modules/programs/bruno/default.nix b/modules/development/bruno/default.nix
index 7205f31..7205f31 100644
--- a/modules/programs/bruno/default.nix
+++ b/modules/development/bruno/default.nix
diff --git a/modules/development/default.nix b/modules/development/default.nix
new file mode 100644
index 0000000..1e79868
--- /dev/null
+++ b/modules/development/default.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  imports = [
+    ./bruno
+    ./delta
+    ./git
+    ./lazygit
+    ./nixvim
+    ./opencode
+    ./qemu
+    ./vscodium
+  ];
+}
diff --git a/modules/programs/delta/default.nix b/modules/development/delta/default.nix
index 90e35d4..90e35d4 100644
--- a/modules/programs/delta/default.nix
+++ b/modules/development/delta/default.nix
diff --git a/modules/programs/git/assertions.nix b/modules/development/git/assertions.nix
index fbe5d3c..fbe5d3c 100644
--- a/modules/programs/git/assertions.nix
+++ b/modules/development/git/assertions.nix
diff --git a/modules/programs/git/default.nix b/modules/development/git/default.nix
index c1aade5..c1aade5 100644
--- a/modules/programs/git/default.nix
+++ b/modules/development/git/default.nix
diff --git a/modules/programs/lazygit/default.nix b/modules/development/lazygit/default.nix
index cf46e9a..cf46e9a 100644
--- a/modules/programs/lazygit/default.nix
+++ b/modules/development/lazygit/default.nix
diff --git a/modules/programs/nixvim/colorscheme.nix b/modules/development/nixvim/colorscheme.nix
index ba81634..ba81634 100644
--- a/modules/programs/nixvim/colorscheme.nix
+++ b/modules/development/nixvim/colorscheme.nix
diff --git a/modules/programs/nixvim/default.nix b/modules/development/nixvim/default.nix
index c7978d4..c7978d4 100644
--- a/modules/programs/nixvim/default.nix
+++ b/modules/development/nixvim/default.nix
diff --git a/modules/programs/nixvim/keymaps.nix b/modules/development/nixvim/keymaps.nix
index 4e4b35a..4e4b35a 100644
--- a/modules/programs/nixvim/keymaps.nix
+++ b/modules/development/nixvim/keymaps.nix
diff --git a/modules/programs/nixvim/plugins/cmp.nix b/modules/development/nixvim/plugins/cmp.nix
index 683e0d3..683e0d3 100644
--- a/modules/programs/nixvim/plugins/cmp.nix
+++ b/modules/development/nixvim/plugins/cmp.nix
diff --git a/modules/programs/nixvim/plugins/comment.nix b/modules/development/nixvim/plugins/comment.nix
index cc1b9cb..cc1b9cb 100644
--- a/modules/programs/nixvim/plugins/comment.nix
+++ b/modules/development/nixvim/plugins/comment.nix
diff --git a/modules/programs/nixvim/plugins/default.nix b/modules/development/nixvim/plugins/default.nix
index a263c51..a263c51 100644
--- a/modules/programs/nixvim/plugins/default.nix
+++ b/modules/development/nixvim/plugins/default.nix
diff --git a/modules/programs/nixvim/plugins/gitsigns.nix b/modules/development/nixvim/plugins/gitsigns.nix
index ea99eba..ea99eba 100644
--- a/modules/programs/nixvim/plugins/gitsigns.nix
+++ b/modules/development/nixvim/plugins/gitsigns.nix
diff --git a/modules/programs/nixvim/plugins/indent-blankline.nix b/modules/development/nixvim/plugins/indent-blankline.nix
index eb2674a..eb2674a 100644
--- a/modules/programs/nixvim/plugins/indent-blankline.nix
+++ b/modules/development/nixvim/plugins/indent-blankline.nix
diff --git a/modules/programs/nixvim/plugins/lsp.nix b/modules/development/nixvim/plugins/lsp.nix
index 7fc3ddd..7fc3ddd 100644
--- a/modules/programs/nixvim/plugins/lsp.nix
+++ b/modules/development/nixvim/plugins/lsp.nix
diff --git a/modules/programs/nixvim/plugins/lualine.nix b/modules/development/nixvim/plugins/lualine.nix
index 72f34be..72f34be 100644
--- a/modules/programs/nixvim/plugins/lualine.nix
+++ b/modules/development/nixvim/plugins/lualine.nix
diff --git a/modules/programs/nixvim/plugins/luasnip.nix b/modules/development/nixvim/plugins/luasnip.nix
index 60571e9..60571e9 100644
--- a/modules/programs/nixvim/plugins/luasnip.nix
+++ b/modules/development/nixvim/plugins/luasnip.nix
diff --git a/modules/programs/nixvim/plugins/noice.nix b/modules/development/nixvim/plugins/noice.nix
index d466506..d466506 100644
--- a/modules/programs/nixvim/plugins/noice.nix
+++ b/modules/development/nixvim/plugins/noice.nix
diff --git a/modules/programs/nixvim/plugins/nvim-tree.nix b/modules/development/nixvim/plugins/nvim-tree.nix
index 2ad6570..2ad6570 100644
--- a/modules/programs/nixvim/plugins/nvim-tree.nix
+++ b/modules/development/nixvim/plugins/nvim-tree.nix
diff --git a/modules/programs/nixvim/plugins/telescope.nix b/modules/development/nixvim/plugins/telescope.nix
index b9678fc..b9678fc 100644
--- a/modules/programs/nixvim/plugins/telescope.nix
+++ b/modules/development/nixvim/plugins/telescope.nix
diff --git a/modules/programs/nixvim/plugins/treesitter.nix b/modules/development/nixvim/plugins/treesitter.nix
index 035ac7a..035ac7a 100644
--- a/modules/programs/nixvim/plugins/treesitter.nix
+++ b/modules/development/nixvim/plugins/treesitter.nix
diff --git a/modules/programs/nixvim/plugins/web-devicons.nix b/modules/development/nixvim/plugins/web-devicons.nix
index 3c6ad86..3c6ad86 100644
--- a/modules/programs/nixvim/plugins/web-devicons.nix
+++ b/modules/development/nixvim/plugins/web-devicons.nix
diff --git a/modules/programs/nixvim/plugins/which-key.nix b/modules/development/nixvim/plugins/which-key.nix
index 18018e7..18018e7 100644
--- a/modules/programs/nixvim/plugins/which-key.nix
+++ b/modules/development/nixvim/plugins/which-key.nix
diff --git a/modules/programs/opencode/default.nix b/modules/development/opencode/default.nix
index 0b3f0b6..0b3f0b6 100644
--- a/modules/programs/opencode/default.nix
+++ b/modules/development/opencode/default.nix
diff --git a/modules/programs/qemu/default.nix b/modules/development/qemu/default.nix
index b34264c..b34264c 100644
--- a/modules/programs/qemu/default.nix
+++ b/modules/development/qemu/default.nix
diff --git a/modules/programs/vscodium/default.nix b/modules/development/vscodium/default.nix
index a8cbd37..a8cbd37 100644
--- a/modules/programs/vscodium/default.nix
+++ b/modules/development/vscodium/default.nix
diff --git a/modules/file-management/default.nix b/modules/file-management/default.nix
new file mode 100644
index 0000000..7d75b35
--- /dev/null
+++ b/modules/file-management/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  imports = [
+    ./lf
+    ./lsd
+    ./ouch
+  ];
+}
diff --git a/modules/programs/lf/default.nix b/modules/file-management/lf/default.nix
index 47a950f..47a950f 100644
--- a/modules/programs/lf/default.nix
+++ b/modules/file-management/lf/default.nix
diff --git a/modules/programs/lf/icons b/modules/file-management/lf/icons
index 8697cf2..8697cf2 100644
--- a/modules/programs/lf/icons
+++ b/modules/file-management/lf/icons
diff --git a/modules/programs/lf/lfrc b/modules/file-management/lf/lfrc
index 7ae847c..7ae847c 100644
--- a/modules/programs/lf/lfrc
+++ b/modules/file-management/lf/lfrc
diff --git a/modules/programs/lsd/default.nix b/modules/file-management/lsd/default.nix
index 99fe1bd..99fe1bd 100644
--- a/modules/programs/lsd/default.nix
+++ b/modules/file-management/lsd/default.nix
diff --git a/modules/programs/ouch/default.nix b/modules/file-management/ouch/default.nix
index 2b4411e..2b4411e 100644
--- a/modules/programs/ouch/default.nix
+++ b/modules/file-management/ouch/default.nix
diff --git a/modules/media/default.nix b/modules/media/default.nix
new file mode 100644
index 0000000..a26aa08
--- /dev/null
+++ b/modules/media/default.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  imports = [
+    ./feh
+    ./ffmpeg
+    ./impala
+    ./maim
+    ./pamixer
+    ./playerctl
+    ./slop
+    ./vlc
+  ];
+}
diff --git a/modules/programs/feh/default.nix b/modules/media/feh/default.nix
index 401a68a..401a68a 100644
--- a/modules/programs/feh/default.nix
+++ b/modules/media/feh/default.nix
diff --git a/modules/programs/ffmpeg/default.nix b/modules/media/ffmpeg/default.nix
index d86b5a6..d86b5a6 100644
--- a/modules/programs/ffmpeg/default.nix
+++ b/modules/media/ffmpeg/default.nix
diff --git a/modules/programs/impala/default.nix b/modules/media/impala/default.nix
index 9c4d1f4..9c4d1f4 100644
--- a/modules/programs/impala/default.nix
+++ b/modules/media/impala/default.nix
diff --git a/modules/programs/maim/default.nix b/modules/media/maim/default.nix
index 3e30c88..3e30c88 100644
--- a/modules/programs/maim/default.nix
+++ b/modules/media/maim/default.nix
diff --git a/modules/programs/pamixer/default.nix b/modules/media/pamixer/default.nix
index b84e9cf..b84e9cf 100644
--- a/modules/programs/pamixer/default.nix
+++ b/modules/media/pamixer/default.nix
diff --git a/modules/programs/playerctl/default.nix b/modules/media/playerctl/default.nix
index d501abd..d501abd 100644
--- a/modules/programs/playerctl/default.nix
+++ b/modules/media/playerctl/default.nix
diff --git a/modules/programs/slop/default.nix b/modules/media/slop/default.nix
index c86181b..c86181b 100644
--- a/modules/programs/slop/default.nix
+++ b/modules/media/slop/default.nix
diff --git a/modules/programs/vlc/default.nix b/modules/media/vlc/default.nix
index 8069f3e..8069f3e 100644
--- a/modules/programs/vlc/default.nix
+++ b/modules/media/vlc/default.nix
diff --git a/modules/office/default.nix b/modules/office/default.nix
new file mode 100644
index 0000000..73f837b
--- /dev/null
+++ b/modules/office/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./zathura
+  ];
+}
diff --git a/modules/programs/zathura/default.nix b/modules/office/zathura/default.nix
index 167b04f..167b04f 100644
--- a/modules/programs/zathura/default.nix
+++ b/modules/office/zathura/default.nix
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
deleted file mode 100644
index 4039f0b..0000000
--- a/modules/programs/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ ... }:
-
-# Tools - Collection of tool configurations (browsers, editors, utilities, etc.)
-{
-  imports = [
-    ./aria2
-    ./bat
-    ./bluetui
-    ./bottom
-    ./brave
-    ./brightnessctl
-    ./bruno
-    ./delta
-    ./enteauth
-    ./feh
-    ./ffmpeg
-    ./fzf
-    ./git
-    ./gpg
-    ./htop
-    ./impala
-    ./kitty
-    ./lazygit
-    ./less
-    ./lf
-    ./lsd
-    ./maim
-    ./neomutt
-    ./nixvim
-    ./nvtop
-    ./opencode
-    ./ssh
-    ./openvpn
-    ./ouch
-    ./pamixer
-    ./gopass
-    ./email
-    ./playerctl
-    ./qemu
-    ./slop
-    ./starship
-    ./systemctl-tui
-    ./tmux
-    ./tor
-    ./vlc
-    ./vscodium
-    ./zathura
-    ./zsh
-  ];
-
-  config = {
-    xdg.mimeApps = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/programs/tor/default.nix b/modules/programs/tor/default.nix
deleted file mode 100644
index 3a19c8a..0000000
--- a/modules/programs/tor/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-
-# Tor - Local proxy server for connecting to the tor network
-{
-  options.programs.tor = {
-    enable = lib.mkEnableOption "Enables tor.";
-    package = lib.mkPackageOption pkgs "tor" { };
-  };
-
-  config = lib.mkIf config.programs.tor.enable {
-    home.packages = [ config.programs.tor.package ];
-
-    home.file.".config/tor/torrc".text = ''
-      SocksPort 127.0.0.1:9050
-      CookieAuthentication 1
-      # Prevents Tor from writing to disk too much
-      AvoidDiskWrites 1
-    '';
-  };
-}
diff --git a/modules/security/default.nix b/modules/security/default.nix
new file mode 100644
index 0000000..e9d7208
--- /dev/null
+++ b/modules/security/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  imports = [
+    ./enteauth
+    ./gopass
+    ./gpg
+    ./openvpn
+    ./ssh
+  ];
+}
diff --git a/modules/programs/enteauth/default.nix b/modules/security/enteauth/default.nix
index a332bf3..a332bf3 100644
--- a/modules/programs/enteauth/default.nix
+++ b/modules/security/enteauth/default.nix
diff --git a/modules/programs/gopass/default.nix b/modules/security/gopass/default.nix
index 3990f7f..3990f7f 100644
--- a/modules/programs/gopass/default.nix
+++ b/modules/security/gopass/default.nix
diff --git a/modules/programs/gpg/default.nix b/modules/security/gpg/default.nix
index 858f79f..858f79f 100644
--- a/modules/programs/gpg/default.nix
+++ b/modules/security/gpg/default.nix
diff --git a/modules/programs/openvpn/default.nix b/modules/security/openvpn/default.nix
index d0edef3..d0edef3 100644
--- a/modules/programs/openvpn/default.nix
+++ b/modules/security/openvpn/default.nix
diff --git a/modules/programs/ssh/default.nix b/modules/security/ssh/default.nix
index 7e8752a..7e8752a 100644
--- a/modules/programs/ssh/default.nix
+++ b/modules/security/ssh/default.nix
diff --git a/modules/programs/ssh/git.nix b/modules/security/ssh/git.nix
index 9683629..9683629 100644
--- a/modules/programs/ssh/git.nix
+++ b/modules/security/ssh/git.nix
diff --git a/modules/programs/bluetui/default.nix b/modules/system/bluetui/default.nix
index a2a97ec..a2a97ec 100644
--- a/modules/programs/bluetui/default.nix
+++ b/modules/system/bluetui/default.nix
diff --git a/modules/programs/bottom/default.nix b/modules/system/bottom/default.nix
index 3ecda86..3ecda86 100644
--- a/modules/programs/bottom/default.nix
+++ b/modules/system/bottom/default.nix
diff --git a/modules/programs/brightnessctl/default.nix b/modules/system/brightnessctl/default.nix
index cea3517..cea3517 100644
--- a/modules/programs/brightnessctl/default.nix
+++ b/modules/system/brightnessctl/default.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..88e5087
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  imports = [
+    ./bluetui
+    ./bottom
+    ./brightnessctl
+    ./htop
+    ./nvtop
+    ./systemctl-tui
+  ];
+}
diff --git a/modules/programs/htop/default.nix b/modules/system/htop/default.nix
index 7781464..7781464 100644
--- a/modules/programs/htop/default.nix
+++ b/modules/system/htop/default.nix
diff --git a/modules/programs/nvtop/default.nix b/modules/system/nvtop/default.nix
index 19dd61b..19dd61b 100644
--- a/modules/programs/nvtop/default.nix
+++ b/modules/system/nvtop/default.nix
diff --git a/modules/programs/systemctl-tui/default.nix b/modules/system/systemctl-tui/default.nix
index 77dca8c..77dca8c 100644
--- a/modules/programs/systemctl-tui/default.nix
+++ b/modules/system/systemctl-tui/default.nix
diff --git a/modules/programs/bat/base16.mustache.tmTheme b/modules/terminal/bat/base16.mustache.tmTheme
index 6b2cd5b..6b2cd5b 100644
--- a/modules/programs/bat/base16.mustache.tmTheme
+++ b/modules/terminal/bat/base16.mustache.tmTheme
diff --git a/modules/programs/bat/default.nix b/modules/terminal/bat/default.nix
index 3c962a3..3c962a3 100644
--- a/modules/programs/bat/default.nix
+++ b/modules/terminal/bat/default.nix
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
new file mode 100644
index 0000000..7a3ffcc
--- /dev/null
+++ b/modules/terminal/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  imports = [
+    ./bat
+    ./fzf
+    ./kitty
+    ./less
+    ./starship
+    ./tmux
+    ./zsh
+  ];
+}
diff --git a/modules/programs/fzf/assertions.nix b/modules/terminal/fzf/assertions.nix
index 7c2e79c..7c2e79c 100644
--- a/modules/programs/fzf/assertions.nix
+++ b/modules/terminal/fzf/assertions.nix
diff --git a/modules/programs/fzf/default.nix b/modules/terminal/fzf/default.nix
index 7671b3c..7671b3c 100644
--- a/modules/programs/fzf/default.nix
+++ b/modules/terminal/fzf/default.nix
diff --git a/modules/programs/kitty/default.nix b/modules/terminal/kitty/default.nix
index 3701180..3701180 100644
--- a/modules/programs/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
diff --git a/modules/programs/less/default.nix b/modules/terminal/less/default.nix
index 516377d..516377d 100644
--- a/modules/programs/less/default.nix
+++ b/modules/terminal/less/default.nix
diff --git a/modules/programs/starship/default.nix b/modules/terminal/starship/default.nix
index ae5e082..ae5e082 100644
--- a/modules/programs/starship/default.nix
+++ b/modules/terminal/starship/default.nix
diff --git a/modules/programs/tmux/default.nix b/modules/terminal/tmux/default.nix
index e2e76c9..e2e76c9 100644
--- a/modules/programs/tmux/default.nix
+++ b/modules/terminal/tmux/default.nix
diff --git a/modules/programs/zsh/default.nix b/modules/terminal/zsh/default.nix
index f3bdbb1..f3bdbb1 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/terminal/zsh/default.nix
diff --git a/modules/programs/zsh/nix-aliases.sh b/modules/terminal/zsh/nix-aliases.sh
index 0a2f453..0a2f453 100644
--- a/modules/programs/zsh/nix-aliases.sh
+++ b/modules/terminal/zsh/nix-aliases.sh
diff --git a/modules/programs/aria2/default.nix b/modules/web/aria2/default.nix
index 79c6f8e..79c6f8e 100644
--- a/modules/programs/aria2/default.nix
+++ b/modules/web/aria2/default.nix
diff --git a/modules/programs/brave/default.nix b/modules/web/brave/default.nix
index 936da6a..936da6a 100644
--- a/modules/programs/brave/default.nix
+++ b/modules/web/brave/default.nix
diff --git a/modules/web/default.nix b/modules/web/default.nix
new file mode 100644
index 0000000..fa54cad
--- /dev/null
+++ b/modules/web/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./aria2
+    ./brave
+  ];
+}