direnv

3 files changed, 23 insertions, 16 deletions

diff --git a/modules/user/desktop/sessions/sway.nix b/modules/user/desktop/sessions/sway.nix
index 8fd7f36..298a1a5 100644
--- a/modules/user/desktop/sessions/sway.nix
+++ b/modules/user/desktop/sessions/sway.nix
@@ -262,7 +262,7 @@
 
         seat."seat0".xcursor_theme = "catppuccin-mocha-dark-cursors 24";
         window = {
-          commands = [];
+          commands = [ ];
           titlebar = false;
         };
 
diff --git a/modules/user/direnv.nix b/modules/user/direnv.nix
new file mode 100644
index 0000000..3d44531
--- /dev/null
+++ b/modules/user/direnv.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  programs.direnv.nix-direnv.enable = true;
+}
diff --git a/modules/user/zsh/default.nix b/modules/user/zsh/default.nix
index 3901f36..48876fc 100644
--- a/modules/user/zsh/default.nix
+++ b/modules/user/zsh/default.nix
@@ -5,21 +5,24 @@
   ...
 }:
 {
-  config.programs.zsh = {
-    enable = lib.mkDefault true; # default user shell
-    autocd = true;
-    autosuggestion = {
-      enable = lib.mkDefault true;
-      strategy = [
-        "history"
-        "completion"
-      ];
-    };
+  config.programs = {
+    direnv.enable = lib.mkDefault config.programs.zsh.enable;
+    zsh = {
+      enable = lib.mkDefault true; # default user shell
+      autocd = true;
+      autosuggestion = {
+        enable = lib.mkDefault true;
+        strategy = [
+          "history"
+          "completion"
+        ];
+      };
 
-    history.ignoreAllDups = true;
-    initContent = builtins.readFile ./zshrc.zsh;
-    loginExtra = builtins.readFile ./zlogin.zsh;
-    setOptions = [ "extendedglob" ];
-    syntaxHighlighting.enable = true;
+      history.ignoreAllDups = true;
+      initContent = builtins.readFile ./zshrc.zsh;
+      loginExtra = builtins.readFile ./zlogin.zsh;
+      setOptions = [ "extendedglob" ];
+      syntaxHighlighting.enable = true;
+    };
   };
 }