From 3e0b5740521e42b39e4859c2c1a472995c5f0a20 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:00:00 +0100
Subject: [PATCH] Extract a direnv mixin

---
 home/opdavies/hosts/PW05CH3L.nix     |  1 -
 home/opdavies/hosts/lemp11.nix       |  1 -
 home/opdavies/hosts/nixedo.nix       |  6 +-----
 home/opdavies/hosts/t480.nix         |  1 -
 home/opdavies/hosts/t490.nix         |  1 -
 hosts/PW05CH3L/configuration.nix     |  1 +
 hosts/t480/configuration.nix         |  1 +
 modules/home-manager/cli/default.nix |  1 -
 modules/home-manager/cli/direnv.nix  | 18 ------------------
 modules/mixins/direnv.nix            | 10 ++++++++++
 10 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 modules/home-manager/cli/direnv.nix
 create mode 100644 modules/mixins/direnv.nix

diff --git a/home/opdavies/hosts/PW05CH3L.nix b/home/opdavies/hosts/PW05CH3L.nix
index 335b3926..bb5e155e 100644
--- a/home/opdavies/hosts/PW05CH3L.nix
+++ b/home/opdavies/hosts/PW05CH3L.nix
@@ -7,7 +7,6 @@
 
 {
   homeManagerModules = {
-    direnv.enable = true;
     neovim.enable = true;
 
     notes = {
diff --git a/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix
index 2d7d85fe..df0509dd 100644
--- a/home/opdavies/hosts/lemp11.nix
+++ b/home/opdavies/hosts/lemp11.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    direnv.enable = true;
     discord.enable = true;
     flameshot.enable = true;
     gimp.enable = true;
diff --git a/home/opdavies/hosts/nixedo.nix b/home/opdavies/hosts/nixedo.nix
index 24b80a4a..ffcd4415 100644
--- a/home/opdavies/hosts/nixedo.nix
+++ b/home/opdavies/hosts/nixedo.nix
@@ -1,5 +1 @@
-{
-  homeManagerModules = {
-    direnv.enable = true;
-  };
-}
+{ }
diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
index 8fb8334a..3f866d00 100644
--- a/home/opdavies/hosts/t480.nix
+++ b/home/opdavies/hosts/t480.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    direnv.enable = true;
     discord.enable = true;
     flameshot.enable = true;
     gimp.enable = true;
diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix
index 2a1ff60c..6c806419 100644
--- a/home/opdavies/hosts/t490.nix
+++ b/home/opdavies/hosts/t490.nix
@@ -2,7 +2,6 @@
 
 {
   homeManagerModules = {
-    direnv.enable = true;
     discord.enable = true;
     flameshot.enable = true;
     gimp.enable = true;
diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index eb4b91c2..589ab6c1 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/phpactor
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index bfe33d55..85cd3ae8 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -10,6 +10,7 @@
     ../../modules/profiles/dwm
 
     ../../modules/mixins/bluetooth.nix
+    ../../modules/mixins/direnv.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/pipewire.nix
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index c88ae407..eb6e3794 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./bin
-    ./direnv.nix
     ./fzf.nix
     ./git.nix
     ./neovim
diff --git a/modules/home-manager/cli/direnv.nix b/modules/home-manager/cli/direnv.nix
deleted file mode 100644
index e733a501..00000000
--- a/modules/home-manager/cli/direnv.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
-  options.homeManagerModules.direnv.enable = mkEnableOption "Enable direnv";
-
-  config = mkIf config.homeManagerModules.direnv.enable {
-    programs.direnv = {
-      enable = true;
-      enableZshIntegration = true;
-
-      nix-direnv.enable = true;
-
-      silent = true;
-    };
-  };
-}
diff --git a/modules/mixins/direnv.nix b/modules/mixins/direnv.nix
new file mode 100644
index 00000000..3b706805
--- /dev/null
+++ b/modules/mixins/direnv.nix
@@ -0,0 +1,10 @@
+{
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+
+    nix-direnv.enable = true;
+
+    silent = true;
+  };
+}