diff --git a/flake.nix b/flake.nix
index b950f1d..86cad7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,37 +214,11 @@
     };
 
     homeManagerModules = {
-      devkit = {
-        lib,
-        pkgs,
-        stdenv,
-        ...
-      }: let
-        devkitPkgs = self.packages.${pkgs.system}.devkit;
-      in {
+      devkit = {...}: {
         imports = [
-          ./modules/home-manager/devkit.nix
           self.homeManagerModules.neovim
+          ./modules/home-manager/devkit.nix
         ];
-        options._devkit = with lib; let
-          mkPkgOption = pkg:
-            mkOption {
-              type = with types; package;
-              default = pkg;
-              readOnly = true;
-            };
-        in {
-          packages = {
-            ghostty = mkPkgOption devkitPkgs.ghostty;
-            git = mkPkgOption devkitPkgs.git;
-            lazygit = mkPkgOption devkitPkgs.lazygit;
-            starship = mkPkgOption devkitPkgs.starship;
-            yazi = mkPkgOption devkitPkgs.yazi;
-            zellij = mkPkgOption devkitPkgs.zellij;
-            tmux = mkPkgOption devkitPkgs.tmux;
-            zsh = mkPkgOption devkitPkgs.zsh;
-          };
-        };
       };
       neovim = inputs.neovim.homeManagerModules.default;
       qutebrowser-profiles = ./modules/home-manager/qutebrowser-profiles.nix;
@@ -256,9 +230,9 @@
       pkgs,
       ...
     }: {
-      neovim = inputs.neovim.packages.${pkgs.system}.default;
       audacity = pkgs.callPackage ./packages/audacity.nix {};
       cal-sans = pkgs.callPackage ./packages/cal-sans.nix {};
+      neovim = inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default;
       devkit = {
         ghostty = pkgs.callPackage ./packages/devkit/ghostty.nix {
           command = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.zsh}";
@@ -293,7 +267,7 @@
         shellHook = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.zsh}";
         EDITOR = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.neovim}";
       };
-      default = self.devShells.${pkgs.system}.devkit;
+      default = self.devShells.${pkgs.stdenv.hostPlatform.system}.devkit;
     });
   };
 }
diff --git a/home/terminal/home.nix b/home/terminal/home.nix
index eb82245..12d9c01 100644
--- a/home/terminal/home.nix
+++ b/home/terminal/home.nix
@@ -5,6 +5,8 @@
   ...
 }: {
   imports = [
+    self.homeManagerModules.devkit
+
     ./browser.nix
     ./desktop.nix
     ./impermanence.nix
@@ -19,20 +21,8 @@
       wezterm
       webcord
     ])
-    ++ (with self.packages.${pkgs.stdenv.hostPlatform.system}.devkit; [
-      git
-      ghostty
-      lazygit
-      starship
-      yazi
-      zellij
-      zsh
-      neovim
     ]);
 
-  home.sessionVariables = {
-    EDITOR = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.neovim}";
-    TERMINAL = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.ghostty}";
   };
 
   # This value determines the Home Manager release that your
diff --git a/modules/home-manager/devkit.nix b/modules/home-manager/devkit.nix
index 5ddc785..748e6c1 100644
--- a/modules/home-manager/devkit.nix
+++ b/modules/home-manager/devkit.nix
@@ -2,174 +2,91 @@
   config,
   lib,
   pkgs,
+  self,
   ...
 }: let
-  cfg = config.devkit;
+  devkitPkgs = self.packages.${pkgs.stdenv.hostPlatform.system}.devkit;
 in {
-  options.devkit = with lib; {
-    enable = mkEnableOption "Enable devkit configuration and packages";
+  # Direnv
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
 
-    ghostty.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
+  # Ghostty
+  programs.ghostty.enable = true;
+  programs.ghostty.systemd.enable = true;
+  programs.ghostty.package = devkitPkgs.ghostty;
+
+  # Git
+  programs.git.enable = true;
+  programs.git.package = devkitPkgs.git;
+  programs.git.lfs.package = devkitPkgs.git;
+
+  # GPG Keyring
+  programs.gpg.enable = true;
+  programs.gpg.mutableKeys = true;
+  programs.gpg.mutableTrust = true;
+
+  # GPG Agent
+  services.gpg-agent.enable = true;
+  services.gpg-agent.defaultCacheTtl = 3600 * 24;
+  services.gpg-agent.pinentry.package = pkgs.pinentry-gtk2;
+
+  # Lazy
+  programs.lazygit.enable = true;
+  programs.lazygit.package = devkitPkgs.lazygit;
+
+  # Neovim
+  neovim.enable = true;
+
+  # SSH
+  programs.ssh.enable = true;
+  programs.ssh.matchBlocks = {
+    "*" = {
+      identitiesOnly = true;
+      user = "${config.home.username}";
     };
-    git.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
+    "spacestation" = {
+      hostname = "spacestation";
+      identityFile = "${config.home.homeDirectory}/.ssh/spacestation";
     };
-    git.wrapper = mkOption {
-      type = with types; nullOr package;
-      default = null;
+    "battleship" = {
+      hostname = "battleship";
+      identityFile = "${config.home.homeDirectory}/.ssh/battleship";
     };
-    lazygit.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    neovim.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    starship.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    tmux.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    yazi.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    zellij.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
-    };
-    zsh.enable = mkOption {
-      type = with types; bool;
-      default = cfg.enable;
+    "fithter" = {
+      hostname = "fighter";
+      identityFile = "${config.home.homeDirectory}/.ssh/figther";
     };
   };
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      ouch
-      # TODO: move this to neovim configuration/derivation
-      (pkgs.writeShellScriptBin "gvim" ''
-        ${lib.getExe config.programs.neovide.package} -- "$@"
-      '')
-      git-lfs-transfer
-    ];
 
-    home.sessionVariables = {
-      SHELL = lib.mkIf cfg.zsh.enable "${lib.getExe config.programs.zsh.package}";
-      TERM = lib.mkIf cfg.ghostty.enable "xterm-256color";
-      # Used to be ghostty, but it is borked
-      TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.wezterm.package}";
-      EXPLORER = lib.mkIf cfg.yazi.enable "${lib.getExe config.programs.yazi.package}";
-    };
+  # Starship
+  programs.starship.enable = true;
+  programs.starship.package = devkitPkgs.starship;
 
-    # Local development shells
-    programs.direnv.enable = true;
-    programs.direnv.nix-direnv.enable = true;
+  # Yazi
+  programs.yazi.enable = true;
+  programs.yazi.package = devkitPkgs.yazi;
 
-    # SSH
-    programs.ssh.enable = true;
-    programs.ssh.matchBlocks = {
-      "battleship" = {
-        hostname = "battleship";
-        user = "${config.home.username}";
-        identitiesOnly = true;
-        identityFile = "${config.home.homeDirectory}/home/battleship";
-        extraOptions = {RequestTTY = "yes";};
-      };
-      "fithter" = {
-        hostname = "fighter";
-        user = "${config.home.username}";
-        identitiesOnly = true;
-        identityFile = "${config.home.homeDirectory}/home/fighter";
-        extraOptions = {RequestTTY = "yes";};
-      };
-    };
+  # Zellij
+  programs.zellij.enable = true;
+  programs.zellij.package = devkitPkgs.zellij;
 
-    # GPG Keyring
-    programs.gpg.enable = true;
-    programs.gpg.mutableKeys = true;
-    programs.gpg.mutableTrust = true;
+  ## ZSH
+  programs.zsh.enable = true;
+  programs.zsh.package = devkitPkgs.zsh;
 
-    services.gpg-agent.enable = true;
-    services.gpg-agent.defaultCacheTtl = 3600 * 24;
-    services.gpg-agent.pinentry.package = pkgs.pinentry-gtk2;
+  home.packages = with pkgs; [
+    # TODO: move this to neovim configuration/derivation
+    (pkgs.writeShellScriptBin "gvim" ''
+      ${lib.getExe config.programs.neovide.package} -- "$@"
+    '')
+    git-lfs-transfer
+  ];
 
-    # Devkit packages
-
-    ## Ghostty (Terminal)
-    programs.ghostty = lib.mkIf cfg.ghostty.enable {
-      enable = true;
-      package = config._devkit.packages.ghostty;
-    };
-
-    programs.wezterm.enable = true;
-
-    ## Git
-    programs.git = lib.mkIf cfg.git.enable {
-      enable = true;
-      userEmail = "contact@guz.one";
-      userName = "Gustavo \"Guz\" L de Mello";
-      package =
-        if isNull cfg.git.wrapper
-        then config._devkit.packages.git
-        else
-          pkgs.writeShellScriptBin "git" ''
-            ${lib.getExe cfg.git.wrapper} ${lib.getExe config._devkit.packages.git} "$@"
-          '';
-      lfs.enable = true;
-    };
-
-    ## Lazygit (Git TUI)
-    programs.lazygit = lib.mkIf cfg.lazygit.enable {
-      enable = true;
-      package = config._devkit.packages.lazygit;
-      # package = pkgs.lazygit;
-    };
-
-    ## Neovim (Editor)
-    neovim.enable = cfg.neovim.enable;
-    programs.neovide.enable = true;
-
-    ## Starship (Shell decoration)
-    programs.starship = lib.mkIf cfg.starship.enable {
-      enable = true;
-      package = config._devkit.packages.starship;
-      # package = pkgs.starship;
-    };
-
-    ## Yazi (File manager)
-    programs.yazi = lib.mkIf cfg.yazi.enable {
-      enable = true;
-      package = config._devkit.packages.yazi;
-      # package = pkgs.yazi;
-    };
-
-    # Zellij (Terminal multiplexer)
-    programs.zellij = lib.mkIf cfg.zellij.enable {
-      enable = true;
-      package = config._devkit.packages.zellij;
-    };
-
-    ## Tmux (Backup terminal multiplexer)
-    programs.tmux = lib.mkIf cfg.tmux.enable {
-      enable = true;
-      package = config._devkit.packages.tmux;
-    };
-
-    ## ZSH (Default shell)
-    programs.zsh = lib.mkIf cfg.zsh.enable {
-      enable = true;
-      # package = config._devkit.packages.zsh;
-      package = pkgs.zsh;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-    };
+  home.sessionVariables = {
+    EXPLORER = "${lib.getExe config.programs.yazi.package}";
+    SHELL = "${lib.getExe config.programs.zsh.package}";
+    TERM = "xterm-256color";
+    TERMINAL = "${lib.getExe config.programs.ghostty.package}";
   };
 }
diff --git a/packages/devkit/zellij/default.nix b/packages/devkit/zellij/default.nix
index 919acc7..61df9e0 100644
--- a/packages/devkit/zellij/default.nix
+++ b/packages/devkit/zellij/default.nix
@@ -6,50 +6,50 @@
   zellij ? pkgs.zellij,
   shell ? pkgs.zsh,
 }:
-symlinkJoin ({
-    paths = [zellij];
-    nativeBuildInputs = [makeWrapper];
-    postBuild = ''
-      wrapProgram $out/bin/zellij \
-        --set-default ZELLIJ_CONFIG_FILE ${
-        let
-          colors = import ../colors.nix;
-        in
-          pkgs.writeText "config.kdl" ''
-            plugins {
-              zellij-sessionizer location="file:${builtins.fetchurl {
-              url = "https://github.com/laperlej/zellij-sessionizer/releases/download/v0.4.3/zellij-sessionizer.wasm";
-              sha256 = "0d43jhlhm7p8pvd8kcylfbfy3dahr8q4yngpnjyqivapwip9csq0";
-            }}"
+symlinkJoin {
+  paths = [zellij];
+  nativeBuildInputs = [makeWrapper];
+  postBuild = ''
+    wrapProgram $out/bin/zellij \
+      --set-default ZELLIJ_CONFIG_FILE ${
+      let
+        colors = import ../colors.nix;
+      in
+        pkgs.writeText "config.kdl" ''
+          plugins {
+            zellij-sessionizer location="file:${builtins.fetchurl {
+            url = "https://github.com/laperlej/zellij-sessionizer/releases/download/v0.4.3/zellij-sessionizer.wasm";
+            sha256 = "0d43jhlhm7p8pvd8kcylfbfy3dahr8q4yngpnjyqivapwip9csq0";
+          }}"
 
-              tab-bar location="zellij:tab-bar"
-              status-bar location="zellij:status-bar"
-              compact-bar location="zellij:compact-bar"
-              session-manager location="zellij:session-manager"
+            tab-bar location="zellij:tab-bar"
+            status-bar location="zellij:status-bar"
+            compact-bar location="zellij:compact-bar"
+            session-manager location="zellij:session-manager"
+          }
+
+          default_shell "${lib.getExe shell}"
+
+          themes {
+            defautl {
+              bg "${colors.base03}";
+              fg "${colors.base05}";
+              red "${colors.base01}";
+              green "${colors.base0B}";
+              blue "${colors.base0D}";
+              yellow "${colors.base0A}";
+              magenta "${colors.base0E}";
+              orange "${colors.base09}";
+              cyan "${colors.base0C}";
+              black "${colors.base00}";
+              white "${colors.base07}";
             }
+          }
+          theme "default"
 
-            default_shell "${lib.getExe shell}"
-
-            themes {
-              defautl {
-                bg "${colors.base03}";
-                fg "${colors.base05}";
-                red "${colors.base01}";
-                green "${colors.base0B}";
-                blue "${colors.base0D}";
-                yellow "${colors.base0A}";
-                magenta "${colors.base0E}";
-                orange "${colors.base09}";
-                cyan "${colors.base0C}";
-                black "${colors.base00}";
-                white "${colors.base07}";
-              }
-            }
-            theme "default"
-
-            ${builtins.readFile ./config.kdl}
-          ''
-      }
-    '';
-  }
-  // {inherit (zellij) name pname meta;})
+          ${builtins.readFile ./config.kdl}
+        ''
+    }
+  '';
+  inherit (zellij) meta name pname version;
+}
diff --git a/packages/devkit/zsh/.zshrc b/packages/devkit/zsh/.zshrc
index 0eea1af..9e7a093 100644
--- a/packages/devkit/zsh/.zshrc
+++ b/packages/devkit/zsh/.zshrc
@@ -1,7 +1,7 @@
 # Source OS-specific configurations
-if [ -f "$HOME/.zshrc" ]; then
-	source "$HOME/.zshrc"
-fi
+# if [ -f "$HOME/.zshrc" ]; then
+# 	source "$HOME/.zshrc"
+# fi
 
 #@zshrc-prepend@