From e0903f42bf00b14b54e6a99db376a1e0152487a6 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Mon, 17 Jun 2024 09:47:33 +0200
Subject: [PATCH] Rename shell option

---
 modules/home/shell/aliases.nix      | 2 +-
 modules/home/shell/default.nix      | 6 ++----
 modules/home/shell/p10k/default.nix | 2 +-
 modules/home/shell/p10k/p10k.zsh    | 4 +---
 users/seb/home.nix                  | 5 ++---
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/home/shell/aliases.nix b/modules/home/shell/aliases.nix
index 9daa9a8..8fda9f6 100644
--- a/modules/home/shell/aliases.nix
+++ b/modules/home/shell/aliases.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.myConfig.shell.enable {
+  config = lib.mkIf config.myConfig.shell.zsh.enable {
     home.packages = [
       pkgs.eza
       pkgs.bat
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 8ade8e7..41ad900 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -10,11 +10,9 @@
     ./aliases.nix
   ];
 
-  options.myConfig.shell = {
-    enable = lib.mkEnableOption "";
-  };
+  options.myConfig.shell.zsh.enable = lib.mkEnableOption "";
 
-  config = {
+  config = lib.mkIf config.myConfig.shell.zsh.enable {
     programs.zsh = {
       enable = true;
       dotDir = ".config/zsh";
diff --git a/modules/home/shell/p10k/default.nix b/modules/home/shell/p10k/default.nix
index 3141c6d..9500dd6 100644
--- a/modules/home/shell/p10k/default.nix
+++ b/modules/home/shell/p10k/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.myConfig.shell.enable {
+  config = lib.mkIf config.myConfig.shell.zsh.enable {
     programs.zsh = {
       plugins = [
         {
diff --git a/modules/home/shell/p10k/p10k.zsh b/modules/home/shell/p10k/p10k.zsh
index 4d12266..e9b6186 100644
--- a/modules/home/shell/p10k/p10k.zsh
+++ b/modules/home/shell/p10k/p10k.zsh
@@ -163,9 +163,7 @@
       (( $#branch > 32 )) && branch[13,-13]="…"  # <-- this line
       res+="${clean}${(g::)POWERLEVEL9K_VCS_BRANCH_ICON}${branch//\%/%%}"
     fi
-    if [[ -n $VCS_STATUS_TAG
-          
-          
+    if [[ -n $VCS_STATUS_TAG 
           && -z $VCS_STATUS_LOCAL_BRANCH  
         ]]; then
       local tag=${(V)VCS_STATUS_TAG}
diff --git a/users/seb/home.nix b/users/seb/home.nix
index 1f87144..0e2a8ed 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -1,14 +1,13 @@
 {
   config,
   pkgs,
-  osConfig,
   wrappers,
   ...
 }:
 {
   myConfig = {
-    de.hyprland.enable = osConfig.myConfig.de.hyprland.enable;
-    shell.enable = true;
+    de.hyprland.enable = true;
+    shell.zsh.enable = true;
     ssh-client.enable = true;
     git.enable = true;
     vscode.enable = true;