Update some configuration

jonringer · Dec 30, 2023 · b9d3c14 · b9d3c14
1 parent 8cd40fe
commit b9d3c14
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/home.nix b/home.nix
@@ -108,6 +108,7 @@ in
 
       Host *
         ForwardAgent yes
+        AddKeysToAgent yes
         GSSAPIAuthentication no
         RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
       '';
@@ -170,6 +171,7 @@ in
         rebase=true;
       };
       mergetool.prompt = "false";
+      git.path = toString pkgs.git;
     };
     includes = [
       # use different signing key
@@ -183,6 +185,16 @@ in
       #    };
       #  };
       #}
+      {
+        condition = "gitdir:~/comm/comm";
+        contents = {
+          user = {
+            name = "Jonathan Ringer";
+            email = "[email protected]";
+            signingKey = "SHA256:KtR4tLVU9XtEqWk5V1IuBfpZ/vvtAtSxxE49EE47MWQ";
+          };
+        };
+      }
       # prevent background gc thread from constantly blocking reviews
       {
         condition = "gitdir:~/projects/nixpkgs";

diff --git a/vim.nix b/vim.nix
@@ -85,6 +85,9 @@ pkgs:
     set foldlevelstart=99
     set foldcolumn=0
 
+    " Displays column at character
+    set colorcolumn=80
+
     set list
     set listchars=tab:>-