From 089187738edb5ab4052b93471b0f86447b037f0e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 2 May 2023 08:22:53 +0100
Subject: [PATCH] Update Monarch config

Update Monarch config file for restructure
Fix Makefile for new non-nixos structure
Add MacOS background blur to wezterm
---
 Makefile                                       |  2 +-
 nixos/home/Monarch-tux.nix                     | 17 +++++++++++++----
 nixos/home/terminal/config/wezterm/wezterm.lua |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 29f70ea3..ccf621a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 $(eval HOSTNAME=$(shell hostname))
 NIXOS_CONFIG := $(PWD)/nixos/$(HOSTNAME).nix
-HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)-$(USER).nix
+HOMEMANAGER_CONFIG := $(PWD)/nixos/home/$(HOSTNAME)-$(USER).nix
 CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
 SSH_DIR := $(HOME)/.ssh
 
diff --git a/nixos/home/Monarch-tux.nix b/nixos/home/Monarch-tux.nix
index 7cd7cc19..1fe6db53 100644
--- a/nixos/home/Monarch-tux.nix
+++ b/nixos/home/Monarch-tux.nix
@@ -1,9 +1,16 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ./env
-    ./env/git/personal.nix
-    ./tui
+    ./git/personal.nix
+    ./env/zsh.nix
+    ./env/bat.nix
+    ./env/direnv.nix
+    ./env/keychain.nix
+    ./env/ssh.nix
+    ./env/starship.nix
+    ./terminal/wezterm.nix
+    ./tui/neovim.nix
+    ./tui/lazygit.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -11,6 +18,8 @@
   home.homeDirectory = "/Users/tux";
   home.stateVersion = "22.11";
 
+  home.packages = with pkgs; [ silver-searcher ];
+
   programs.zsh.envExtra = ''
     eval "$(/opt/homebrew/bin/brew shellenv)"
   '';
diff --git a/nixos/home/terminal/config/wezterm/wezterm.lua b/nixos/home/terminal/config/wezterm/wezterm.lua
index 2968a40e..642c8f21 100644
--- a/nixos/home/terminal/config/wezterm/wezterm.lua
+++ b/nixos/home/terminal/config/wezterm/wezterm.lua
@@ -10,6 +10,7 @@ return {
     audible_bell = "Disabled",
     font_size = 14,
     window_background_opacity = 0.7,
+    macos_window_background_blur = 20,
     color_scheme = scheme_name,
     use_fancy_tab_bar = false,
     tab_max_width = 79,