From 653d5325e197a4ed0e04a0a10c0b39e7eb7107b7 Mon Sep 17 00:00:00 2001 From: xnm Date: Wed, 21 Feb 2024 01:50:22 +0200 Subject: [PATCH] refactored `.gitconfig` --- README.md | 2 +- home/.config/gh/config.yml | 2 +- home/.gitconfig | 20 ++++++++++--------- home/.ssh/config | 17 ++++++++++++++++ home/projects/.gitconfig.personal | 10 ++++++++++ .../optimized-pre-config-rust/Cargo.toml | 0 .../optimized-pre-config-rust/flake.nix | 0 .../optimized-pre-config-rust/justfile | 0 .../rust-toolchain.toml | 0 home/work/.gitconfig.work | 13 ++++++++++++ 10 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 home/.ssh/config create mode 100644 home/projects/.gitconfig.personal rename home/{Projects => projects}/optimized-pre-config-rust/Cargo.toml (100%) rename home/{Projects => projects}/optimized-pre-config-rust/flake.nix (100%) rename home/{Projects => projects}/optimized-pre-config-rust/justfile (100%) rename home/{Projects => projects}/optimized-pre-config-rust/rust-toolchain.toml (100%) create mode 100644 home/work/.gitconfig.work diff --git a/README.md b/README.md index b46c6d5..7f5e291 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ Here are some tips to enhance your Rust experience on this system: This repo contains a NixOS configuration file (`nixos/yubikey.nix`) enabling: - Yubikey authentication with pam_u2f - - Passwordless login in greetd, sudo, and swaylock + - Passwordless login in greetd, sudo, ssh, and swaylock 🚨 Personal Recommendation: While convenient, using a Yubikey for display managers (like greetd) and screen lockers (like swaylock) without additional two-factor or multi-factor authentication (2FA/MFA) has risks. If your Yubikey is lost or stolen, someone could gain full system access before you reset keys. Yubikeys excel at protecting against online attacks but are less secure against offline attacks. diff --git a/home/.config/gh/config.yml b/home/.config/gh/config.yml index a6fb3ee..9209e4a 100644 --- a/home/.config/gh/config.yml +++ b/home/.config/gh/config.yml @@ -12,4 +12,4 @@ aliases: # The path to a unix socket through which send HTTP connections. If blank, HTTP traffic will be handled by net/http.DefaultTransport. http_unix_socket: # What web browser gh should use when opening URLs. If blank, will refer to environment. -browser: qutebrowser +browser: brave diff --git a/home/.gitconfig b/home/.gitconfig index 4cace63..01b8047 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,9 +1,11 @@ -[user] - email = artem.shv@proton.me - name = xnm -[credential "https://github.com"] - helper = - helper = !/run/current-system/sw/bin/gh auth git-credential -[credential "https://gist.github.com"] - helper = - helper = !/run/current-system/sw/bin/gh auth git-credential +[includeIf "gitdir:~/projects/"] + path = ~/projects/.gitconfig.personal + +[includeIf "gitdir:~/work/"] + path = ~/work/.gitconfig.work + +[core] + excludesfile = ~/.gitignore + +[gpg] + format = ssh diff --git a/home/.ssh/config b/home/.ssh/config new file mode 100644 index 0000000..7946f53 --- /dev/null +++ b/home/.ssh/config @@ -0,0 +1,17 @@ +Host github.com-xnm1 + HostName github.com + User git + IdentityFile ~/.ssh/github + AddKeysToAgent yes + +Host github.com-artemplummy + HostName github.com + User git + IdentityFile ~/.ssh/work + AddKeysToAgent yes + +Host bitbucket.org-artemplummy + HostName bitbucket.org + User git + IdentityFile ~/.ssh/work + AddKeysToAgent yes diff --git a/home/projects/.gitconfig.personal b/home/projects/.gitconfig.personal new file mode 100644 index 0000000..4b1fb9c --- /dev/null +++ b/home/projects/.gitconfig.personal @@ -0,0 +1,10 @@ +[user] + email = artem.shv@proton.me + name = xnm + signingkey = ~/.ssh/github.pub + +[github] + user = "XNM1" + +[core] + sshCommand = "ssh -i ~/.ssh/github" diff --git a/home/Projects/optimized-pre-config-rust/Cargo.toml b/home/projects/optimized-pre-config-rust/Cargo.toml similarity index 100% rename from home/Projects/optimized-pre-config-rust/Cargo.toml rename to home/projects/optimized-pre-config-rust/Cargo.toml diff --git a/home/Projects/optimized-pre-config-rust/flake.nix b/home/projects/optimized-pre-config-rust/flake.nix similarity index 100% rename from home/Projects/optimized-pre-config-rust/flake.nix rename to home/projects/optimized-pre-config-rust/flake.nix diff --git a/home/Projects/optimized-pre-config-rust/justfile b/home/projects/optimized-pre-config-rust/justfile similarity index 100% rename from home/Projects/optimized-pre-config-rust/justfile rename to home/projects/optimized-pre-config-rust/justfile diff --git a/home/Projects/optimized-pre-config-rust/rust-toolchain.toml b/home/projects/optimized-pre-config-rust/rust-toolchain.toml similarity index 100% rename from home/Projects/optimized-pre-config-rust/rust-toolchain.toml rename to home/projects/optimized-pre-config-rust/rust-toolchain.toml diff --git a/home/work/.gitconfig.work b/home/work/.gitconfig.work new file mode 100644 index 0000000..ea4e882 --- /dev/null +++ b/home/work/.gitconfig.work @@ -0,0 +1,13 @@ +[user] + email = artem.shevchenko@plummygames.com + name = artemplummy + signingkey = ~/.ssh/work.pub + +[github] + user = "artemplummy" + +[bitbucket] + user = "artemplummy" + +[core] + sshCommand = "ssh -i ~/.ssh/work"