From 1efae8ed1bb318c450d2405120e86eeaca94ec24 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Tue, 14 Sep 2021 13:33:53 -0400
Subject: [PATCH] chore: move zsh under shells

---
 users/profiles/shells/zsh.nix | 51 +++++++++++++++++++++++++++++++++++
 users/profiles/starship.nix   |  1 -
 users/profiles/zsh.nix        | 47 --------------------------------
 3 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 users/profiles/shells/zsh.nix
 delete mode 100644 users/profiles/zsh.nix

diff --git a/users/profiles/shells/zsh.nix b/users/profiles/shells/zsh.nix
new file mode 100644
index 0000000..7db4991
--- /dev/null
+++ b/users/profiles/shells/zsh.nix
@@ -0,0 +1,51 @@
+{ config, lib, ... }: {
+  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"
+        ];
+      };
+    };
+
+    starship.enableZshIntegration = lib.mkIf config.programs.starship.enable true;
+  };
+}
diff --git a/users/profiles/starship.nix b/users/profiles/starship.nix
index 88c819c..b1ef8cf 100644
--- a/users/profiles/starship.nix
+++ b/users/profiles/starship.nix
@@ -2,7 +2,6 @@
   programs.starship = {
     enable = true;
     enableBashIntegration = true;
-    enableZshIntegration = true;
 
     settings = { };
   };
diff --git a/users/profiles/zsh.nix b/users/profiles/zsh.nix
deleted file mode 100644
index 38e068a..0000000
--- a/users/profiles/zsh.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ ... }: {
-  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"
-      ];
-    };
-  };
-}