diff --git a/flake/flake.nix b/flake/flake.nix
index 742cb0e..ddf5a10 100644
--- a/flake/flake.nix
+++ b/flake/flake.nix
@@ -23,7 +23,8 @@
           ({...}: { system.stateVersion = "23.11"; })
           ./system/cerulea-1/hardware-configuration.nix
           ./system/cerulea-1/networking.nix
-          ./system/configuration.nix
+          ./system/base.nix
+          ./system/software.nix
         ];
       };
     };
diff --git a/flake/system/configuration.nix b/flake/system/base.nix
similarity index 100%
rename from flake/system/configuration.nix
rename to flake/system/base.nix
diff --git a/flake/system/software.nix b/flake/system/software.nix
new file mode 100644
index 0000000..141fbbe
--- /dev/null
+++ b/flake/system/software.nix
@@ -0,0 +1,22 @@
+{ pkgs, unstable-pkgs, ... }: { 
+  environment.systemPackages = with pkgs; [
+    vim
+    tmux
+  ] ++ [
+    unstable-pkgs.deno
+    unstable-pkgs.sqlite-interactive
+    unstable-pkgs.httpie
+  ];
+
+  programs.vim.defaultEditor = true;
+  environment.variables = {
+    EDITOR = "vim";
+    VISUAL = "vim";
+    SYSTEMD_EDITOR = "vim";
+  };
+
+  services.tailscale.enable = true;
+
+  programs.git.enable = true;
+  programs.nix-ld.enable = true; # for Deno :)
+}