Skip to content

Commit 74fb12f

Browse files
committed
chore(lint): tweaks, few pre-commit hook fixes
1 parent d7988bc commit 74fb12f

File tree

7 files changed

+29
-28
lines changed

7 files changed

+29
-28
lines changed

.luarc.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"diagnostics.globals": [
3-
"vim"
4-
]
5-
}
2+
"diagnostics.globals": [
3+
"vim"
4+
]
5+
}

.pre-commit-config.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
33
rev: v5.0.0
44
hooks:
5+
- id: requirements-txt-fixer
6+
- id: detect-private-key
57
- id: trailing-whitespace
68
args: [--markdown-linebreak-ext=md]
79
- id: check-case-conflict
810
- id: check-merge-conflict
11+
- id: check-executables-have-shebangs
912
- id: check-shebang-scripts-are-executable
1013
- id: check-symlinks
1114
- id: check-toml
@@ -29,11 +32,6 @@ repos:
2932
hooks:
3033
- id: yamllint
3134

32-
- repo: https://github.com/pre-commit/mirrors-prettier
33-
rev: v4.0.0-alpha.8
34-
hooks:
35-
- id: prettier
36-
3735
- repo: https://github.com/shellcheck-py/shellcheck-py
3836
rev: v0.10.0.1
3937
hooks:

.prettierignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
# vim: ft=gitignore
12
.mypy_cache/*
23
Brewfile.lock.json
34
config/cheat/cheatsheets/community
45
config/cheat/cheatsheets/tldr
56
config/fzf/*
6-
config/nvim-kickstart/*
7+
config/nvim/*
78
config/tmux/plugins/*
89
config/zsh/*
910
lazy-lock.json
1011
local/bin/antigen.zsh
1112
local/bin/asdf
13+
tools/antidote/*
1214
tools/dotbot*

config/omp/own.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{
1717
"type": "session",
1818
"style": "plain",
19-
"template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
19+
"template": " {{ if .SSHSession }}\ueba9 {{ .UserName }}@{{ end }}{{ .HostName }}"
2020
},
2121
{
2222
"foreground": "cyan",
@@ -27,14 +27,14 @@
2727
"template": " {{ .Path }} ",
2828
"type": "path",
2929
"mapped_locations": {
30-
"~/Code/*": "\uF09B"
30+
"~/Code/*": "\uf09b"
3131
}
3232
},
3333
{
3434
"type": "git",
3535
"style": "plain",
3636
"foreground": "lightGreen",
37-
"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 }}",
37+
"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 }}",
3838
"properties": {
3939
"fetch_status": true,
4040
"fetch_upstream_icon": true,
@@ -100,7 +100,7 @@
100100
{
101101
"type": "php",
102102
"style": "plain",
103-
"template": " {{ .Full }} "
103+
"template": " \ue73d {{ .Full }} "
104104
}
105105
],
106106
"type": "prompt"

hosts/lakka/irssi/config

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ servers = (
2727
family = "inet";
2828
},
2929
{ address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
30-
{
30+
{
3131
address = "irc.undernet.org";
3232
chatnet = "Undernet";
3333
port = "6667";
3434
},
3535
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
36-
{
36+
{
3737
address = "irc.quakenet.org";
3838
chatnet = "QuakeNet";
3939
port = "6667";
@@ -50,7 +50,7 @@ chatnets = {
5050
max_whois = "4";
5151
max_query_chans = "5";
5252
};
53-
EFNet = {
53+
EFNet = {
5454
type = "IRC";
5555
max_kicks = "4";
5656
max_msgs = "3";

hosts/v/config/git/overrides/config

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# vim: ft=gitconfig sw=2 ts=2 et
12
[include]
23
path = ~/.dotfiles/config/git/shared
34

@@ -7,19 +8,19 @@
78
[user]
89
name = Ismo Vuorinen
910
10-
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0=
11+
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0=
1112

1213
[gpg "ssh"]
13-
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
14-
allowedSignersFile = ~/.ssh/allowed_signers
14+
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
15+
allowedSignersFile = ~/.ssh/allowed_signers
1516

1617
[commit]
17-
gpgsign = true
18+
gpgsign = true
1819

1920
[credential "https://github.com"]
20-
helper =
21-
helper = !/opt/homebrew/bin/gh auth git-credential
21+
helper =
22+
helper = !/opt/homebrew/bin/gh auth git-credential
2223

2324
[credential "https://gist.github.com"]
24-
helper =
25-
helper = !/opt/homebrew/bin/gh auth git-credential
25+
helper =
26+
helper = !/opt/homebrew/bin/gh auth git-credential

install

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
2525
if [ "${DOTBOT_HOST}" != "" ]; then
2626
DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
2727
echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
28-
[ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
29-
&& echo "(!) Found $DOTBOT_HOST_CONFIG" \
30-
&& "$DOTBOT_BIN_PATH" \
28+
[ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
29+
echo "(!) Found $DOTBOT_HOST_CONFIG" &&
30+
"$DOTBOT_BIN_PATH" \
3131
-d "$BASEDIR" \
3232
--plugin-dir=tools/dotbot-brew \
3333
--plugin-dir=tools/dotbot-include \

0 commit comments

Comments
 (0)