From a6bd611c25165f83ebebac4141ad94eb27b72aba Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Wed, 9 Jul 2025 04:43:48 +0800
Subject: [PATCH] fix(nix): bring up to feature parity

---
 nix/homes/rafiq/git.nix |  1 +
 nix/manifest.nix        | 12 +++++++++---
 nix/modules/cli/git.nix |  7 ++++++-
 nix/modules/cli/nix.nix |  6 ++++++
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 nix/modules/cli/nix.nix

diff --git a/nix/homes/rafiq/git.nix b/nix/homes/rafiq/git.nix
index 7d4d6fd..fd6d21d 100644
--- a/nix/homes/rafiq/git.nix
+++ b/nix/homes/rafiq/git.nix
@@ -9,6 +9,7 @@
       gdh = "git diff HEAD";
     };
     programs.git = {
+      enable = true;
       signing.signByDefault = true;
       extraConfig = {
         init.defaultBranch = "prime";
diff --git a/nix/manifest.nix b/nix/manifest.nix
index 4479b14..d508518 100644
--- a/nix/manifest.nix
+++ b/nix/manifest.nix
@@ -21,9 +21,15 @@
             scale = "2";
           };
         };
-        extraCfg.server.web-apps = {
-          comfy-ui.enable = true;
-          sd-webui-forge.enable = true;
+        extraCfg = {
+          machine = {
+            bluetooth.enable = true;
+            usb.automount = true;
+          };
+          server.web-apps = {
+            comfy-ui.enable = true;
+            sd-webui-forge.enable = true;
+          };
         };
       };
       apollo = {
diff --git a/nix/modules/cli/git.nix b/nix/modules/cli/git.nix
index aee5432..c609a1a 100644
--- a/nix/modules/cli/git.nix
+++ b/nix/modules/cli/git.nix
@@ -1,9 +1,14 @@
+{ config, ... }:
+let
+  inherit (config.flake) manifest;
+in
 {
   flake.modules.homeManager.default =
-    { manifest, config, ... }:
+    { config, ... }:
     {
       home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
       programs.git = {
+        enable = true;
         userName = manifest.users.${config.home.username}.name;
         userEmail = manifest.users.${config.home.username}.email;
         signing.key = "~/.ssh/id_ed25519.pub";
diff --git a/nix/modules/cli/nix.nix b/nix/modules/cli/nix.nix
new file mode 100644
index 0000000..ad97ee5
--- /dev/null
+++ b/nix/modules/cli/nix.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.nixos.default.nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+}