diff --git a/flake.nix b/flake.nix
index 5bde2cb9..20860d79 100644
--- a/flake.nix
+++ b/flake.nix
@@ -431,7 +431,7 @@
         # };
         devShells = {
           default = pkgs.mkShell {
-            packages = with pkgs; [sops just openssl];
+            packages = with pkgs; [sops just openssl ast-grep];
           };
         };
       }
diff --git a/home/programs/1password-cli.nix b/home/programs/1password-cli.nix
new file mode 100644
index 00000000..a689a2d7
--- /dev/null
+++ b/home/programs/1password-cli.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs._1password-cli
+  ];
+}
diff --git a/home/programs/alejandra.nix b/home/programs/alejandra.nix
new file mode 100644
index 00000000..f4a65645
--- /dev/null
+++ b/home/programs/alejandra.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.alejandra];}
diff --git a/home/programs/aria2.nix b/home/programs/aria2.nix
new file mode 100644
index 00000000..c8fa022c
--- /dev/null
+++ b/home/programs/aria2.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.aria2];}
diff --git a/home/programs/ast-grep.nix b/home/programs/ast-grep.nix
new file mode 100644
index 00000000..006ac268
--- /dev/null
+++ b/home/programs/ast-grep.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.ast-grep];}
diff --git a/home/programs/bottom.nix b/home/programs/bottom.nix
new file mode 100644
index 00000000..ec678393
--- /dev/null
+++ b/home/programs/bottom.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.bottom];}
diff --git a/home/programs/btop.nix b/home/programs/btop.nix
new file mode 100644
index 00000000..81801a31
--- /dev/null
+++ b/home/programs/btop.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.btop];}
diff --git a/home/programs/cachix.nix b/home/programs/cachix.nix
new file mode 100644
index 00000000..29d1460b
--- /dev/null
+++ b/home/programs/cachix.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.cachix];}
diff --git a/home/programs/default.nix b/home/programs/default.nix
index cef0d69e..ac210c9d 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -5,28 +5,46 @@
 }: {
   imports = [
     ../../modules
+    ./1password-cli.nix
     ./aichat.nix
+    ./alejandra.nix
+    ./aria2.nix
+    ./ast-grep.nix
     ./atuin.nix
     ./bat.nix
+    ./bottom.nix
+    ./btop.nix
+    ./cachix.nix
     ./carapace.nix
     ./ddcbacklight.nix
+    ./deploy-rs.nix
     ./direnv.nix
+    ./dust.nix
     ./eilmeldung.nix
     ./eza.nix
     ./fastfetch.nix
+    ./fd.nix
+    ./file.nix
     ./fish.nix
     ./fzf.nix
     ./gh.nix
     ./git.nix
+    ./gnupg.nix
     ./himalaya.nix
     ./hyprshade.nix
+    ./jq.nix
+    ./just.nix
     ./ncpamixer.nix
     ./neomutt.nix
     ./neovim.nix
     ./nix-index.nix
     ./nushell.nix
     ./opencode.nix
+    ./p7zip.nix
+    ./pkg-config.nix
+    ./ripgrep.nix
     ./rustup.nix
+    ./sd.nix
     ./sops.nix
     ./ssh.nix
     ./starship.nix
@@ -59,28 +77,7 @@
     # ./zellij.nix
   ];
   home.packages = with pkgs;
-    [
-      _1password-cli
-      alejandra
-      aria2
-      bottom
-      btop
-      cachix
-      deploy-rs.deploy-rs
-      dust
-      fd
-      file
-      fzf
-      gnupg
-      jq
-      just
-      macchina
-      p7zip
-      pfetch-rs
-      pkg-config
-      ripgrep
-      sd
-    ]
+    []
     ++ lib.optionals (!device.isServer) [
       monaspace
       nerd-fonts.fira-code
diff --git a/home/programs/deploy-rs.nix b/home/programs/deploy-rs.nix
new file mode 100644
index 00000000..36d6fe13
--- /dev/null
+++ b/home/programs/deploy-rs.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.deploy-rs.deploy-rs];}
diff --git a/home/programs/dust.nix b/home/programs/dust.nix
new file mode 100644
index 00000000..0dbfbbe8
--- /dev/null
+++ b/home/programs/dust.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.dust];}
diff --git a/home/programs/fd.nix b/home/programs/fd.nix
new file mode 100644
index 00000000..b3dbf1de
--- /dev/null
+++ b/home/programs/fd.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.fd];}
diff --git a/home/programs/file.nix b/home/programs/file.nix
new file mode 100644
index 00000000..80030f5e
--- /dev/null
+++ b/home/programs/file.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.file];}
diff --git a/home/programs/fzf.nix b/home/programs/fzf.nix
index 7dad1920..d9407736 100644
--- a/home/programs/fzf.nix
+++ b/home/programs/fzf.nix
@@ -1,13 +1 @@
-{
-  pkgs,
-  lib,
-  device,
-  ...
-}: {
-  programs.fzf = {
-    enable = true;
-    package = pkgs.fzf;
-    enableFishIntegration = true;
-    tmux.enableShellIntegration = true;
-  };
-}
+{pkgs, ...}: { home.packages = [pkgs.fzf];}
diff --git a/home/programs/gnupg.nix b/home/programs/gnupg.nix
new file mode 100644
index 00000000..96047535
--- /dev/null
+++ b/home/programs/gnupg.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.gnupg];}
diff --git a/home/programs/jq.nix b/home/programs/jq.nix
new file mode 100644
index 00000000..2649630d
--- /dev/null
+++ b/home/programs/jq.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.jq];}
diff --git a/home/programs/just.nix b/home/programs/just.nix
new file mode 100644
index 00000000..0b3d504b
--- /dev/null
+++ b/home/programs/just.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.just];}
diff --git a/home/programs/p7zip.nix b/home/programs/p7zip.nix
new file mode 100644
index 00000000..16c982d8
--- /dev/null
+++ b/home/programs/p7zip.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.p7zip];}
diff --git a/home/programs/pkg-config.nix b/home/programs/pkg-config.nix
new file mode 100644
index 00000000..0fa3173c
--- /dev/null
+++ b/home/programs/pkg-config.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.pkg-config];}
diff --git a/home/programs/ripgrep.nix b/home/programs/ripgrep.nix
new file mode 100644
index 00000000..2373691e
--- /dev/null
+++ b/home/programs/ripgrep.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.ripgrep];}
diff --git a/home/programs/sd.nix b/home/programs/sd.nix
new file mode 100644
index 00000000..0511d554
--- /dev/null
+++ b/home/programs/sd.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {home.packages = [pkgs.sd];}
diff --git a/justfile b/justfile
index cd00521f..98419025 100644
--- a/justfile
+++ b/justfile
@@ -30,3 +30,12 @@ nvim:
 [linux]
 rollback:
 	sudo nixos-rebuild switch --rollback --flake .
+
+
+add program:
+    echo '{pkgs, ...}: { home.packages = [pkgs.{{program}}];}' > home/programs/{{program}}.nix
+    ast-grep run -p '{ imports = [$$$ITEMS] }' --selector binding --rewrite 'imports = [$$$ITEMS ./{{program}}.nix ]' home/programs/default.nix -i
+    git add home/programs/{{program}}.nix 
+    alejandra fmt home/programs/{{program}}.nix home/programs/default.nix
+
+    
diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index fa17665a..323fd674 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -10,7 +10,7 @@
     ./programs
     ./containers
     ./apps
-    # ./vms
+    ./vms
   ];
 
   security.tpm2 = {
diff --git a/nixos/ryu/vms/default.nix b/nixos/ryu/vms/default.nix
index bca656ef..f2f27039 100644
--- a/nixos/ryu/vms/default.nix
+++ b/nixos/ryu/vms/default.nix
@@ -1,17 +1,21 @@
-{
+{pkgs, ...}: {
   virtualisation = {
-    libvirtd = {
+    # libvirtd = {
+    #   enable = true;
+    #   qemu = {
+    #     runAsRoot = true;
+    #     swtpm.enable = true;
+    #     # ovmf = {
+    #     #   enable = true;
+    #     # };
+    #   };
+    # };
+    waydroid = {
       enable = true;
-      qemu = {
-        runAsRoot = true;
-        swtpm.enable = true;
-        # ovmf = {
-        #   enable = true;
-        # };
-      };
+      package = pkgs.waydroid-nftables;
     };
   };
-  imports = [
-    ./win11.nix
-  ];
+  # imports = [
+  #   ./win11.nix
+  # ];
 }