From 08774bd1802688d2a906a01c5bf5c7937901397a Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 24 Jul 2021 20:24:58 -0600
Subject: [PATCH] [NixOS] Configure zsh in NixOS configuration

---
 nixos/base.nix | 15 +++++++++++++--
 nixos/nixpkgs  |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/base.nix b/nixos/base.nix
index 4dd8975d..14b39c9a 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -40,8 +40,6 @@
     '';
   };
 
-  programs.zsh.enable = true;
-
   services.avahi = {
     enable = true;
     nssmdns = true;
@@ -73,6 +71,19 @@
   # TODO: Add a comment explaining what this does.
   services.gnome.at-spi2-core.enable = true;
 
+  # Shell configuration
+  programs.zsh = {
+    enable = true;
+    syntaxHighlighting = {
+      enable = true;
+    };
+    ohMyZsh = {
+      enable = true;
+      plugins = [ "git" "sudo" "pip" ];
+    };
+    spaceship-prompt.enable = true;
+  };
+
   services.openssh.enable = true;
 
   services.autorandr.enable = true;
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index 8d947495..fe2bcc77 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit 8d94749561763f58b8bdc3bc354d1803b1a31d31
+Subproject commit fe2bcc776a68b5d831c67cc78c6398729f8dca35