Merge branch 'master' of github.com:onokatio/dotfiles

onokatio · Nov 28, 2022 · eacbdf3 · eacbdf3
2 parents 02f66ac + daffcb4
commit eacbdf3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/home-stow/.config/git/config b/home-stow/.config/git/config
@@ -3,7 +3,7 @@
 	name = onokatio
 	useConfigOnly = true
 [merge]
-	conflictstyle = diff3
+	conflictStyle = zdiff3
 	ff = false
 [diff]
 	#compactionHeuristic = true
@@ -49,11 +49,14 @@
 	safecrlf = true
 	fsmonitor = true
 	untrackedcache = true
+	fscache = true
+	preloadindex = true
 [interactive]
 	diffFilter = delta --color-only
 [credential]
 	#helper = /usr/lib/git-core/git-credential-gnome-keyring
 	helper = cache
+	credentialsInUrl = warn
 [init]
 	defaultBranch = master
 #	templatedir = ~/.git-templates/git-secrets
@@ -152,7 +155,8 @@
 	repo = /Users/katio/script/github.com/onokatio/cloudflare-workers-tutorial
 	repo = /Users/katio/script/github.com/onokatio/radicale-serverless
 	repo = /Users/katio/script/github.com/onokatio/itf-paper-b4-mid
-	repo = /Users/tmaruyama/.conf-to-git
+	repo = /Users/katio/.conf-to-git
+	repo = /Users/katio/script/github.com/hashcloak/Meson
 [maintenance]
 	repo = /Users/katio/.conf-to-git
 	repo = /Users/katio/script/github.com/onokatio/itf-differential-privacy
@@ -164,4 +168,7 @@
 	repo = /Users/katio/script/github.com/onokatio/cloudflare-workers-tutorial
 	repo = /Users/katio/script/github.com/onokatio/radicale-serverless
 	repo = /Users/katio/script/github.com/onokatio/itf-paper-b4-mid
-	repo = /Users/tmaruyama/.conf-to-git
+	repo = /Users/katio/.conf-to-git
+	repo = /Users/katio/script/github.com/hashcloak/Meson
+	auto = false
+	strategy = incremental
diff --git a/home-stow/.ssh/config b/home-stow/.ssh/config
@@ -92,11 +92,13 @@ Host *
 	AddressFamily inet
 	AddKeysToAgent yes
 	HashKnownHosts yes
-	#Ciphers [email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr
-	#KexAlgorithms curve25519-sha256,[email protected],ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group18-sha512,diffie-hellman-group16-sha512,diffie-hellman-group14-sha256,diffie-hellman-group-exchange-sha256
-	#Macs [email protected],[email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256,[email protected],[email protected],hmac-sha1
-	#HostKeyAlgorithms [email protected],ssh-ed25519,[email protected],[email protected],[email protected],ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,[email protected],rsa-sha2-512,rsa-sha2-256,ssh-rsa
+	Ciphers [email protected],[email protected],[email protected],aes256-ctr,aes192-ctr,aes128-ctr
+	KexAlgorithms curve25519-sha256,[email protected],ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group18-sha512,diffie-hellman-group16-sha512,diffie-hellman-group14-sha256,diffie-hellman-group-exchange-sha256
+	Macs [email protected],[email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256,[email protected],[email protected],hmac-sha1
+	HostKeyAlgorithms [email protected],ssh-ed25519,[email protected],[email protected],[email protected],ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,[email protected],rsa-sha2-512,rsa-sha2-256,ssh-rsa
 	RekeyLimit default 600
+	PubkeyAcceptedKeyTypes +ssh-rsa
+
 
 	# YAMAHA
 	#KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1
diff --git a/zsh/zprofile.d/10-env.zsh b/zsh/zprofile.d/10-env.zsh
@@ -19,7 +19,9 @@ export HOMEBREW_EDITOR=nvim
 #export HOMEBREW_CXX="ccache g++"
 #export HOMEBREW_NO_ENV_FILTERING=1
 #export HOMEBREW_CURL=$(which curl)
-HOMEBREW_INSTALL_FROM_API=1
+export HOMEBREW_INSTALL_FROM_API=1
+#export HOMEBREW_BREWFILE_LEAVES=1
+export HOMEBREW_BREWFILE_ON_REQUEST=1
 
 #export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt