hi

146 files changed, 476 insertions, 98 deletions

diff --git a/applications/cli/dog/default.nix b/applications/cli/dog/default.nix
deleted file mode 100644
index 34795b5..0000000
--- a/applications/cli/dog/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ dogdns ]; }
diff --git a/applications/cli/fd/default.nix b/applications/cli/fd/default.nix
deleted file mode 100644
index ba676b1..0000000
--- a/applications/cli/fd/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ fd ]; }
diff --git a/applications/cli/gemini/default.nix b/applications/cli/gemini/default.nix
deleted file mode 100644
index c76ecf7..0000000
--- a/applications/cli/gemini/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-  imports = [ ./bollux ];
-  home.packages = with pkgs; [ amfora gmni ];
-}
diff --git a/applications/cli/nvtop/default.nix b/applications/cli/nvtop/default.nix
deleted file mode 100644
index b0a672b..0000000
--- a/applications/cli/nvtop/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ nvtopPackages.nvidia ]; }
diff --git a/applications/cli/ripgrep/default.nix b/applications/cli/ripgrep/default.nix
deleted file mode 100644
index 5b127fb..0000000
--- a/applications/cli/ripgrep/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ripgrep-all ];
-  # programs.ripgrep.enable = true;
-}
diff --git a/applications/cli/rm-improved/default.nix b/applications/cli/rm-improved/default.nix
deleted file mode 100644
index a7cbebf..0000000
--- a/applications/cli/rm-improved/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ rm-improved ]; }
diff --git a/applications/cli/shell/default.nix b/applications/cli/shell/default.nix
deleted file mode 100644
index bee67ef..0000000
--- a/applications/cli/shell/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ shellclear ]; }
diff --git a/applications/cli/tealdeer/default.nix b/applications/cli/tealdeer/default.nix
deleted file mode 100644
index 54befa9..0000000
--- a/applications/cli/tealdeer/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ tealdeer ]; }
diff --git a/applications/default.nix b/applications/default.nix
deleted file mode 100644
index c43061b..0000000
--- a/applications/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ./cli ./gui ./tui ]; }
diff --git a/applications/gui/cool-retro-term/default.nix b/applications/gui/cool-retro-term/default.nix
deleted file mode 100644
index 6e5915e..0000000
--- a/applications/gui/cool-retro-term/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ cool-retro-term ]; }
diff --git a/applications/gui/gemini/default.nix b/applications/gui/gemini/default.nix
deleted file mode 100644
index 28d08de..0000000
--- a/applications/gui/gemini/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ geopard ]; }
diff --git a/applications/gui/kitty/default.nix b/applications/gui/kitty/default.nix
deleted file mode 100644
index 193f352..0000000
--- a/applications/gui/kitty/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { programs.kitty.enable = true; }
diff --git a/applications/gui/warp/default.nix b/applications/gui/warp/default.nix
deleted file mode 100644
index 347c651..0000000
--- a/applications/gui/warp/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ warp-terminal ]; }
diff --git a/applications/tui/default.nix b/applications/tui/default.nix
deleted file mode 100644
index 9ddeab0..0000000
--- a/applications/tui/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ./steam-tui ]; }
diff --git a/applications/tui/steam-tui/default.nix b/applications/tui/steam-tui/default.nix
deleted file mode 100644
index c0b1d81..0000000
--- a/applications/tui/steam-tui/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ steam-tui ]; }
diff --git a/tools/languages/jvm/default.nix b/cli/ani-cli/default.nix
index a132dd8..723bfb9 100644
--- a/tools/languages/jvm/default.nix
+++ b/cli/ani-cli/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    #kotlin 
+    ani-cli
   ];
 }
diff --git a/cli/asciinema/default.nix b/cli/asciinema/default.nix
new file mode 100644
index 0000000..750c52d
--- /dev/null
+++ b/cli/asciinema/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    asciinema
+  ];
+}
diff --git a/applications/cli/bat/default.nix b/cli/bat/default.nix
index c1dad3f..c1dad3f 100644
--- a/applications/cli/bat/default.nix
+++ b/cli/bat/default.nix
diff --git a/applications/cli/default.nix b/cli/default.nix
index ba319d7..4d14257 100644
--- a/applications/cli/default.nix
+++ b/cli/default.nix
@@ -1,15 +1,21 @@
 _: {
   imports = [
+    ./ani-cli
+    ./asciinema
     ./bat
     ./dog
     ./eza
     ./fd
-    ./gemini
+    ./meta
+    ./navi
+    ./ncdu
+    ./nethogs
+    ./nnn
     # ./nvtop
-    ./ripgrep
     ./rm-improved
-    ./shell
+    ./sloc
     ./starship
     ./tealdeer
+    ./todo
   ];
 }
diff --git a/cli/dog/default.nix b/cli/dog/default.nix
new file mode 100644
index 0000000..437a1a0
--- /dev/null
+++ b/cli/dog/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    dogdns
+  ];
+}
diff --git a/applications/cli/eza/default.nix b/cli/eza/default.nix
index a8d2f57..a8d2f57 100644
--- a/applications/cli/eza/default.nix
+++ b/cli/eza/default.nix
diff --git a/cli/fd/default.nix b/cli/fd/default.nix
new file mode 100644
index 0000000..92e0e28
--- /dev/null
+++ b/cli/fd/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    fd
+  ];
+}
diff --git a/cli/meta/ai/default.nix b/cli/meta/ai/default.nix
new file mode 100644
index 0000000..fe42707
--- /dev/null
+++ b/cli/meta/ai/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    ollama-cuda
+    shell-gpt
+  ];
+}
diff --git a/cli/meta/default.nix b/cli/meta/default.nix
new file mode 100644
index 0000000..073fc94
--- /dev/null
+++ b/cli/meta/default.nix
@@ -0,0 +1,10 @@
+_: {
+  imports = [
+    ./ai
+    ./git
+    ./irc
+    ./scripting
+    ./shell
+    ./smolnet
+  ];
+}
diff --git a/cli/meta/git/default.nix b/cli/meta/git/default.nix
new file mode 100644
index 0000000..630285c
--- /dev/null
+++ b/cli/meta/git/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gh
+    onefetch
+    gitoxide
+  ];
+}
diff --git a/cli/meta/irc/default.nix b/cli/meta/irc/default.nix
new file mode 100644
index 0000000..adde57d
--- /dev/null
+++ b/cli/meta/irc/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    catgirl
+    pounce
+  ];
+}
diff --git a/cli/meta/scripting/charmbracelet/default.nix b/cli/meta/scripting/charmbracelet/default.nix
new file mode 100644
index 0000000..e3b78df
--- /dev/null
+++ b/cli/meta/scripting/charmbracelet/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gum
+    mods
+  ];
+}
diff --git a/cli/meta/scripting/default.nix b/cli/meta/scripting/default.nix
new file mode 100644
index 0000000..fb6e062
--- /dev/null
+++ b/cli/meta/scripting/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  imports = [
+    ./charmbracelet
+    ./ripgrep
+  ];
+
+  home.packages = with pkgs; [
+    moreutils
+    pup
+  ];
+}
diff --git a/cli/meta/scripting/ripgrep/default.nix b/cli/meta/scripting/ripgrep/default.nix
new file mode 100644
index 0000000..00de07f
--- /dev/null
+++ b/cli/meta/scripting/ripgrep/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  programs.ripgrep.enable = true;
+
+  home.packages = with pkgs; [
+    ripgrep-all
+  ];
+}
diff --git a/cli/meta/shell/default.nix b/cli/meta/shell/default.nix
new file mode 100644
index 0000000..0d60ba0
--- /dev/null
+++ b/cli/meta/shell/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    shellclear
+  ];
+}
diff --git a/applications/cli/gemini/bollux/default.nix b/cli/meta/smolnet/bollux/default.nix
index c869c48..2079052 100644
--- a/applications/cli/gemini/bollux/default.nix
+++ b/cli/meta/smolnet/bollux/default.nix
@@ -4,10 +4,20 @@ let
     pkgs.stdenvNoCC.mkDerivation rec {
       pname = "bollux";
       version = "0.4.1";
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-      buildInputs = [ pkgs.bashInteractive ];
+
+      nativeBuildInputs = [
+        pkgs.makeWrapper
+      ];
+
+      buildInputs = [
+        pkgs.bashInteractive
+      ];
+
       dontBuild = true;
-      makeFlags = [ "PREFIX=$(out)" ];
+
+      makeFlags = [
+        "PREFIX=$(out)"
+      ];
 
       src = pkgs.fetchFromGitea {
         domain = "tildegit.org";
diff --git a/applications/cli/gemini/bollux/fix_lesskey_nag.patch b/cli/meta/smolnet/bollux/fix_lesskey_nag.patch
index 329b886..329b886 100644
--- a/applications/cli/gemini/bollux/fix_lesskey_nag.patch
+++ b/cli/meta/smolnet/bollux/fix_lesskey_nag.patch
diff --git a/cli/meta/smolnet/default.nix b/cli/meta/smolnet/default.nix
new file mode 100644
index 0000000..8cb44a6
--- /dev/null
+++ b/cli/meta/smolnet/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  imports = [
+    ./bollux
+  ];
+
+  home.packages = with pkgs; [
+    amfora
+    gmni
+    phetch
+  ];
+}
diff --git a/cli/navi/default.nix b/cli/navi/default.nix
new file mode 100644
index 0000000..5b462b5
--- /dev/null
+++ b/cli/navi/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    navi
+  ];
+}
diff --git a/cli/ncdu/default.nix b/cli/ncdu/default.nix
new file mode 100644
index 0000000..1c0bfca
--- /dev/null
+++ b/cli/ncdu/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    ncdu
+  ];
+}
diff --git a/cli/nethogs/default.nix b/cli/nethogs/default.nix
new file mode 100644
index 0000000..7934eb8
--- /dev/null
+++ b/cli/nethogs/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nethogs
+  ];
+}
diff --git a/cli/nnn/default.nix b/cli/nnn/default.nix
new file mode 100644
index 0000000..06fa7c9
--- /dev/null
+++ b/cli/nnn/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.nnn.enable = true;
+}
diff --git a/cli/nvtop/default.nix b/cli/nvtop/default.nix
new file mode 100644
index 0000000..929f5e5
--- /dev/null
+++ b/cli/nvtop/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nvtopPackages.nvidia
+  ];
+}
diff --git a/cli/rm-improved/default.nix b/cli/rm-improved/default.nix
new file mode 100644
index 0000000..d4a5fc1
--- /dev/null
+++ b/cli/rm-improved/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    rm-improved
+  ];
+}
diff --git a/cli/sloc/default.nix b/cli/sloc/default.nix
new file mode 100644
index 0000000..6249b05
--- /dev/null
+++ b/cli/sloc/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    sloc
+  ];
+}
diff --git a/applications/cli/starship/default.nix b/cli/starship/default.nix
index a23ed9c..0088038 100644
--- a/applications/cli/starship/default.nix
+++ b/cli/starship/default.nix
@@ -1,8 +1,12 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ starship ];
+  home.packages = with pkgs; [
+    starship
+  ];
+
   programs.starship = {
     enable = true;
     enableFishIntegration = true;
+
     # I CBA to update the formatting to match the rest of the expressions, since
     # this is a one-off that I tend to import over directly from starship.
     settings = {
diff --git a/cli/tealdeer/default.nix b/cli/tealdeer/default.nix
new file mode 100644
index 0000000..7ee39f1
--- /dev/null
+++ b/cli/tealdeer/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    tealdeer
+  ];
+}
diff --git a/cli/todo/default.nix b/cli/todo/default.nix
new file mode 100644
index 0000000..f1c841d
--- /dev/null
+++ b/cli/todo/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    todo
+  ];
+}
diff --git a/desktop/wayland/default.nix b/desktop/wayland/default.nix
deleted file mode 100644
index a0e1328..0000000
--- a/desktop/wayland/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ./hyprland ./waybar ]; }
diff --git a/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk b/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk
deleted file mode 100755
index 9035cbb..0000000
--- a/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env dash
-
-THEME='WhiteSur-Dark'
-ICONS='WhiteSur-dark'
-FONT='SF Pro Text'
-CURSOR='WhiteSur-cursors'
-
-SCHEMA='gsettings set org.gnome.desktop.interface'
-
-apply_themes() {
-	${SCHEMA} gtk-theme "$THEME"
-	${SCHEMA} icon-theme "$ICONS"
-	${SCHEMA} cursor-theme "$CURSOR"
-	${SCHEMA} font-name "$FONT"
-}
-
-apply_themes
diff --git a/gui/ahoviewer/default.nix b/gui/ahoviewer/default.nix
new file mode 100644
index 0000000..c6907e1
--- /dev/null
+++ b/gui/ahoviewer/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    ahoviewer
+  ];
+}
diff --git a/gui/anki/default.nix b/gui/anki/default.nix
new file mode 100644
index 0000000..8e5655c
--- /dev/null
+++ b/gui/anki/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    anki-bin
+  ];
+}
diff --git a/gui/cool-retro-term/default.nix b/gui/cool-retro-term/default.nix
new file mode 100644
index 0000000..e53937b
--- /dev/null
+++ b/gui/cool-retro-term/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cool-retro-term
+  ];
+}
diff --git a/applications/gui/default.nix b/gui/default.nix
index a14d3b3..a3ec2d2 100644
--- a/applications/gui/default.nix
+++ b/gui/default.nix
@@ -1,8 +1,11 @@
 _: {
   imports = [
+    ./ahoviewer
+    ./anki
     ./cool-retro-term
-    ./gemini
+    # ./foot
     # ./kitty
+    ./meta
     # ./warp
   ];
 }
diff --git a/gui/foot/default.nix b/gui/foot/default.nix
new file mode 100644
index 0000000..8945d61
--- /dev/null
+++ b/gui/foot/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.foot.enable = true;
+}
diff --git a/gui/kitty/default.nix b/gui/kitty/default.nix
new file mode 100644
index 0000000..ed2d7e7
--- /dev/null
+++ b/gui/kitty/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.kitty.enable = true;
+}
diff --git a/gui/meta/default.nix b/gui/meta/default.nix
new file mode 100644
index 0000000..7959d11
--- /dev/null
+++ b/gui/meta/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./gemini
+  ];
+}
diff --git a/gui/meta/gemini/default.nix b/gui/meta/gemini/default.nix
new file mode 100644
index 0000000..a9b32ac
--- /dev/null
+++ b/gui/meta/gemini/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    geopard
+  ];
+}
diff --git a/gui/warp/default.nix b/gui/warp/default.nix
new file mode 100644
index 0000000..de37c40
--- /dev/null
+++ b/gui/warp/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    warp-terminal
+  ];
+}
diff --git a/home.nix b/home.nix
index 984e1fa..c3a3428 100644
--- a/home.nix
+++ b/home.nix
@@ -78,7 +78,11 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  imports = [ ./applications ./desktop ./rice ./tools ];
+  imports = [
+    ./cli
+    ./gui
+    ./meta
+  ];
 
   nixpkgs = {
     config = {
diff --git a/meta/bitwarden/default.nix b/meta/bitwarden/default.nix
new file mode 100644
index 0000000..2ac188f
--- /dev/null
+++ b/meta/bitwarden/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    bitwarden-desktop
+    # bitwarden-cli
+    # bitwarden-menu
+  ];
+}
diff --git a/meta/calculator/default.nix b/meta/calculator/default.nix
new file mode 100644
index 0000000..a8bcc7f
--- /dev/null
+++ b/meta/calculator/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gavin-bc
+    qalculate-gtk
+    programmer-calculator
+  ];
+}
diff --git a/meta/default.nix b/meta/default.nix
new file mode 100644
index 0000000..0086e7e
--- /dev/null
+++ b/meta/default.nix
@@ -0,0 +1,13 @@
+_: {
+  imports = [
+    ./bitwarden
+    ./calculator
+    ./desktop
+    ./imagery
+    ./language
+    ./rice
+    ./spotify
+    ./steam
+    ./tools
+  ];
+}
diff --git a/desktop/default.nix b/meta/desktop/default.nix
index 36de93a..36de93a 100644
--- a/desktop/default.nix
+++ b/meta/desktop/default.nix
diff --git a/meta/desktop/wayland/default.nix b/meta/desktop/wayland/default.nix
new file mode 100644
index 0000000..89f1bf0
--- /dev/null
+++ b/meta/desktop/wayland/default.nix
@@ -0,0 +1,7 @@
+_: {
+  imports = [
+    ./hyprland
+    ./meta
+    ./waybar
+  ];
+}
diff --git a/desktop/wayland/hyprland/default.nix b/meta/desktop/wayland/hyprland/default.nix
index 26ee84d..46ba5c4 100644
--- a/desktop/wayland/hyprland/default.nix
+++ b/meta/desktop/wayland/hyprland/default.nix
@@ -6,11 +6,15 @@
   # https://github.com/Andy3153/hyprland-rice
   imports = [
     ./hypridle
-    ./pyprland
+    # ./pyprland
     ./hyprland
   ];
   wayland.windowManager.hyprland = {
     enable = true;
+    package = pkgs.hyprland;
+    xwayland = {
+      enable = true;
+    };
     systemd = {
       enable = true;
       variables = [ "--all" ];
diff --git a/desktop/wayland/hyprland/hypridle/default.nix b/meta/desktop/wayland/hyprland/hypridle/default.nix
index 78e0153..78e0153 100644
--- a/desktop/wayland/hyprland/hypridle/default.nix
+++ b/meta/desktop/wayland/hyprland/hypridle/default.nix
diff --git a/desktop/wayland/hyprland/hyprland/animations.nix b/meta/desktop/wayland/hyprland/hyprland/animations.nix
index c47c164..c47c164 100644
--- a/desktop/wayland/hyprland/hyprland/animations.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/animations.nix
diff --git a/desktop/wayland/hyprland/hyprland/binds.nix b/meta/desktop/wayland/hyprland/hyprland/binds.nix
index 3e293d8..30ac4e1 100644
--- a/desktop/wayland/hyprland/hyprland/binds.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/binds.nix
@@ -32,11 +32,11 @@ _: {
         ++
         [
           # Scratchpads
-          "$mod, apostrophe, exec, pypr toggle spcalc"
-          "$mod SHIFT, RETURN, exec, pypr toggle spterm"
-          "$mod SHIFT, c, exec, pypr toggle spgpt"
-          "$mod SHIFT, s, exec, pypr toggle spspotify"
-          "$mod SHIFT, apostrophe, exec, pgrep qalculate-gtk && hyprctl dispatch togglespecialworkspace calculator || qalculate-gtk &"
+          "$mod, apostrophe, exec, hyprctl dispatch togglespecialworkspace simple_calculator"
+          "$mod SHIFT, RETURN, exec, hyprctl dispatch togglespecialworkspace simple_terminal"
+          "$mod SHIFT, c, exec, hyprctl dispatch togglespecialworkspace chatgpt"
+          "$mod SHIFT, s, exec, hyprctl dispatch togglespecialworkspace spotify"
+          "$mod SHIFT, apostrophe, exec, hyprctl dispatch togglespecialworkspace calculator"
 
           # Focus
           "$mod, k, movefocus, u"
diff --git a/desktop/wayland/hyprland/hyprland/decoration.nix b/meta/desktop/wayland/hyprland/hyprland/decoration.nix
index ffabda8..ffabda8 100644
--- a/desktop/wayland/hyprland/hyprland/decoration.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/decoration.nix
diff --git a/desktop/wayland/hyprland/hyprland/default.nix b/meta/desktop/wayland/hyprland/hyprland/default.nix
index 9d0af4c..9d0af4c 100644
--- a/desktop/wayland/hyprland/hyprland/default.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/default.nix
diff --git a/desktop/wayland/hyprland/hyprland/environment.nix b/meta/desktop/wayland/hyprland/hyprland/environment.nix
index 0e64c70..00a7e66 100644
--- a/desktop/wayland/hyprland/hyprland/environment.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/environment.nix
@@ -1,11 +1,15 @@
-_: {
+_:
+let cursorSize = "18"; in
+{
   wayland.windowManager.hyprland.settings.env = [
     # Proton
     "PROTON_ENABLE_NGX_UPDATER, 1"
 
     # Cursor
-    "XCURSOR_SIZE, 18"
-    "HYPRCURSOR_SIZE, 18"
+    "XCURSOR_SIZE, ${cursorSize}"
+    "HYPRCURSOR_SIZE, ${cursorSize}"
+    "HYPERCURSOR_THEME, Bibata-Modern-Ice" # WhiteSur-cursors
+    "XCURSOR_THEME, Bibata-Modern-Ice"
 
     # Wayland & Xwayland
     "GDK_BACKEND, wayland,x11,*"
diff --git a/desktop/wayland/hyprland/hyprland/executions.nix b/meta/desktop/wayland/hyprland/hyprland/executions.nix
index c4e547f..86a944a 100644
--- a/desktop/wayland/hyprland/hyprland/executions.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/executions.nix
@@ -9,6 +9,7 @@
       "hyprpm reload"
       "swaddle"
       "${pkgs.waybar}/bin/waybar"
+      "hyprctl setcursor Bibata-Modern-Ice 18"
 
       # Fcitx5
       "fcitx5-remote -r"
diff --git a/desktop/wayland/hyprland/hyprland/general.nix b/meta/desktop/wayland/hyprland/hyprland/general.nix
index 270fa1c..270fa1c 100644
--- a/desktop/wayland/hyprland/hyprland/general.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/general.nix
diff --git a/desktop/wayland/hyprland/hyprland/plugins.nix b/meta/desktop/wayland/hyprland/hyprland/plugins.nix
index 61d73e3..61d73e3 100644
--- a/desktop/wayland/hyprland/hyprland/plugins.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/plugins.nix
diff --git a/desktop/wayland/hyprland/hyprland/rules.nix b/meta/desktop/wayland/hyprland/hyprland/rules.nix
index f9f671e..862d8f1 100644
--- a/desktop/wayland/hyprland/hyprland/rules.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/rules.nix
@@ -44,13 +44,6 @@ _: {
         "pseudo, class:fcitx"
         "size 50% 50%, title:^(Volume Control)$"
 
-        # Launcher & Bar Rules
-        "float, class:^(eww)$"
-        "float, class:^(Rofi)$"
-        "float, title:wlogout"
-        "fullscreen, class:wlogout"
-        "fullscreen, title:wlogout"
-
         # Application Rules
         "float, class:^(transmission-gtk)$"
         "float, class:viewnior"
@@ -63,15 +56,6 @@ _: {
         "tile, initialTitle:^(WorldsPlayer by Worlds Inc)$"
         # "size 75% 75%, class:feh"
 
-        # Scratchpad Rules
-        "float, class:^(spcalc)$"
-        "float, class:^(spterm)$"
-        "float, class:^(spgpt)$"
-        "float, class:^(qalculate-gtk)$"
-        "center, class:^(spcalc)$"
-        "workspace special:calculator, class:(qalculate-gtk)"
-        "size 50% 50%, class:(qalculate-gtk)"
-
         # XWayland Video Bridge
         "noblur, class:^(xwaylandvideobridge)$"
         "noanim, class:^(xwaylandvideobridge)$"
diff --git a/desktop/wayland/hyprland/hyprland/scripts/common.sh b/meta/desktop/wayland/hyprland/hyprland/scripts/common.sh
index 25be5b6..25be5b6 100644
--- a/desktop/wayland/hyprland/hyprland/scripts/common.sh
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/common.sh
diff --git a/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status b/meta/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status
index e198758..e198758 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/fake_fullscreen_status
diff --git a/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion b/meta/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion
index ab7c3bb..ab7c3bb 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/hycov_easymotion
diff --git a/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk
new file mode 100755
index 0000000..861aa12
--- /dev/null
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_gtk
@@ -0,0 +1,19 @@
+#!/usr/bin/env dash
+
+THEME='WhiteSur-Dark'
+ICONS='WhiteSur-dark'
+FONT='SF Pro Text'
+# CURSOR='WhiteSur-cursors'
+CURSOR='Bibata-Modern-Ice'
+CURSOR_SIZE='18'
+SCHEMA='gsettings set org.gnome.desktop.interface'
+
+apply_themes() {
+	${SCHEMA} gtk-theme "${THEME}"
+	${SCHEMA} icon-theme "${ICONS}"
+	${SCHEMA} cursor-theme "${CURSOR}"
+	${SCHEMA} cursor-size "${CURSOR_SIZE}"
+	${SCHEMA} font-name "${FONT}"
+}
+
+apply_themes
diff --git a/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar
index ff4a25f..ff4a25f 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_waybar
diff --git a/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal
index 10470eb..10470eb 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/initialise_xdg_portal
diff --git a/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor b/meta/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor
index 27562a9..27562a9 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/move_focus_to_monitor
diff --git a/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor b/meta/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor
index 76fd463..76fd463 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/move_window_to_monitor
diff --git a/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace b/meta/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace
index 4256a9f..4256a9f 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/move_window_to_workspace
diff --git a/desktop/wayland/hyprland/hyprland/scripts/source/screenshot.ab b/meta/desktop/wayland/hyprland/hyprland/scripts/source/screenshot.ab
index 6bc510d..6bc510d 100644
--- a/desktop/wayland/hyprland/hyprland/scripts/source/screenshot.ab
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/source/screenshot.ab
diff --git a/desktop/wayland/hyprland/hyprland/scripts/switch_workspace b/meta/desktop/wayland/hyprland/hyprland/scripts/switch_workspace
index fc8900c..fc8900c 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/switch_workspace
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/switch_workspace
diff --git a/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps b/meta/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps
index d593ab2..d593ab2 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/toggle_gaps
diff --git a/desktop/wayland/hyprland/hyprland/scripts/toggle_layout b/meta/desktop/wayland/hyprland/hyprland/scripts/toggle_layout
index 1ef8774..1ef8774 100755
--- a/desktop/wayland/hyprland/hyprland/scripts/toggle_layout
+++ b/meta/desktop/wayland/hyprland/hyprland/scripts/toggle_layout
diff --git a/desktop/wayland/hyprland/hyprland/workspaces.nix b/meta/desktop/wayland/hyprland/hyprland/workspaces.nix
index a8d30df..89644ae 100644
--- a/desktop/wayland/hyprland/hyprland/workspaces.nix
+++ b/meta/desktop/wayland/hyprland/hyprland/workspaces.nix
@@ -28,5 +28,11 @@ _: {
         );
     in
     builtins.concatLists (generateWorkspacesAll [ "DP-2" "HDMI-A-2" "DP-1" ] 10)
-  );
+  ) ++ [
+    "special:simple_terminal, on-created-empty:[float;center;size 50% 65%] kitty --class simple_terminal"
+    "special:simple_calculator, on-created-empty:[float;center;size 50% 50%] kitty --class simple_calculator -e bc -lq"
+    "special:chatgpt, on-created-empty:[float;center;size 65% 75%] thorium-browser --user-data-dir=/home/fuwn/.local/share/spgpt --app='https://chatgpt.com/'"
+    "special:spotify, on-created-empty:[float;center;size 65% 90%] LD_PRELOAD=/usr/lib/spotifywm.so /opt/spotify/spotify"
+    "special:calculator, on-created-empty:[float;center;size 50% 50%] qalculate-gtk"
+  ];
 }
diff --git a/desktop/wayland/hyprland/pyprland/default.nix b/meta/desktop/wayland/hyprland/pyprland/default.nix
index 2dc04c7..2dc04c7 100644
--- a/desktop/wayland/hyprland/pyprland/default.nix
+++ b/meta/desktop/wayland/hyprland/pyprland/default.nix
diff --git a/meta/desktop/wayland/meta/default.nix b/meta/desktop/wayland/meta/default.nix
new file mode 100644
index 0000000..0115f30
--- /dev/null
+++ b/meta/desktop/wayland/meta/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./screenshot
+  ];
+}
diff --git a/meta/desktop/wayland/meta/screenshot/default.nix b/meta/desktop/wayland/meta/screenshot/default.nix
new file mode 100644
index 0000000..5900ee2
--- /dev/null
+++ b/meta/desktop/wayland/meta/screenshot/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    grim
+    slurp
+  ];
+}
diff --git a/desktop/wayland/waybar/default.nix b/meta/desktop/wayland/waybar/default.nix
index e823913..e823913 100644
--- a/desktop/wayland/waybar/default.nix
+++ b/meta/desktop/wayland/waybar/default.nix
diff --git a/desktop/wayland/waybar/waybar/default-modules.nix b/meta/desktop/wayland/waybar/waybar/default-modules.nix
index 9e52674..9e52674 100644
--- a/desktop/wayland/waybar/waybar/default-modules.nix
+++ b/meta/desktop/wayland/waybar/waybar/default-modules.nix
diff --git a/desktop/wayland/waybar/waybar/scripts/brightness.sh b/meta/desktop/wayland/waybar/waybar/scripts/brightness.sh
index 9830a3a..9830a3a 100755
--- a/desktop/wayland/waybar/waybar/scripts/brightness.sh
+++ b/meta/desktop/wayland/waybar/waybar/scripts/brightness.sh
diff --git a/desktop/wayland/waybar/waybar/scripts/mediaplayer.py b/meta/desktop/wayland/waybar/waybar/scripts/mediaplayer.py
index cec64a6..f83bcd7 100755
--- a/desktop/wayland/waybar/waybar/scripts/mediaplayer.py
+++ b/meta/desktop/wayland/waybar/waybar/scripts/mediaplayer.py
@@ -43,7 +43,7 @@ def on_metadata(player, metadata, manager):
     ):
         track_info = "AD PLAYING"
     elif player.get_artist() != "" and player.get_title() != "":
-        track_info = "{artist} - {title}".format(
+        track_info = "{title} - {artist}".format(
             artist=player.get_artist(), title=player.get_title()
         )
     else:
diff --git a/desktop/wayland/waybar/waybar/scripts/spotify.sh b/meta/desktop/wayland/waybar/waybar/scripts/spotify.sh
index 8d25ebd..8d25ebd 100755
--- a/desktop/wayland/waybar/waybar/scripts/spotify.sh
+++ b/meta/desktop/wayland/waybar/waybar/scripts/spotify.sh
diff --git a/desktop/wayland/waybar/waybar/scripts/theme.sh b/meta/desktop/wayland/waybar/waybar/scripts/theme.sh
index 97fdc66..97fdc66 100755
--- a/desktop/wayland/waybar/waybar/scripts/theme.sh
+++ b/meta/desktop/wayland/waybar/waybar/scripts/theme.sh
diff --git a/desktop/wayland/waybar/waybar/scripts/volume.sh b/meta/desktop/wayland/waybar/waybar/scripts/volume.sh
index e4a9183..e4a9183 100755
--- a/desktop/wayland/waybar/waybar/scripts/volume.sh
+++ b/meta/desktop/wayland/waybar/waybar/scripts/volume.sh
diff --git a/desktop/wayland/waybar/waybar/scripts/wallpaper.sh b/meta/desktop/wayland/waybar/waybar/scripts/wallpaper.sh
index 23935cc..23935cc 100755
--- a/desktop/wayland/waybar/waybar/scripts/wallpaper.sh
+++ b/meta/desktop/wayland/waybar/waybar/scripts/wallpaper.sh
diff --git a/desktop/wayland/waybar/waybar/style.css b/meta/desktop/wayland/waybar/waybar/style.css
index 9a85e83..9a85e83 100644
--- a/desktop/wayland/waybar/waybar/style.css
+++ b/meta/desktop/wayland/waybar/waybar/style.css
diff --git a/meta/imagery/default.nix b/meta/imagery/default.nix
new file mode 100644
index 0000000..38c92e8
--- /dev/null
+++ b/meta/imagery/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nsxiv
+    viewnior
+    feh
+    viu
+  ];
+}
diff --git a/meta/language/codespell/default.nix b/meta/language/codespell/default.nix
new file mode 100644
index 0000000..9018b9f
--- /dev/null
+++ b/meta/language/codespell/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    codespell
+  ];
+}
diff --git a/meta/language/default.nix b/meta/language/default.nix
new file mode 100644
index 0000000..3a48e40
--- /dev/null
+++ b/meta/language/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./codespell
+  ];
+}
diff --git a/meta/rice/bottom/default.nix b/meta/rice/bottom/default.nix
new file mode 100644
index 0000000..9248e3d
--- /dev/null
+++ b/meta/rice/bottom/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.bottom.enable = true;
+}
diff --git a/meta/rice/btop/default.nix b/meta/rice/btop/default.nix
new file mode 100644
index 0000000..d483420
--- /dev/null
+++ b/meta/rice/btop/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.btop.enable = true;
+}
diff --git a/meta/rice/cpufetch/default.nix b/meta/rice/cpufetch/default.nix
new file mode 100644
index 0000000..b045b4a
--- /dev/null
+++ b/meta/rice/cpufetch/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cpufetch
+  ];
+}
diff --git a/meta/rice/default.nix b/meta/rice/default.nix
new file mode 100644
index 0000000..56e4bc1
--- /dev/null
+++ b/meta/rice/default.nix
@@ -0,0 +1,9 @@
+_: {
+  imports = [
+    ./bottom
+    ./btop
+    ./cpufetch
+    ./fastfetch
+    ./iotop
+  ];
+}
diff --git a/rice/fastfetch/default.nix b/meta/rice/fastfetch/default.nix
index ba325d2..8ae6284 100644
--- a/rice/fastfetch/default.nix
+++ b/meta/rice/fastfetch/default.nix
@@ -1,14 +1,17 @@
 { pkgs, ... }: {
   programs.fastfetch = {
     enable = true;
+
     settings = {
       logo = {
         source = "~/Downloads/91363-1550240807.png";
         width = 30;
+
         padding = {
           top = 0;
         };
       };
+
       modules = [
         "title"
         "break"
diff --git a/meta/rice/iotop/default.nix b/meta/rice/iotop/default.nix
new file mode 100644
index 0000000..a219adc
--- /dev/null
+++ b/meta/rice/iotop/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    iotop
+  ];
+}
diff --git a/meta/spotify/default.nix b/meta/spotify/default.nix
new file mode 100644
index 0000000..237066e
--- /dev/null
+++ b/meta/spotify/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    # spotify-edge
+    spotify-player
+    ncspot
+    psst
+  ];
+}
diff --git a/meta/steam/default.nix b/meta/steam/default.nix
new file mode 100644
index 0000000..c358a60
--- /dev/null
+++ b/meta/steam/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    steam-tui
+  ];
+
+  # programs.steam.enable = true;
+}
diff --git a/meta/tools/default.nix b/meta/tools/default.nix
new file mode 100644
index 0000000..48bdbba
--- /dev/null
+++ b/meta/tools/default.nix
@@ -0,0 +1,8 @@
+_: {
+  imports = [
+    ./http
+    ./languages
+    ./nix
+    ./tcp
+  ];
+}
diff --git a/meta/tools/http/default.nix b/meta/tools/http/default.nix
new file mode 100644
index 0000000..b917245
--- /dev/null
+++ b/meta/tools/http/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    httpie
+    httpie-desktop
+  ];
+}
diff --git a/meta/tools/infrastructure/default.nix b/meta/tools/infrastructure/default.nix
new file mode 100644
index 0000000..075d6d4
--- /dev/null
+++ b/meta/tools/infrastructure/default.nix
@@ -0,0 +1,6 @@
+_: {
+  import = [
+    ./docker
+    ./fly
+  ];
+}
diff --git a/meta/tools/infrastructure/docker/default.nix b/meta/tools/infrastructure/docker/default.nix
new file mode 100644
index 0000000..0a17952
--- /dev/null
+++ b/meta/tools/infrastructure/docker/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    earthly
+  ];
+}
diff --git a/meta/tools/infrastructure/fly/default.nix b/meta/tools/infrastructure/fly/default.nix
new file mode 100644
index 0000000..9e8147e
--- /dev/null
+++ b/meta/tools/infrastructure/fly/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    flyctl
+  ];
+}
diff --git a/meta/tools/languages/agnostic/default.nix b/meta/tools/languages/agnostic/default.nix
new file mode 100644
index 0000000..77a3086
--- /dev/null
+++ b/meta/tools/languages/agnostic/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cmake
+    tup
+    valgrind
+  ];
+}
diff --git a/meta/tools/languages/assembly/default.nix b/meta/tools/languages/assembly/default.nix
new file mode 100644
index 0000000..b593a41
--- /dev/null
+++ b/meta/tools/languages/assembly/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    nasm
+    # nasmfmt
+    yasm
+  ];
+}
diff --git a/meta/tools/languages/cobol/default.nix b/meta/tools/languages/cobol/default.nix
new file mode 100644
index 0000000..82e5464
--- /dev/null
+++ b/meta/tools/languages/cobol/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gnu-cobol
+  ];
+}
diff --git a/tools/languages/default.nix b/meta/tools/languages/default.nix
index 4b6abfd..30f7894 100644
--- a/tools/languages/default.nix
+++ b/meta/tools/languages/default.nix
@@ -1,16 +1,19 @@
 _: {
   imports = [
+    ./agnostic
     # ./assembly
-    ./c
     ./cobol
     ./gleam
     ./go
+    ./hare
     ./javascript
     # ./jvm
+    # ./protobuf
     ./python
     ./rust
-    ./zig
-    ./yaml
+    ./shell
     # ./vlang
+    ./yaml
+    ./zig
   ];
 }
diff --git a/meta/tools/languages/gleam/default.nix b/meta/tools/languages/gleam/default.nix
new file mode 100644
index 0000000..de1ab92
--- /dev/null
+++ b/meta/tools/languages/gleam/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gleam
+    rebar3
+    erlang_nox
+  ];
+}
diff --git a/meta/tools/languages/go/default.nix b/meta/tools/languages/go/default.nix
new file mode 100644
index 0000000..3c4a809
--- /dev/null
+++ b/meta/tools/languages/go/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  programs.go.enable = true;
+}
diff --git a/meta/tools/languages/hare/default.nix b/meta/tools/languages/hare/default.nix
new file mode 100644
index 0000000..79fc13b
--- /dev/null
+++ b/meta/tools/languages/hare/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    hare
+  ];
+}
diff --git a/tools/languages/javascript/default.nix b/meta/tools/languages/javascript/default.nix
index 5aaccda..5aaccda 100644
--- a/tools/languages/javascript/default.nix
+++ b/meta/tools/languages/javascript/default.nix
diff --git a/meta/tools/languages/jvm/default.nix b/meta/tools/languages/jvm/default.nix
new file mode 100644
index 0000000..d3ab862
--- /dev/null
+++ b/meta/tools/languages/jvm/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    # kotlin 
+  ];
+}
diff --git a/meta/tools/languages/protobuf/default.nix b/meta/tools/languages/protobuf/default.nix
new file mode 100644
index 0000000..21dd9f7
--- /dev/null
+++ b/meta/tools/languages/protobuf/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    protobuf
+  ];
+}
diff --git a/meta/tools/languages/python/default.nix b/meta/tools/languages/python/default.nix
new file mode 100644
index 0000000..d9c592a
--- /dev/null
+++ b/meta/tools/languages/python/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    python3
+    rye
+  ];
+
+  programs.poetry.enable = true;
+}
diff --git a/meta/tools/languages/rust/default.nix b/meta/tools/languages/rust/default.nix
new file mode 100644
index 0000000..02360d1
--- /dev/null
+++ b/meta/tools/languages/rust/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    cargo-outdated
+    cargo-watch
+    cargo-make
+    cargo-cache
+    # cargo-clean-all
+    rustup
+  ];
+}
diff --git a/meta/tools/languages/shell/default.nix b/meta/tools/languages/shell/default.nix
new file mode 100644
index 0000000..1953aac
--- /dev/null
+++ b/meta/tools/languages/shell/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    shfmt
+  ];
+}
diff --git a/meta/tools/languages/vlang/default.nix b/meta/tools/languages/vlang/default.nix
new file mode 100644
index 0000000..d9da941
--- /dev/null
+++ b/meta/tools/languages/vlang/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    vlang
+  ];
+}
diff --git a/meta/tools/languages/yaml/default.nix b/meta/tools/languages/yaml/default.nix
new file mode 100644
index 0000000..cd91d5e
--- /dev/null
+++ b/meta/tools/languages/yaml/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    yamllint
+  ];
+}
diff --git a/meta/tools/languages/zig/default.nix b/meta/tools/languages/zig/default.nix
new file mode 100644
index 0000000..821e4ab
--- /dev/null
+++ b/meta/tools/languages/zig/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    zig
+    zls
+  ];
+}
diff --git a/tools/nix/default.nix b/meta/tools/nix/default.nix
index fe41b1d..fe41b1d 100644
--- a/tools/nix/default.nix
+++ b/meta/tools/nix/default.nix
diff --git a/meta/tools/tcp/default.nix b/meta/tools/tcp/default.nix
new file mode 100644
index 0000000..85b6120
--- /dev/null
+++ b/meta/tools/tcp/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    netcat-openbsd
+    inetutils
+  ];
+}
diff --git a/rice/bottom/default.nix b/rice/bottom/default.nix
deleted file mode 100644
index 3d6066b..0000000
--- a/rice/bottom/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { programs.bottom.enable = true; }
diff --git a/rice/default.nix b/rice/default.nix
deleted file mode 100644
index 0d8cb82..0000000
--- a/rice/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-_: {
-  imports = [ ./bottom ./fastfetch ];
-}
diff --git a/tools/default.nix b/tools/default.nix
deleted file mode 100644
index 205fd41..0000000
--- a/tools/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: { imports = [ ./http ./languages ./nix ./tcp ]; }
diff --git a/tools/http/default.nix b/tools/http/default.nix
deleted file mode 100644
index 96c247c..0000000
--- a/tools/http/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ httpie httpie-desktop ]; }
diff --git a/tools/languages/assembly/default.nix b/tools/languages/assembly/default.nix
deleted file mode 100644
index b902f27..0000000
--- a/tools/languages/assembly/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ nasm yasm ]; }
diff --git a/tools/languages/c/default.nix b/tools/languages/c/default.nix
deleted file mode 100644
index bdc1087..0000000
--- a/tools/languages/c/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ cmake ]; }
diff --git a/tools/languages/cobol/default.nix b/tools/languages/cobol/default.nix
deleted file mode 100644
index cb84d30..0000000
--- a/tools/languages/cobol/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ gnu-cobol ]; }
diff --git a/tools/languages/gleam/default.nix b/tools/languages/gleam/default.nix
deleted file mode 100644
index e472569..0000000
--- a/tools/languages/gleam/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ gleam rebar3 erlang_nox ]; }
diff --git a/tools/languages/go/default.nix b/tools/languages/go/default.nix
deleted file mode 100644
index 5a3981b..0000000
--- a/tools/languages/go/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ go ]; }
diff --git a/tools/languages/python/default.nix b/tools/languages/python/default.nix
deleted file mode 100644
index 050e2bb..0000000
--- a/tools/languages/python/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ poetry python3 ]; }
diff --git a/tools/languages/rust/default.nix b/tools/languages/rust/default.nix
deleted file mode 100644
index 7c94599..0000000
--- a/tools/languages/rust/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ cargo-outdated cargo-watch rustup ];
-}
diff --git a/tools/languages/vlang/default.nix b/tools/languages/vlang/default.nix
deleted file mode 100644
index 626e7cd..0000000
--- a/tools/languages/vlang/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ vlang ]; }
diff --git a/tools/languages/yaml/default.nix b/tools/languages/yaml/default.nix
deleted file mode 100644
index feef34e..0000000
--- a/tools/languages/yaml/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ yamllint ]; }
diff --git a/tools/languages/zig/default.nix b/tools/languages/zig/default.nix
deleted file mode 100644
index ec8458b..0000000
--- a/tools/languages/zig/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ zig ]; }
diff --git a/tools/tcp/default.nix b/tools/tcp/default.nix
deleted file mode 100644
index 00b61f2..0000000
--- a/tools/tcp/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ pkgs, ... }: { home.packages = with pkgs; [ netcat-openbsd ]; }