From 74fb12f09372452666d984046944a4f16af8f293 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Tue, 10 Dec 2024 09:11:12 +0200 Subject: [PATCH] chore(lint): tweaks, few pre-commit hook fixes --- .luarc.json | 8 ++++---- .pre-commit-config.yaml | 8 +++----- .prettierignore | 4 +++- config/omp/own.json | 8 ++++---- hosts/lakka/irssi/config | 6 +++--- hosts/v/config/git/overrides/config | 17 +++++++++-------- install | 6 +++--- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.luarc.json b/.luarc.json index 1e1765c..f979d50 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,5 +1,5 @@ { - "diagnostics.globals": [ - "vim" - ] -} \ No newline at end of file + "diagnostics.globals": [ + "vim" + ] +} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 38c51d4..99166c2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,10 +2,13 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 hooks: + - id: requirements-txt-fixer + - id: detect-private-key - id: trailing-whitespace args: [--markdown-linebreak-ext=md] - id: check-case-conflict - id: check-merge-conflict + - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable - id: check-symlinks - id: check-toml @@ -29,11 +32,6 @@ repos: hooks: - id: yamllint - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v4.0.0-alpha.8 - hooks: - - id: prettier - - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.10.0.1 hooks: diff --git a/.prettierignore b/.prettierignore index 676d435..ec6e9fa 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,12 +1,14 @@ +# vim: ft=gitignore .mypy_cache/* Brewfile.lock.json config/cheat/cheatsheets/community config/cheat/cheatsheets/tldr config/fzf/* -config/nvim-kickstart/* +config/nvim/* config/tmux/plugins/* config/zsh/* lazy-lock.json local/bin/antigen.zsh local/bin/asdf +tools/antidote/* tools/dotbot* diff --git a/config/omp/own.json b/config/omp/own.json index 2089aff..4117d26 100644 --- a/config/omp/own.json +++ b/config/omp/own.json @@ -16,7 +16,7 @@ { "type": "session", "style": "plain", - "template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}" + "template": " {{ if .SSHSession }}\ueba9 {{ .UserName }}@{{ end }}{{ .HostName }}" }, { "foreground": "cyan", @@ -27,14 +27,14 @@ "template": " {{ .Path }} ", "type": "path", "mapped_locations": { - "~/Code/*": "\uF09B" + "~/Code/*": "\uf09b" } }, { "type": "git", "style": "plain", "foreground": "lightGreen", - "template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}", + "template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uf046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }}\uf044 {{ .Working.String }}{{ end }}){{ end }}", "properties": { "fetch_status": true, "fetch_upstream_icon": true, @@ -100,7 +100,7 @@ { "type": "php", "style": "plain", - "template": "  {{ .Full }} " + "template": " \ue73d {{ .Full }} " } ], "type": "prompt" diff --git a/hosts/lakka/irssi/config b/hosts/lakka/irssi/config index aae0399..031549a 100644 --- a/hosts/lakka/irssi/config +++ b/hosts/lakka/irssi/config @@ -27,13 +27,13 @@ servers = ( family = "inet"; }, { address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; }, - { + { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; }, { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; }, - { + { address = "irc.quakenet.org"; chatnet = "QuakeNet"; port = "6667"; @@ -50,7 +50,7 @@ chatnets = { max_whois = "4"; max_query_chans = "5"; }; - EFNet = { + EFNet = { type = "IRC"; max_kicks = "4"; max_msgs = "3"; diff --git a/hosts/v/config/git/overrides/config b/hosts/v/config/git/overrides/config index d67f197..7e13a8d 100644 --- a/hosts/v/config/git/overrides/config +++ b/hosts/v/config/git/overrides/config @@ -1,3 +1,4 @@ +# vim: ft=gitconfig sw=2 ts=2 et [include] path = ~/.dotfiles/config/git/shared @@ -7,19 +8,19 @@ [user] name = Ismo Vuorinen email = ismo.vuorinen@vincit.fi - signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0= + signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0= [gpg "ssh"] - program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign - allowedSignersFile = ~/.ssh/allowed_signers + program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign + allowedSignersFile = ~/.ssh/allowed_signers [commit] - gpgsign = true + gpgsign = true [credential "https://github.com"] - helper = - helper = !/opt/homebrew/bin/gh auth git-credential + helper = + helper = !/opt/homebrew/bin/gh auth git-credential [credential "https://gist.github.com"] - helper = - helper = !/opt/homebrew/bin/gh auth git-credential + helper = + helper = !/opt/homebrew/bin/gh auth git-credential diff --git a/install b/install index 5158d99..d8be31f 100755 --- a/install +++ b/install @@ -25,9 +25,9 @@ git submodule update --init --recursive "${DOTBOT_DIR}" if [ "${DOTBOT_HOST}" != "" ]; then DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}" echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}" - [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \ - && echo "(!) Found $DOTBOT_HOST_CONFIG" \ - && "$DOTBOT_BIN_PATH" \ + [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] && + echo "(!) Found $DOTBOT_HOST_CONFIG" && + "$DOTBOT_BIN_PATH" \ -d "$BASEDIR" \ --plugin-dir=tools/dotbot-brew \ --plugin-dir=tools/dotbot-include \