about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2023-03-13 18:59:07 -0700
committerFranck Cuny <franck@fcuny.net>2023-03-13 18:59:07 -0700
commitaa67ff926c2ff0fd2af51a0a522fd37f6f080c31 (patch)
tree6a76d8529c4f1e3462f8c46bdec6c8a370a190a8
parenthome/passage: delete all references to password-store (diff)
downloadworld-aa67ff926c2ff0fd2af51a0a522fd37f6f080c31.tar.gz
home/git: some cleanup
- add a comment for each ssh-key that is not stored on a yubikey
- simplify the git commit template
- remove some extra config that I don't need
-rw-r--r--configs/ssh-pubkeys.toml4
-rw-r--r--home/git/commit.template14
-rw-r--r--home/git/default.nix4
3 files changed, 5 insertions, 17 deletions
diff --git a/configs/ssh-pubkeys.toml b/configs/ssh-pubkeys.toml
index 2f07322..df9bb25 100644
--- a/configs/ssh-pubkeys.toml
+++ b/configs/ssh-pubkeys.toml
@@ -1,6 +1,10 @@
+# this used to be the main key for my laptop
 aptos="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIdlm/qoR/dnMjZhVSTtqFzkgN3Yf9eQ3pgKMiipg+dl"
+# this used to be the key I used to sign commits
 git="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItMKXWzH00xS7kYJzDCIr/PM9DaZw+imK/byjrY5WNv"
+# this is the key from work
 work="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINSWhXmnUplM+xltD0sYiJ6AsjkwHvbjTYLA7GHXHja9"
+
 ykey-laptop="sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIGX4+CuUjiX6Doi4n6RqmznzFUyRrxKhEFvuIxROzXDKAAAABHNzaDo="
 ykey-keyring="sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDnU4Xd8bElZYVWDbknlIgskR/q7ORrbvO0FLnJMQX+eAAAABHNzaDo="
 ykey-backup="sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINEGiZpKcXQtB7P7k5puV5OAeMlnB7qRLm+HRI5/OKTbAAAABHNzaDo="
diff --git a/home/git/commit.template b/home/git/commit.template
index 5247d2a..b116a68 100644
--- a/home/git/commit.template
+++ b/home/git/commit.template
@@ -1,5 +1,5 @@
 
-# (If applied, this commit will...) <type>: <subject>
+# (If applied, this commit will...) <subject>
 
 # Explain why this change is being made
 
@@ -9,15 +9,3 @@
 #    Do not end the subject line with a period
 #    Use the body to explain what and why vs. how
 #    Can use multiple lines with "-" for bullet points in body
-
-# Suggested types:
-# build: Changes that affect the build system or external dependencies
-# ci:    Changes to CI configuration files and scripts
-# docs:  Documentation only changes
-# feat:  A new feature
-# fix:   A bug fix
-# perf:  A code change that improves performance
-# ref:   A code change that neither fixes a bug nor adds a feature (refactor)
-# style: Changes that do not affect the meaning of the code
-# tests: Adding missing tests or correcting existing tests
-# meta:  Some meta information in the repo changes
diff --git a/home/git/default.nix b/home/git/default.nix
index 3e0ea08..e840f54 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -55,10 +55,6 @@ in
       };
       userName = "Franck Cuny";
       userEmail = "franck@fcuny.net";
-      extraConfig = {
-        "credential \"https://github.com\"" = { username = "fcuny"; };
-        "credential \"https://git.fcuny.net\"" = { username = "fcuny"; };
-      };
       ignores = [ (builtins.readFile ./gitignore) ];
     };
     xdg.dataFile."git/commit.template" = { source = ./commit.template; };