From 0a9342ea3e8536fde8c5073b528bd786b2bb0ce8 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Tue, 4 Feb 2025 20:58:42 -0500
Subject: [PATCH] major refactor and reorg

---
 README.md                     |  9 ++++++---
 homes/emenel/default.nix      | 18 ------------------
 hosts/eddie/configuration.nix | 36 +++++++++++++++++++++++++++++------
 overlays/ulauncher.nix        | 10 ++++++++++
 4 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 overlays/ulauncher.nix

diff --git a/README.md b/README.md
index fec43e8..fda6945 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,12 @@ This is my personal NixOS configuration that uses:
 - home-manager
 - musnix
 - affinity-nix
-- stanble and unstable packages
+- nixpkgs unstable
 - and more flakes...
 
-Some of the structure is loosely based on the starter configs from https://github.com/Misterio77/nix-starter-configs/tree/main
+Some of the structure is loosely based on inspiration from:
+- https://github.com/donovanglover/nix-config
+- https://gitlab.com/scientiac/einstein.nixos
+- and help from the community on the Nix/NixOS Community Discord (different from the "unofficial" discord)
 
-I don't know nix that well, so some of this will be a mess. It will also perpetually need refactoring.
\ No newline at end of file
+I don't know nix that well, so some of this will be a mess. It will also perpetually need refactoring.
diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix
index b1753c6..baee39a 100644
--- a/homes/emenel/default.nix
+++ b/homes/emenel/default.nix
@@ -352,21 +352,6 @@
         vital
         helio-workstation
         stochas
-
-        # Fonts
-        fira-code
-        fira
-        cooper-hewitt
-        ibm-plex
-        jetbrains-mono
-        iosevka
-        spleen
-        fira-code-symbols
-        powerline-fonts
-        noto-fonts-color-emoji
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-emoji
       ])
     ];
 
@@ -406,9 +391,6 @@
     fontconfig = {
       enable = true;
     };
-    # packages = [
-    #   pkgs.nerdfonts.jetbrains-mono
-    # ];
   };
 
   sops = {
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 3a870e3..4b008ae 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ nix-config, config, pkgs, lib, inputs, ... }:
+{ nix-config, config, pkgs, inputs, ... }:
 
 {
 
@@ -25,12 +25,13 @@
 
   nix = {
     # registry.nixpkgs.flake = nixpkgs;
-    channel.enable = false;
+    # channel.enable = false;
     settings = {
       experimental-features = [ "nix-command" "flakes" ];
-      substituters = [ "https://nix-community.cachix.org" ];
+      substituters = [ "https://nix-community.cachix.org" "https://cache.garnix.io" ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       ];
       # Workaround for https://github.com/NixOS/nix/issues/9574
       nix-path = config.nix.nixPath;
@@ -511,9 +512,32 @@
       libudev-zero.out
   ];
 
-  fonts.fontconfig = {
-    enable = true;
-    useEmbeddedBitmaps = true;
+  fonts = {
+    enableDefaultPackages = true;
+    fontDir.enable = true;
+    fontconfig = {
+      enable = true;
+      useEmbeddedBitmaps = true;
+    };
+    packages = with pkgs; [
+      fira-code
+      font-awesome
+      fira
+      cooper-hewitt
+      ibm-plex
+      jetbrains-mono
+      iosevka
+      spleen
+      fira-code-symbols
+      powerline-fonts
+      noto-fonts-color-emoji
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-emoji
+      nerd-fonts.jetbrains-mono
+      nerd-fonts.fira-code
+      nerd-fonts._0xproto
+    ];
   };
 
   powerManagement = {
diff --git a/overlays/ulauncher.nix b/overlays/ulauncher.nix
new file mode 100644
index 0000000..ea97172
--- /dev/null
+++ b/overlays/ulauncher.nix
@@ -0,0 +1,10 @@
+final: prev: {
+  ulauncher = prev.ulauncher.overrideAttrs (old: {
+    propagatedBuildInputs = with prev.python3Packages;
+      old.propagatedBuildInputs
+      ++ [
+        thefuzz
+        tornado
+      ];
+  });
+}