From 87a6c1a8622d184f39a1c8ba5c42b1362678689c Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Sun, 29 Jun 2025 19:15:33 +0530
Subject: [PATCH] home: refactor common files

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 home/amneesh.nix                              |  3 +--
 .../{programs.nix => direnv/default.nix}      |  0
 .../emacs.nix => common/emacs/default.nix}    |  0
 home/{modules => common}/fonts/default.nix    |  0
 home/common/{zsh.nix => zsh/default.nix}      |  0
 home/default.nix                              |  8 +++---
 home/natto/pkgs.nix                           | 27 -------------------
 home/natto/programs.nix                       |  1 +
 8 files changed, 7 insertions(+), 32 deletions(-)
 rename home/common/{programs.nix => direnv/default.nix} (100%)
 rename home/{natto/emacs.nix => common/emacs/default.nix} (100%)
 rename home/{modules => common}/fonts/default.nix (100%)
 rename home/common/{zsh.nix => zsh/default.nix} (100%)

diff --git a/home/amneesh.nix b/home/amneesh.nix
index 9e3642c..6d3e97d 100644
--- a/home/amneesh.nix
+++ b/home/amneesh.nix
@@ -14,8 +14,7 @@
   };
 
   imports = [
-    ./natto/emacs.nix
-   # ./natto/wayland.nix
+     ./programs/emacs
   ];
 
   xdg.mime.enable = true;
diff --git a/home/common/programs.nix b/home/common/direnv/default.nix
similarity index 100%
rename from home/common/programs.nix
rename to home/common/direnv/default.nix
diff --git a/home/natto/emacs.nix b/home/common/emacs/default.nix
similarity index 100%
rename from home/natto/emacs.nix
rename to home/common/emacs/default.nix
diff --git a/home/modules/fonts/default.nix b/home/common/fonts/default.nix
similarity index 100%
rename from home/modules/fonts/default.nix
rename to home/common/fonts/default.nix
diff --git a/home/common/zsh.nix b/home/common/zsh/default.nix
similarity index 100%
rename from home/common/zsh.nix
rename to home/common/zsh/default.nix
diff --git a/home/default.nix b/home/default.nix
index 09a32e2..31a2c42 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,8 +1,9 @@
 { self, inputs, globalArgs, ... }:
 let
   common = [
-    ./common/zsh.nix
-    ./common/programs.nix
+    { programs.home-manager.enable = true; }
+    ./common/zsh
+    ./common/direnv
   ];
 
   mkPkgs = system: import inputs.nixpkgs {
@@ -23,7 +24,8 @@ in
 
       nattoModules = [
         ./natto
-        ./modules/fonts
+        ./common/fonts
+        ./common/emacs
         ./common/laptop.nix
         inputs.agenix.homeManagerModules.default
       ] ++ common;
diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix
index 95d5b4f..340abb6 100644
--- a/home/natto/pkgs.nix
+++ b/home/natto/pkgs.nix
@@ -37,33 +37,6 @@
     dunst
     zenity
 
-    # Programming and dev stuff
-    (texlive.combine {
-      inherit (texlive)
-        scheme-small
-        babel
-        lm
-        graphics-def
-        url
-        mhchem
-        wrapfig
-        capt-of
-        minted
-        fvextra
-        xstring
-        catchfile
-        framed
-        upquote
-        pdfsync
-        tocloft
-        enumitem
-        multirow
-        adjustbox
-        titlesec
-        tcolorbox;
-    })
-    python3Packages.pygments
-
     # Misc
     anki
     tor-browser-bundle-bin
diff --git a/home/natto/programs.nix b/home/natto/programs.nix
index cbb0a3e..fbb939b 100644
--- a/home/natto/programs.nix
+++ b/home/natto/programs.nix
@@ -25,6 +25,7 @@
       enable = true;
     };
 
+    password-store.enable = true;
     go.enable = true;
     foot = {
       enable = true;