From 25a559bb4d216a0b4d54c785f274d96346235f34 Mon Sep 17 00:00:00 2001
From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com>
Date: Fri, 9 Feb 2024 05:32:21 +0100
Subject: [PATCH] Fix remaining issues

---
 config/home/bash.nix |  3 +--
 config/home/zsh.nix  | 15 +++------------
 system.nix           |  4 +++-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/config/home/bash.nix b/config/home/bash.nix
index 66ae898..6aae52f 100644
--- a/config/home/bash.nix
+++ b/config/home/bash.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, ... }:
+{ config, lib, pkgs, ... }:
 
 let inherit (import ../../options.nix) flakeDir theShell; in
 lib.mkIf (theShell == "bash") {
@@ -33,5 +33,4 @@ lib.mkIf (theShell == "bash") {
       ".."="cd ..";
     };
   };
-  users.users.${username}.shell = pkgs.bash;
 }
diff --git a/config/home/zsh.nix b/config/home/zsh.nix
index 14163f1..028a52b 100644
--- a/config/home/zsh.nix
+++ b/config/home/zsh.nix
@@ -1,20 +1,12 @@
-{ config, pkgs, username, ... }:
+{ config, lib, pkgs, ... }:
 
 let inherit (import ../../options.nix) flakeDir theShell; in
 lib.mkIf (theShell == "zsh") {
   programs.zsh = {
     enable = true;
     syntaxHighlighting.enable = true;
-    autosuggestions = {
-      enable = true;
-      async = true;
-      highlightStyle = "fg=cyan";
-      strategy = ["completion"];
-    };
-    ohMyZsh = {
-      enable = true;
-      plugins = ["history-substring-search"];
-    };
+    enableAutosuggestions = true;
+    historySubstringSearch.enable = true;
     profileExtra = ''
       #if [ -z "$DISPLAY" ] && [ "$XDG_VNTR" = 1 ]; then
       #  exec Hyprland
@@ -64,5 +56,4 @@ lib.mkIf (theShell == "zsh") {
       ".."="cd ..";
     };
   };
-  users.users.${username}.shell = pkgs.zsh;
 }
diff --git a/system.nix b/system.nix
index 7520d19..49384f4 100644
--- a/system.nix
+++ b/system.nix
@@ -4,7 +4,7 @@
 let 
   inherit (import ./options.nix) 
     theLocale theTimezone gitUsername
-    wallpaperDir wallpaperGit
+    theShell wallpaperDir wallpaperGit
     theLCVariables theKBDLayout;
 in {
   imports =
@@ -43,6 +43,8 @@ in {
     isNormalUser = true;
     description = "${gitUsername}";
     extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
+    shell = pkgs.${theShell};
+    ignoreShellProgramCheck = true;
     packages = with pkgs; [];
   };