From a87c9565a72bf3515197d75aaf9762b2d239244f Mon Sep 17 00:00:00 2001
From: uku <uku3lig@gmail.com>
Date: Mon, 13 Nov 2023 17:16:46 +0100
Subject: [PATCH] add programs directory

---
 common.nix           | 26 +-------------------------
 programs/default.nix |  7 +++++++
 programs/git.nix     | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 programs/default.nix
 create mode 100644 programs/git.nix

diff --git a/common.nix b/common.nix
index a845108..3dc91d1 100644
--- a/common.nix
+++ b/common.nix
@@ -9,6 +9,7 @@
   username = "leo";
 in {
   imports = [
+    ./programs
     (lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
   ];
 
@@ -157,27 +158,6 @@ in {
     };
 
     # wayland.windowManager.hyprland.enable = true;
-
-    programs.git = {
-      enable = true;
-      userName = "uku";
-      userEmail = "uku3lig@gmail.com";
-
-      signing = {
-        key = "0D2F5CFF394C558D4F1C58937D01D7B105E77166";
-        signByDefault = true;
-      };
-
-      extraConfig = {
-        core.autocrlf = "input";
-        push.autoSetupRemote = true;
-      };
-    };
-
-    programs.gh = {
-      enable = true;
-      settings.git_protocol = "ssh";
-    };
   };
 
   programs = {
@@ -190,10 +170,6 @@ in {
 
     hyprland.enable = true;
 
-    git = {
-      enable = true;
-    };
-
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
diff --git a/programs/default.nix b/programs/default.nix
new file mode 100644
index 0000000..2b8e737
--- /dev/null
+++ b/programs/default.nix
@@ -0,0 +1,7 @@
+{lib, ...}: {
+  imports = lib.pipe ./. [
+    builtins.readDir
+    (lib.filterAttrs (n: _: n != "default.nix"))
+    (lib.mapAttrsToList (n: _: ./${n}))
+  ];
+}
diff --git a/programs/git.nix b/programs/git.nix
new file mode 100644
index 0000000..b226a13
--- /dev/null
+++ b/programs/git.nix
@@ -0,0 +1,26 @@
+{
+  programs.git.enable = true;
+
+  hm.programs = {
+    git = {
+      enable = true;
+      userName = "uku";
+      userEmail = "uku3lig@gmail.com";
+
+      signing = {
+        key = "0D2F5CFF394C558D4F1C58937D01D7B105E77166";
+        signByDefault = true;
+      };
+
+      extraConfig = {
+        core.autocrlf = "input";
+        push.autoSetupRemote = true;
+      };
+    };
+
+    gh = {
+      enable = true;
+      settings.git_protocol = "ssh";
+    };
+  };
+}