diff --git a/flake.nix b/flake.nix
index 9293c11..eba1fdf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,7 +131,9 @@
           externalModules = [ ];
           importables = rec {
             profiles = digga.lib.rakeLeaves ./users/profiles;
-            suites = with profiles; rec { base = [ direnv git ]; };
+            suites = with profiles; rec {
+              base = [ direnv git kitty starship zsh ];
+            };
           };
           users = {
             infinidoge = { };
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 7b83fde..2d8e0ab 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -1,67 +1,6 @@
 { config, self, lib, pkgs, ... }: {
   home-manager.users.infinidoge = { suites, ... }: {
     imports = suites.base;
-
-    programs.starship = {
-      enable = true;
-      enableBashIntegration = true;
-      enableZshIntegration = true;
-
-      settings = { };
-    };
-
-    programs.kitty = {
-      enable = true;
-      font.package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; });
-      font.name = "DejaVuSansMono";
-      font.size = 16;
-    };
-
-    programs.zsh = {
-      enable = true;
-
-      enableCompletion = true;
-      # enableSyntaxHighlighting = true;
-      enableVteIntegration = true;
-
-      dotDir = ".config/zsh";
-
-      history.path = "$ZDOTDIR/.zsh_history";
-
-      oh-my-zsh = {
-        enable = true;
-        plugins = [
-          # Display
-          "colorize"
-          "colored-man-pages"
-
-          # zsh modifications
-          "zsh-interactive-cd"
-          "zsh_reload"
-          "command-not-found"
-
-          # Aliases
-          "alias-finder"
-
-          # Applications
-          ## Docker
-          "docker"
-          ## Python
-          "pip"
-          "python"
-          ## Systemd
-          "systemd"
-          ## Git
-          "git"
-          "github"
-          "gitignore"
-          ## Emacs
-          "emacs"
-          ## Vim
-          "fancy-ctrl-z"
-        ];
-      };
-    };
   };
 
   environment.pathsToLink = [ "/share/zsh" ];
diff --git a/users/profiles/kitty.nix b/users/profiles/kitty.nix
new file mode 100644
index 0000000..8cb449c
--- /dev/null
+++ b/users/profiles/kitty.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  programs.kitty = {
+    enable = true;
+    font.package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; });
+    font.name = "DejaVuSansMono";
+    font.size = 16;
+  };
+}
diff --git a/users/profiles/starship.nix b/users/profiles/starship.nix
new file mode 100644
index 0000000..88c819c
--- /dev/null
+++ b/users/profiles/starship.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+
+    settings = { };
+  };
+}
diff --git a/users/profiles/zsh.nix b/users/profiles/zsh.nix
new file mode 100644
index 0000000..38e068a
--- /dev/null
+++ b/users/profiles/zsh.nix
@@ -0,0 +1,47 @@
+{ ... }: {
+  programs.zsh = {
+    enable = true;
+
+    enableCompletion = true;
+    # enableSyntaxHighlighting = true;
+    enableVteIntegration = true;
+
+    dotDir = ".config/zsh";
+
+    history.path = "$ZDOTDIR/.zsh_history";
+
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        # Display
+        "colorize"
+        "colored-man-pages"
+
+        # zsh modifications
+        "zsh-interactive-cd"
+        "zsh_reload"
+        "command-not-found"
+
+        # Aliases
+        "alias-finder"
+
+        # Applications
+        ## Docker
+        "docker"
+        ## Python
+        "pip"
+        "python"
+        ## Systemd
+        "systemd"
+        ## Git
+        "git"
+        "github"
+        "gitignore"
+        ## Emacs
+        "emacs"
+        ## Vim
+        "fancy-ctrl-z"
+      ];
+    };
+  };
+}