From a7ce2c3297fff16ce123444ceb46f1421d93b74f Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:27:30 +0000 Subject: [PATCH] Latest --- home/dot_config/docker/config.json.tmpl | 10 +++++----- home/dot_config/git/config.tmpl | 1 + home/dot_config/npm/npmrc.tmpl | 3 +++ software.yml | 4 ---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home/dot_config/docker/config.json.tmpl b/home/dot_config/docker/config.json.tmpl index 1b382f37..ae7ac76a 100644 --- a/home/dot_config/docker/config.json.tmpl +++ b/home/dot_config/docker/config.json.tmpl @@ -1,7 +1,7 @@ { - "auths": { - "https://index.docker.io/v1/": {} - }, - "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}", - "currentContext": "desktop-linux" + "auths": { + "https://index.docker.io/v1/": {} + }, + "credsStore": "{{ if (eq .host.distro.id "darwin") }}osxkeychain{{ else }}{{ if (eq .host.distro.id "windows") }}wincred{{ else }}secretservice{{ end }}{{ end }}", + "currentContext": "desktop-linux" } \ No newline at end of file diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl index 4a3f1a13..a2bc4016 100644 --- a/home/dot_config/git/config.tmpl +++ b/home/dot_config/git/config.tmpl @@ -126,6 +126,7 @@ autocorrect = 20 [http] postBuffer = 524288000 + {{ if (stat (joinPath "etc" "ssl" "cert.pem")) -}}sslcainfo = /etc/ssl/cert.pem{{ end -}} [init] defaultBranch = master # templatedir = ~/.config/git/template diff --git a/home/dot_config/npm/npmrc.tmpl b/home/dot_config/npm/npmrc.tmpl index c334a136..130ec369 100644 --- a/home/dot_config/npm/npmrc.tmpl +++ b/home/dot_config/npm/npmrc.tmpl @@ -1,4 +1,7 @@ cache={{ .chezmoi.homeDir }}/.cache/npm +{{ if (stat (joinPath "etc" "ssl" "cert.pem")) -}} +cafile=/etc/ssl/cert.pem +{{ end -}} init-author-email={{ .user.email }} init-author-name={{ .user.name }} <{{ .user.email }}> ({{ .user.domain }}) init-author-url=https://{{ .user.domain }} diff --git a/software.yml b/software.yml index e58eecf8..dc13e7be 100644 --- a/software.yml +++ b/software.yml @@ -5969,10 +5969,6 @@ softwarePackages: _name: Dotenv Vault brew: dotenv-org/brew/dotenv-vault npm: dotenv-vault - privileges: - _name: Privileges - _when:cask: '! test -d /Applications/Privileges.app && ! test -d $HOME/Applications/Privileges.app' - cask: privileges hss: _bin: hss _github: https://github.com/six-ddc/hss