Merge branch 'master' of github.com:IvanMalison/dotfiles

nixos/appearance.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    # Appearance
-    gnome-breeze
-    gnome3.adwaita-icon-theme
-    hicolor-icon-theme
-    materia-theme
-    numix-icon-theme-circle
-    papirus-icon-theme
-  ];
-}

nixos/base.nix

@@ -8,7 +8,6 @@
 
   nixpkgs.overlays = [
     (import ../dotfiles/config/xmonad/overlay.nix)
-    (import ../dotfiles/config/taffybar/overlay.nix)
   ];
 
   # Allow all the things
@@ -41,8 +40,6 @@
     '';
   };
 
-  programs.zsh.enable = true;
-
   services.avahi = {
     enable = true;
     nssmdns = true;
@@ -74,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;

nixos/essential.nix

@@ -27,6 +27,8 @@ in
     element-desktop
 
     # Appearance
+    numix-icon-theme-circle
+    papirus-icon-theme
     hicolor-icon-theme
 
     # XOrg

nixos/flake.nix

@@ -21,7 +21,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     taffybar = {
-      url = path:../dotfiles/config/taffybar;
+      url = path:../dotfiles/config/taffybar/taffybar;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     notifications-tray-icon = {
@@ -41,7 +41,7 @@
     };
     nixpkgs.overlays = [
       nix.overlay xmonad.overlay xmonad-contrib.overlay
-      notifications-tray-icon.overlay
+      notifications-tray-icon.overlay (import ../dotfiles/config/taffybar/overlay.nix)
     ] ++ taffybar.overlays;
     imports = [
       home-manager.nixosModule