From ed68e6541c89e65ee654c1eb9ed9dce64ac1613e Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Sat, 13 Apr 2024 15:52:28 -0700
Subject: Update ginaz to be heavily modular

---
 home/nipsy/common/optional/desktops/default.nix    | 16 ++++++++++++++++
 home/nipsy/common/optional/desktops/i3/default.nix | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'home')

diff --git a/home/nipsy/common/optional/desktops/default.nix b/home/nipsy/common/optional/desktops/default.nix
index 0bb8411..41a498b 100644
--- a/home/nipsy/common/optional/desktops/default.nix
+++ b/home/nipsy/common/optional/desktops/default.nix
@@ -1,7 +1,23 @@
+{ config, pkgs, ... }:
 {
   imports = [
     ./gtk.nix
     ./i3
     ./services/dunst.nix
   ];
+
+  programs.password-store = {
+    enable = true;
+    package =  pkgs.pass.withExtensions (exts: with exts; [
+      pass-otp
+    ]);
+    settings = {
+      PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
+    };
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
 }
diff --git a/home/nipsy/common/optional/desktops/i3/default.nix b/home/nipsy/common/optional/desktops/i3/default.nix
index d369ff2..4eb0170 100644
--- a/home/nipsy/common/optional/desktops/i3/default.nix
+++ b/home/nipsy/common/optional/desktops/i3/default.nix
@@ -1,10 +1,18 @@
+{ pkgs, ... }:
 {
+  home.packages = [
+    pkgs.dmenu
+    pkgs.picom
+  ];
+
   programs.i3status = {
     enable = true;
   };
 
+  services.network-manager-applet.enable = true;
+
   xsession.windowManager.i3 = {
     enable = true;
-    extraConfig = (builtins.readFile ./config);
+    #extraConfig = (builtins.readFile ./config);
   };
 }
-- 
cgit v1.2.3