From 26382d8d202ed41ca092af119db4c3efbda24448 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 16 May 2023 13:05:40 +0100
Subject: [PATCH] Fix Monarch new environment setup

---
 home/Monarch/tux.nix | 8 +++++++-
 home/env/bash.nix    | 6 +-----
 home/env/default.nix | 1 +
 home/env/fish.nix    | 6 +-----
 home/env/zsh.nix     | 7 +------
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/home/Monarch/tux.nix b/home/Monarch/tux.nix
index 1d9278f3..d2ea3403 100644
--- a/home/Monarch/tux.nix
+++ b/home/Monarch/tux.nix
@@ -1,6 +1,12 @@
 { ... }:
 {
-  imports = [ ../personal.nix ];
+  imports = [
+    ../env
+    ../tui
+    ../gui/wezterm.nix
+    ../git/personal.nix
+    ../ssh/personal.nix
+  ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "tux";
diff --git a/home/env/bash.nix b/home/env/bash.nix
index 699e0895..cdf78084 100644
--- a/home/env/bash.nix
+++ b/home/env/bash.nix
@@ -3,11 +3,7 @@
 {
   programs.bash = {
     enable = true;
-    shellAliases = {
-      lg = "lazygit";
-      hypr = "Hyprland -c $HOME/.config/hypr/hyprland-$(hostname).conf";
-      neovide = "WINIT_UNIX_BACKEND=x11 neovide";
-    };
+    shellAliases = { lg = "lazygit"; };
   };
   programs.keychain.enableBashIntegration = true;
   programs.starship.enableBashIntegration = true;
diff --git a/home/env/default.nix b/home/env/default.nix
index 6a3ffdfe..f20a6b4c 100644
--- a/home/env/default.nix
+++ b/home/env/default.nix
@@ -9,6 +9,7 @@
     ./nix-index.nix
     ./readline.nix
     ./starship.nix
+    ./zsh.nix
   ];
   home.packages = with pkgs; [ dig file gnumake silver-searcher ];
 }
diff --git a/home/env/fish.nix b/home/env/fish.nix
index 441e8be3..31927974 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -3,11 +3,7 @@
 {
   programs.fish = {
     enable = true;
-    shellAbbrs = {
-      lg = "lazygit";
-      hypr = "Hyprland -c $HOME/.config/hypr/hyprland-$(hostname).conf";
-      neovide = "WINIT_UNIX_BACKEND=x11 neovide";
-    };
+    shellAbbrs = { lg = "lazygit"; };
   };
   programs.keychain.enableFishIntegration = true;
   programs.starship.enableFishIntegration = true;
diff --git a/home/env/zsh.nix b/home/env/zsh.nix
index 808d996e..037d67f9 100644
--- a/home/env/zsh.nix
+++ b/home/env/zsh.nix
@@ -3,12 +3,7 @@
 {
   programs.zsh = {
     enable = true;
-    shellAliases = {
-      ll = "ls -l";
-      lg = "lazygit";
-      hypr = "Hyprland -c $HOME/.config/hypr/hyprland-$(hostname).conf";
-      neovide = "WINIT_UNIX_BACKEND=x11 neovide";
-    };
+    shellAliases = { ll = "ls -l"; lg = "lazygit"; };
     history = {
       size = 10000;
       path = "${config.xdg.dataHome}/zsh/history";