6 files changed, 51 insertions, 49 deletions
diff --git a/home/profiles/git.nix b/home/profiles/git.nix
index c88705c..4821498 100644
--- a/home/profiles/git.nix
+++ b/home/profiles/git.nix
@@ -10,40 +10,22 @@ in
 {
   home.packages = with pkgs; [
     git-credential-manager
-    gitAndTools.pre-commit
+    pre-commit
   ];
 
-  programs.git = {
+  programs.delta = {
     enable = true;
+    options.features = "decorations side-by-side line-numbers";
+  };
 
-    delta = {
-      enable = true;
-      options.features = "decorations side-by-side line-numbers";
-    };
-
-    userName = lib.mkDefault userinfo.fullName;
-    userEmail = lib.mkDefault userinfo.email;
-
-    aliases = {
-      amend = "commit --amend";
-      a = "commit --amend --no-edit";
-      st = "status";
-      co = "checkout";
-      br = "branch";
-      rb = "pull --rebase";
-      hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all";
-      llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative";
-      logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate";
-      logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat";
-    };
-
-    ignores = [
-      ".DS_Store"
-      ".aider.*"
-      ".direnv"
-    ];
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = lib.mkDefault userinfo.fullName;
+        email = lib.mkDefault userinfo.email;
+      };
 
-    extraConfig = {
       core.whitespace = "trailing-space,space-before-tab";
       color.ui = true;
 
@@ -85,6 +67,25 @@ in
         autosetuprebase = "remote";
         sort = "authordate";
       };
+
+      aliases = {
+        amend = "commit --amend";
+        a = "commit --amend --no-edit";
+        st = "status";
+        co = "checkout";
+        br = "branch";
+        rb = "pull --rebase";
+        hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all";
+        llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative";
+        logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate";
+        logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat";
+      };
     };
+
+    ignores = [
+      ".DS_Store"
+      ".aider.*"
+      ".direnv"
+    ];
   };
 }
diff --git a/home/profiles/go.nix b/home/profiles/go.nix
index 87e7add..d6ea5f4 100644
--- a/home/profiles/go.nix
+++ b/home/profiles/go.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   home.packages = with pkgs; [
     go-tools # collection of tools, https://github.com/dominikh/go-tools
@@ -8,11 +8,12 @@
 
   programs.go = {
     enable = true;
-    goPath = ".local/share/pkg.go";
-    goBin = ".local/bin.go";
-    goPrivate = [
-      "github.rbx.com/*"
-      "github.com/fcuny/*"
-    ];
+    env = {
+      GOPATH = "${config.xdg.dataHome}/pkg.go";
+      GOPRIVATE = [
+        "github.rbx.com/*"
+        "fcuny.net/*"
+      ];
+    };
   };
 }
diff --git a/home/profiles/mac.nix b/home/profiles/mac.nix
index c7cfd3a..2aa369f 100644
--- a/home/profiles/mac.nix
+++ b/home/profiles/mac.nix
@@ -62,5 +62,9 @@ in
     SHELL = "${pkgs.fish}/bin/fish";
   };
 
+  home.sessionPath = [
+    "${config.home.homeDirectory}/.local/bin"
+  ];
+
   xdg.enable = true;
 }
diff --git a/home/profiles/media.nix b/home/profiles/media.nix
index 0d53f42..a2cfd9d 100644
--- a/home/profiles/media.nix
+++ b/home/profiles/media.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    darktable
     ffmpeg
     transmission_4
     vlc-bin
diff --git a/home/profiles/onepassword.nix b/home/profiles/onepassword.nix
index 232092e..f364a9e 100644
--- a/home/profiles/onepassword.nix
+++ b/home/profiles/onepassword.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 {
   programs.onepassword = {
     enable = true;
@@ -6,9 +6,4 @@
       { account = "my.1password.com"; } # All keys from personal account
     ];
   };
-
-  home.sessionPath = [
-    config.home.sessionVariables.GOBIN
-    "${config.home.homeDirectory}/.local/bin"
-  ];
 }
diff --git a/home/profiles/ssh.nix b/home/profiles/ssh.nix
index 250aff5..8e39def 100644
--- a/home/profiles/ssh.nix
+++ b/home/profiles/ssh.nix
@@ -2,13 +2,15 @@
 {
   programs.ssh = {
     enable = true;
-    forwardAgent = true;
-    serverAliveInterval = 60;
-    controlMaster = "auto";
-    controlPersist = "30m";
-    controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
-
+    enableDefaultConfig = false;
     matchBlocks = {
+      "*" = {
+        forwardAgent = true;
+        serverAliveInterval = 60;
+        controlPersist = "30m";
+        controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
+        controlMaster = "auto";
+      };
       "github.com" = {
         hostname = "github.com";
         user = "git";