diff --git a/home.nix b/home.nix
index 5f13cc4..13e55c2 100644
--- a/home.nix
+++ b/home.nix
@@ -17,28 +17,14 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
-    openssl.dev
-    pkg-config
-    direnv
     procps
-    bat
     icdiff
-    thefuck
     kubectl
     kubernetes-helm
     krew
-    yarn
-    python39
-    rustup
-    nodejs_20
-    virtualenv
     proxychains-ng
-    less
-    openssh
-    openssl
     nil
-    qemu
-    gcc9
+    coreutils
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -74,26 +60,9 @@
 
   home.shellAliases = {
     cao = "fuck";
-    #ls = "ls --color=auto";
     cat = "bat -p --paging=never -u";
     diff = "icdiff";
   };
 
-  # Let Home Manager install and manage itself.
-  programs = {
-    home-manager.enable = true;
-    
-    eza = {
-      enable = true;
-      enableAliases = true;
-      git = true;
-      icons = true;
-    };
-
-    yazi = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-  };
   targets.genericLinux.enable = true;
 }
diff --git a/programs.nix b/programs.nix
index 5b4830d..fb3864e 100644
--- a/programs.nix
+++ b/programs.nix
@@ -1,7 +1,40 @@
-{
-  programs = {    
+{ pkgs, ... }: {
+  programs = {   
+    home-manager.enable = true;
+
+    bat = {
+      enable = true;
+    };
+
+    less = {
+      enable = true;
+    };
+
+    direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+    
+    thefuck = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    eza = {
+      enable = true;
+      enableAliases = true;
+      git = true;
+      icons = true;
+    };
+
+    yazi = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
     ssh = {
       enable = true;
+      package = pkgs.openssh;
       matchBlocks = {
         "git-ssh.sense-t.eu.org" = {
           hostname = "gitea.default";
@@ -15,7 +48,7 @@
     };
 
     go = {
-      enable = true;
+      enable = false;
       goPath = ".local/go";
     };