From 923b66d0309db73ec825a456fb647fb6ea285b5c Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Sat, 18 Nov 2023 00:57:03 -0800
Subject: [PATCH] Fixes stylix on darwin

---
 common/system.nix               |  3 +++
 common/wallpapers.nix           | 10 +++++++---
 home/darwin/launchd.nix         |  2 --
 home/default.nix                |  3 +--
 home/modules/emacs.nix          |  1 +
 home/programs/default.nix       |  3 +++
 home/programs/emacs/default.nix |  1 -
 home/programs/emacs/init.el     |  6 ++++--
 nixos/hosts/zeus.nix            |  1 +
 nixos/profiles/default.nix      |  2 --
 10 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/common/system.nix b/common/system.nix
index 53eb865..e061d55 100644
--- a/common/system.nix
+++ b/common/system.nix
@@ -4,6 +4,9 @@
   globals,
   ...
 }: {
+  stylix.image = pkgs.fetchurl globals.wallpapers.current;
+  stylix.polarity = "dark";
+
   environment.pathsToLink = ["/share/zsh"];
   environment.shells = [pkgs.bashInteractive pkgs.zsh];
   environment.systemPackages = [pkgs.coreutils pkgs.git];
diff --git a/common/wallpapers.nix b/common/wallpapers.nix
index 73d02f2..1dc0648 100644
--- a/common/wallpapers.nix
+++ b/common/wallpapers.nix
@@ -4,13 +4,17 @@ rec {
     sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs=";
   };
   fireportal = {
-    url = "https://w.wallhaven.cc/full/2y/wallhaven-2y6wwg.jpg";
-    sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs=";
+    url = "https://w.wallhaven.cc/full/jx/wallhaven-jxlwpm.jpg";
+    sha256 = "sha256-QhkMeInFBk7nEvyvpo0Lg20PmdPBKk8jQLY6vsLfzy4=";
   };
   mapleleaves = {
     url = "https://w.wallhaven.cc/full/8x/wallhaven-8xxqey.jpg";
     sha256 = "sha256-ohax2KzOmRt8JyUXO/7pDcy1EHXCdbfmzKzr9T3/hRk=";
   };
+  kdb = {
+    url = "https://git.kdb424.xyz/kdb424/wallpapers/raw/branch/main/wallhaven-7p3we9.png";
+    sha256 = "05acf2czadfnxswnqpgx9rsx71mqspmz5kafi3i1d2z191az6inf";
+  };
 
-  current = hexflames;
+  current = fireportal;
 }
diff --git a/home/darwin/launchd.nix b/home/darwin/launchd.nix
index f0bc3c6..575d9a6 100644
--- a/home/darwin/launchd.nix
+++ b/home/darwin/launchd.nix
@@ -13,8 +13,6 @@ in {
       enable = true;
       config = {
         EnvironmentVariables = {
-          TERM = "xterm-kitty";
-          TERMINFO = "${config.programs.kitty.package}/Applications/kitty.app/Contents/Resources/kitty/terminfo";
           TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo";
         };
         ProgramArguments = [
diff --git a/home/default.nix b/home/default.nix
index d87d8b6..65474b2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -14,10 +14,9 @@ in rec {
     ./modules/nix/pkgs-config.nix
     ./modules/nix/use-flake-pkgs.nix
     inputs.nix-index-database.hmModules.nix-index
-    inputs.stylix.homeManagerModules.stylix
   ];
 
-  stylix.image = pkgs.fetchurl globals.wallpapers.current;
+  stylix.opacity.terminal = 0.80;
 
   home = {
     username = globals.username;
diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index 5064560..6c20a58 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -40,6 +40,7 @@ in {
 
     programs.emacs.extraPackages = mkIf cfg.enableOrgTex cfg.texEmacsPackages;
 
+    home.file.".emacs.d/nix-extraconfig.el".text = cfg.extraConfig;
     home.file.".emacs.d/org-tex-cfg.el" = mkIf cfg.enableOrgTex (fileFromPathOrText cfg.orgTexConfigFile);
     home.file.".emacs.d/early-init.el" = fileFromPathOrText cfg.earlyInitFile;
     home.file.".emacs.d/init.el" = fileFromPathOrText cfg.initFile;
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 39fec42..0044ef3 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -16,6 +16,9 @@
 
     bash.enableCompletion = true;
 
+    alacritty.enable = true;
+    alacritty.settings.font.normal.style = lib.mkForce "Book";
+
     direnv = {
       enable = true;
       enableBashIntegration = true;
diff --git a/home/programs/emacs/default.nix b/home/programs/emacs/default.nix
index 1a3b612..374246b 100644
--- a/home/programs/emacs/default.nix
+++ b/home/programs/emacs/default.nix
@@ -49,7 +49,6 @@
         rustic
         s
         separedit
-        solarized-theme
         swiper
         yasnippet
       ])
diff --git a/home/programs/emacs/init.el b/home/programs/emacs/init.el
index 0001d0c..19daf7f 100644
--- a/home/programs/emacs/init.el
+++ b/home/programs/emacs/init.el
@@ -87,6 +87,10 @@
  (when (file-exists-p org-config)
    (load-file org-config))
 )
+(let ((nix-extraconfig (expand-file-name "~/.emacs.d/nix-extraconfig.el")))
+ (when (file-exists-p nix-extraconfig)
+   (load-file nix-extraconfig))
+)
 
 (setq org-directory (expand-file-name "~/Documents/org"))
 
@@ -259,8 +263,6 @@
 (global-set-key (kbd "C-c '") 'separedit)
 (add-hook 'separedit-buffer-creation-hook 'normal-mode)
 
-(load-theme 'solarized-gruvbox-dark t)
-
 (global-set-key (kbd "C-s") 'swiper)
 
 (setq yas-snippet-dirs (list (expand-file-name "snippets" org-directory)))
diff --git a/nixos/hosts/zeus.nix b/nixos/hosts/zeus.nix
index eb7e625..18e7554 100644
--- a/nixos/hosts/zeus.nix
+++ b/nixos/hosts/zeus.nix
@@ -13,6 +13,7 @@
     ../users/willem/home/darwin.nix
     ../modules/yabai/default.nix
     ../modules/yabai/scripting-additions.nix
+    inputs.stylix.darwinModules.stylix
   ];
 
   nix = {
diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix
index 4d91f28..0b2f1a6 100644
--- a/nixos/profiles/default.nix
+++ b/nixos/profiles/default.nix
@@ -15,8 +15,6 @@
     inputs.stylix.nixosModules.stylix
   ];
 
-  stylix.image = pkgs.fetchurl globals.wallpapers.current;
-
   programs.command-not-found.enable = false;
 
   console.keyMap = "colemak";