reorganization

modules/software/tools/direnv.nix

@@ -0,0 +1,18 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.software.tools.direnv;
+in {
+  options.modules.software.tools.direnv = {
+    enable = mkEnableOption "Enable direnv, a shell extension that manages your environment";
+  };
+
+  config = mkIf cfg.enable {
+    programs.direnv = {
+      enable = true;
+      silent = true;
+      nix-direnv.enable = true;
+    };
+  };
+}

modules/software/tools/git.nix

@@ -0,0 +1,66 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+let
+  cfg = config.modules.software.tools.git;
+in {
+  options.modules.software.tools.git = {
+    enable = mkEnableOption "Enable git. You know what git is";
+    package = mkOption {
+      type = types.package;
+      default = pkgs.gitFull;
+      example = "pkgs.gitFull";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    hm.programs.git = {
+      enable = true;
+      package = cfg.package;
+
+      settings = {
+        user.name = ''reidlab'';
+        user.email = "reidlab325@gmail.com";
+
+        alias = {
+          amend = ''commit --amend --no-edit'';
+          amendall = ''commit --amend --no-edit --all'';
+        };
+
+        credential.helper = "${cfg.package}/bin/git-credential-libsecret";
+
+        push.autoSetupRemote = true;
+        push.gpgSign = "if-asked";
+        pull.rebase = true;
+
+        init.defaultBranch = "main";
+      };
+
+      signing = {
+        signByDefault = true;
+        format = "openpgp";
+        key = "DAF5EAF6665839FD"; # :tfm_derp:
+      };
+
+      ignores = [
+        # General
+        "*.direnv"
+        "*.envrc"
+
+        # OS related
+        ".DS_Store?"
+        ".DS_Store"
+        ".CFUserTextEncoding"
+        ".Trash"
+        ".Xauthority"
+        "thumbs.db"
+        "Thumbs.db"
+        "Icon?"
+      ];
+
+    };
+    hm.programs.delta.enable = true;
+    hm.programs.delta.enableGitIntegration = true;
+    hm.programs.gh.enable = true;
+  };
+}

modules/software/tools/noisetorch.nix

@@ -1,14 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.modules.software.tools.noisetorch;
-in {
-  options.modules.software.tools.noisetorch = {
-    enable = mkEnableOption "Enable noisetorch, a microphone noise supression tool";
-  };
-
-  config = mkIf cfg.enable {
-    programs.noisetorch.enable = true;
-  };
-}