obliterate home-manager, rename some elements

graphical/dev.nix

@@ -1,27 +1,41 @@
 {
-  pkgs,
   localPkgs,
+  scope,
   ...
 }:
-{
+scope "user" {
 
-  home.packages = [
-    pkgs.direnv
+  packages = [
     localPkgs.rbw-helper
   ];
 
-  hm.programs.direnv = {
+  programs.direnv = {
     enable = true;
-    nix-direnv = {
-      enable = true;
-    };
-    enableFishIntegration = true;
+    integrations.fish.enable = true;
   };
 
-  hm.programs.git = {
+  programs.git = {
     enable = true;
-    userName = "atagen";
-    userEmail = "boss@atagen.co";
+    settings = {
+      user = {
+        name = "atagen";
+        email = "boss@atagen.co";
+      };
+      merge = {
+        conflictstyle = "diff3";
+      };
+      init = {
+        defaultBranch = "main";
+      };
+      url = {
+        "https://github.com/".insteadOf = "github:";
+        "https://git.atagen.co/".insteadOf = "atagen:";
+      };
+      credential.helper = "rbw";
+    };
+    integrations = {
+      difftastic.enable = true;
+    };
   };
 
 }