From 19c849039beb0c7b34d523c21c153946623dbc1f Mon Sep 17 00:00:00 2001 From: Morten Olsen Date: Wed, 22 Oct 2025 10:18:47 +0200 Subject: [PATCH] update with zn --- dot_Brewfile.tmpl | 2 +- dot_gitconfig => dot_gitconfig.tmpl | 9 +++++--- dot_gitignore_global | 1 + .../private_private/dot_gitconfig | 23 +++++++++++++++++++ private_Projects/private_zeronorth/dot_envrc | 4 ++++ .../private_zeronorth/dot_gitconfig | 20 ++++++++++++++++ 6 files changed, 55 insertions(+), 4 deletions(-) rename dot_gitconfig => dot_gitconfig.tmpl (89%) create mode 100644 dot_gitignore_global create mode 100644 private_Projects/private_private/dot_gitconfig create mode 100644 private_Projects/private_zeronorth/dot_envrc create mode 100644 private_Projects/private_zeronorth/dot_gitconfig diff --git a/dot_Brewfile.tmpl b/dot_Brewfile.tmpl index edd7028..98e24f1 100644 --- a/dot_Brewfile.tmpl +++ b/dot_Brewfile.tmpl @@ -61,7 +61,7 @@ cask "mqtt-explorer" cask "obsidian" cask "ollama-app" cask "raycast" -cask "tree-sitter-cli" +brew "tree-sitter-cli" {{- if ne .work true }} cask "darktable" diff --git a/dot_gitconfig b/dot_gitconfig.tmpl similarity index 89% rename from dot_gitconfig rename to dot_gitconfig.tmpl index b6dd5f2..df9adb2 100644 --- a/dot_gitconfig +++ b/dot_gitconfig.tmpl @@ -39,15 +39,18 @@ [push] autoSetupRemote = true +{{- if eq .work false }} [includeIf "gitdir:~/Projects/"] path = "~/Projects/.gitconfig" +{{- end }} -[includeIf "gitdir:~/Projects/private"] +{{- if eq .work true}} +[includeIf "gitdir:~/Projects/private/"] path = "~/Projects/private/.gitconfig" -[includeIf "gitdir:~/Projects/zeronorth"] +[includeIf "gitdir:~/Projects/zeronorth/"] path = "~/Projects/zeronorth/.gitconfig" - +{{- end }} diff --git a/dot_gitignore_global b/dot_gitignore_global new file mode 100644 index 0000000..7a6353d --- /dev/null +++ b/dot_gitignore_global @@ -0,0 +1 @@ +.envrc diff --git a/private_Projects/private_private/dot_gitconfig b/private_Projects/private_private/dot_gitconfig new file mode 100644 index 0000000..70de2d7 --- /dev/null +++ b/private_Projects/private_private/dot_gitconfig @@ -0,0 +1,23 @@ +[user] + email = fbtijfdq@void.black + name = Morten Olsen + signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAzuPy7D/54GxMq9Zhz0CUjaDnEQ6RkQ/yqVYl7U55k + +[commit] + gpgsign = true + +[gpg] + format = ssh + +[gpg "ssh"] + program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" + + + +[url "ssh://git@ssh-gitea.olsen.cloud:2205/"] + insteadOf = "https://gitea.olsen.cloud/" + + +[url "git@github-private:"] + insteadOf = https://github.com/ + diff --git a/private_Projects/private_zeronorth/dot_envrc b/private_Projects/private_zeronorth/dot_envrc new file mode 100644 index 0000000..b67057c --- /dev/null +++ b/private_Projects/private_zeronorth/dot_envrc @@ -0,0 +1,4 @@ +export NODE_AUTH_TOKEN="op://Employee/Github NPM Token/password" +export NPM_TOKEN="op://Employee/Github NPM Token/password" +export NPM_GITHUB_TOKEN="op://Employee/Github NPM Token/password" +export AWS_PROFILE=zntest diff --git a/private_Projects/private_zeronorth/dot_gitconfig b/private_Projects/private_zeronorth/dot_gitconfig new file mode 100644 index 0000000..ca83b40 --- /dev/null +++ b/private_Projects/private_zeronorth/dot_gitconfig @@ -0,0 +1,20 @@ +[user] + email = morten.olsen@zeronorth.com + name = Morten Olsen + signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDbZITpz5QrVIxPn9gKVWMPK+3W3YZZGszFOQvO/h7M + +[commit] + gpgsign = true + +[gpg] + format = ssh + +[gpg "ssh"] + program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" + + + + +[url "git@github-zeronorth:"] + insteadOf = https://github.com/ +