From 15641df1d339461aafd64854f01e9ae2a427672c Mon Sep 17 00:00:00 2001
From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
Date: Sat, 11 Oct 2025 19:12:09 +0530
Subject: [PATCH] feat: use inputs in config

---
 flake.lock                      | 21 ---------------------
 flake.nix                       | 22 +++-------------------
 hosts/default/configuration.nix |  8 ++++++++
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index b68e72e..f19bc4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -278,26 +278,6 @@
         "type": "github"
       }
     },
-    "mustache2konsole": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752990396,
-        "narHash": "sha256-P8ariIwu7x3Njm6KbTacFsNkxxU5t9B/M2lRGB1I+xo=",
-        "owner": "lavafroth",
-        "repo": "mustache2konsole",
-        "rev": "f63133635d68fde4fd0de3316122be82525718b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lavafroth",
-        "repo": "mustache2konsole",
-        "type": "github"
-      }
-    },
     "nix-formatter-pack": {
       "inputs": {
         "nixpkgs": [
@@ -561,7 +541,6 @@
       "inputs": {
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
-        "mustache2konsole": "mustache2konsole",
         "nix-index-database": "nix-index-database",
         "nix-ld": "nix-ld",
         "nix-on-droid": "nix-on-droid",
diff --git a/flake.nix b/flake.nix
index 32fb6b8..fe8ea18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,31 +33,19 @@
   };
 
   outputs =
-    inputs@{
+    {
       nixpkgs,
-      home-manager,
       lanzaboote,
       sops-nix,
       nix-on-droid,
-      nix-index-database,
-      stylix,
-      nix-ld,
       ...
-    }:
+    }@inputs:
 
     let
       cafeModules = [
         ./hosts/default/configuration.nix
         ./cachix/nix-community.nix
-        home-manager.nixosModules.home-manager
         ./hosts/default/stylix.nix
-        stylix.nixosModules.stylix
-        nix-index-database.nixosModules.nix-index
-        { programs.nix-index-database.comma.enable = true; }
-
-        # uni requires us to use uv for python
-        # TODO: Restore binary isolation
-        nix-ld.nixosModules.nix-ld
       ];
 
       secureBootModules = [
@@ -65,12 +53,8 @@
         ./hosts/default/secureboot.nix
       ];
       system = "x86_64-linux";
-      specialArgs = {
-        inherit inputs;
-      };
-
+      specialArgs = { inherit inputs; };
     in
-
     {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;
       nixosConfigurations = {
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index fb42729..a5a6733 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -1,5 +1,6 @@
 {
   pkgs,
+  inputs,
   ...
 }:
 
@@ -10,6 +11,12 @@
     ./phone-as-webcam.nix
     ./virtualization.nix
     ./desktops/kde.nix
+    inputs.home-manager.nixosModules.home-manager
+    inputs.nix-index-database.nixosModules.nix-index
+    inputs.stylix.nixosModules.stylix
+    # uni requires us to use uv for python
+    # TODO: Restore binary isolation
+    inputs.nix-ld.nixosModules.nix-ld
   ];
 
   boot = {
@@ -115,6 +122,7 @@
     "nix-command"
     "flakes"
   ];
+  programs.nix-index-database.comma.enable = true;
 
   security = {
     rtkit.enable = true;