From 2404173359fff27c839f58f6cd2e7883495ce0f7 Mon Sep 17 00:00:00 2001
From: "A.Ottr" <alex@otter.foo>
Date: Fri, 16 Aug 2024 20:57:25 +0200
Subject: [PATCH] thanks sefa (unironically)

---
 flake.nix              | 3 ++-
 home/common/fish.nix   | 5 +++++
 home/otter/default.nix | 5 -----
 lib/nixosSystem.nix    | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5c5f8b7..68021da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,12 +37,13 @@
       #system = "x86_64-linux";
       nixosSystem = import ./lib/nixosSystem.nix;
       home-module = import ./home/ferret;
-      nixos-modules = import ./nixos/ferret;
+      nixos-modules =./nixos/ferret;
       ferret_modules = {
         inherit nixos-modules;
         inherit home-module;
       };
       args = {
+        inherit inputs;
         inherit nixpkgs;
         inherit home-manager;
         inherit system;
diff --git a/home/common/fish.nix b/home/common/fish.nix
index 32e3521..436cd66 100644
--- a/home/common/fish.nix
+++ b/home/common/fish.nix
@@ -18,6 +18,11 @@
         test (uname) = Darwin; and eval "$(/opt/homebrew/bin/brew shellenv)"
         '';
 
+        catppuccin = {
+            enable = true;
+            flavor = "macchiato";
+        };
+
         plugins = with pkgs.fishPlugins; [
             { name = "fzf"; src = fzf.src; }
             { name = "puffer"; src = puffer.src; } # https://github.com/nickeb96/puffer-fish
diff --git a/home/otter/default.nix b/home/otter/default.nix
index 38280f1..54fff1c 100644
--- a/home/otter/default.nix
+++ b/home/otter/default.nix
@@ -25,9 +25,4 @@
 
   programs.home-manager.enable = true;
 
-  programs.fish.catppuccin = {
-    enable = true;
-    flavor = "macchiato";
-  };
-
 }
diff --git a/lib/nixosSystem.nix b/lib/nixosSystem.nix
index 9fe3006..454390c 100644
--- a/lib/nixosSystem.nix
+++ b/lib/nixosSystem.nix
@@ -4,7 +4,8 @@
     specialArgs,
     home-module,
     nixos-modules,
-    system
+    system,
+    inputs
 }: let
     username = specialArgs.username;
 in
@@ -36,6 +37,7 @@ in
                 home-manager.useUserPackages = true;
 
                 home-manager.extraSpecialArgs = specialArgs;
+                home-manager.sharedModules = [inputs.catppuccin.homeManagerModules.catppuccin];
                 home-manager.users."${username}" = home-module;
             }
         ];
-- 
2.54.0