From 36cf2e0cceb08d978de29769951fc93f6efc0496 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Wed, 1 May 2024 01:21:52 +0000 Subject: [PATCH] Latest --- .../universal/run_after_01-pre-install.sh.tmpl | 10 ++++++++++ home/dot_config/docker/TODO/config.json.tmpl | 10 ++++++++++ home/dot_config/docker/config.json.tmpl | 11 ----------- home/dot_config/npm/private_npmrc.tmpl | 1 - home/dot_local/bin/package.json | 17 +++++++++++++++++ home/private_dot_ssh/private_config.tmpl | 3 +-- 6 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 home/dot_config/docker/TODO/config.json.tmpl delete mode 100644 home/dot_config/docker/config.json.tmpl create mode 100644 home/dot_local/bin/package.json diff --git a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl index ab013784..149a0a8b 100644 --- a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl @@ -837,6 +837,14 @@ installDockerRclonePlugin() { fi } +installLocalBinPackageJson() { + if [ -f "$HOME/.local/bin/package.json" ]; then + logg info 'Installing NPM packages in ~/.local/bin/package.json' + cd "$HOME/.local/bin" && npm i --force + logg info 'Installed NPM packages in ~/.local/bin' + fi +} + # @description Installs a terminal theme that matches across various terminals by utilizing the `~/.local/bin/install-terminal-theme` script installTerminalTheme() { if command -v install-terminal-theme > /dev/null; then @@ -1012,6 +1020,7 @@ if [ -n "$DEBUG" ] || [ -n "$DEBUG_MODE" ]; then gnomeExtensionSettings grubSettings installDockerRclonePlugin + installLocalBinPackageJson installTerminalTheme loadCronjobs macOSSettings @@ -1039,6 +1048,7 @@ else gnomeExtensionSettings & grubSettings & installDockerRclonePlugin & + installLocalBinPackageJson & installTerminalTheme & loadCronjobs & macOSSettings & diff --git a/home/dot_config/docker/TODO/config.json.tmpl b/home/dot_config/docker/TODO/config.json.tmpl new file mode 100644 index 00000000..54ef94bb --- /dev/null +++ b/home/dot_config/docker/TODO/config.json.tmpl @@ -0,0 +1,10 @@ +{ + "auths": { + "https://index.docker.io/v1/": {} + }, + "plugins": { + "-x-cli-hints": { + "enabled": "true" + } + } +} \ No newline at end of file diff --git a/home/dot_config/docker/config.json.tmpl b/home/dot_config/docker/config.json.tmpl deleted file mode 100644 index 5455c1ae..00000000 --- a/home/dot_config/docker/config.json.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -{ - "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 }}", - "plugins": { - "-x-cli-hints": { - "enabled": "true" - } - } -} \ No newline at end of file diff --git a/home/dot_config/npm/private_npmrc.tmpl b/home/dot_config/npm/private_npmrc.tmpl index f71dbce7..496c9b3f 100644 --- a/home/dot_config/npm/private_npmrc.tmpl +++ b/home/dot_config/npm/private_npmrc.tmpl @@ -6,7 +6,6 @@ init-author-email={{ .user.email }} init-author-name={{ .user.name }} <{{ .user.email }}> ({{ .user.domain }}) init-author-url=https://{{ .user.domain }}/ init-license=MIT -init-module={{ .chezmoi.homeDir }}/.config/npm/config/npm-init.js init-version=0.0.1 loglevel=error network-concurrency=32 diff --git a/home/dot_local/bin/package.json b/home/dot_local/bin/package.json new file mode 100644 index 00000000..393c9bf7 --- /dev/null +++ b/home/dot_local/bin/package.json @@ -0,0 +1,17 @@ +{ + "name": "install-doctor-bin", + "version": "1.0.0", + "description": "NPM packages that accompany scripts in ~/.local/bin", + "main": "index.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MIT", + "dependencies": { + "linux-os-info": "2.0.0" + } + } \ No newline at end of file diff --git a/home/private_dot_ssh/private_config.tmpl b/home/private_dot_ssh/private_config.tmpl index a33281a5..567b7867 100644 --- a/home/private_dot_ssh/private_config.tmpl +++ b/home/private_dot_ssh/private_config.tmpl @@ -23,7 +23,6 @@ Host * IdentityFile ~/.ssh/ssh-5-nfc-red IdentityFile ~/.ssh/ssh-5-nfc-yellow IdentityFile ~/.ssh/id_rsa -Host wordpress.megabyte.space Host gitlab.com UpdateHostKeys no IdentityFile ~/.ssh/id_rsa @@ -33,4 +32,4 @@ Host github.com {{ if (lookPath "fig") -}} Match all Include ~/.fig/ssh -{{- end -}} \ No newline at end of file +{{- end -}}