Skip to content

Commit 4bbbdb0

Browse files
hyperupcallhyperupcall
committed
2026-03-21
1 parent 37e871e commit 4bbbdb0

36 files changed

Lines changed: 334 additions & 136 deletions

‎.vscode/settings.json‎

Lines changed: 85 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"**/.git/**": true,
55
"**/.home/**": true,
66
"**/.venv/**": true,
7-
"**/node_modules/**": true
7+
"**/node_modules/**": true,
88
},
99
"search.exclude": {
1010
"**/.git/**": true,
@@ -17,7 +17,7 @@
1717
"**/.git/**": true,
1818
"**/.home/**": true,
1919
"**/.venv/**": true,
20-
"**/node_modules/**": true
20+
"**/node_modules/**": true,
2121
},
2222
"explorer.excludeGitIgnore": true,
2323
"errorLens.excludePatterns": [
@@ -36,6 +36,87 @@
3636
"**/.git/**": true,
3737
"**/.home/**": true,
3838
"**/.venv/**": true,
39-
"**/node_modules/**": true
40-
}
39+
"**/node_modules/**": true,
40+
},
41+
"prettier.enable": false,
42+
"editor.formatOnSave": false,
43+
"editor.codeActionsOnSave": {
44+
"source.fixAll.eslint": "explicit",
45+
"source.organizeImports": "never"
46+
},
47+
"eslint.rules.customizations": [
48+
{
49+
"rule": "style/*",
50+
"severity": "off",
51+
"fixable": true
52+
},
53+
{
54+
"rule": "format/*",
55+
"severity": "off",
56+
"fixable": true
57+
},
58+
{
59+
"rule": "*-indent",
60+
"severity": "off",
61+
"fixable": true
62+
},
63+
{
64+
"rule": "*-spacing",
65+
"severity": "off",
66+
"fixable": true
67+
},
68+
{
69+
"rule": "*-spaces",
70+
"severity": "off",
71+
"fixable": true
72+
},
73+
{
74+
"rule": "*-order",
75+
"severity": "off",
76+
"fixable": true
77+
},
78+
{
79+
"rule": "*-dangle",
80+
"severity": "off",
81+
"fixable": true
82+
},
83+
{
84+
"rule": "*-newline",
85+
"severity": "off",
86+
"fixable": true
87+
},
88+
{
89+
"rule": "*quotes",
90+
"severity": "off",
91+
"fixable": true
92+
},
93+
{
94+
"rule": "*semi",
95+
"severity": "off",
96+
"fixable": true
97+
}
98+
],
99+
"eslint.validate": [
100+
"javascript",
101+
"javascriptreact",
102+
"typescript",
103+
"typescriptreact",
104+
"vue",
105+
"html",
106+
"markdown",
107+
"json",
108+
"jsonc",
109+
"yaml",
110+
"toml",
111+
"xml",
112+
"gql",
113+
"graphql",
114+
"astro",
115+
"svelte",
116+
"css",
117+
"less",
118+
"scss",
119+
"pcss",
120+
"postcss"
121+
],
41122
}

‎.zed/settings.json‎

Lines changed: 94 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,101 @@
11
{
2-
"lsp": {
3-
"deno": {
4-
"settings": {
5-
"deno": {
6-
"enable": true,
7-
},
8-
},
9-
},
10-
},
2+
"format_on_save": "on",
3+
"formatter": [
4+
{
5+
"code_action": "source.fixAll.eslint"
6+
}
7+
],
118
"languages": {
12-
"JavaScript": {
13-
"language_servers": ["deno", "!typescript-language-server", "!vtsls", "!eslint"],
14-
"formatter": "language_server",
9+
"HTML": {
10+
"language_servers": [
11+
"eslint"
12+
]
1513
},
16-
"TypeScript": {
17-
"language_servers": ["deno", "!typescript-language-server", "!vtsls", "!eslint"],
18-
"formatter": "language_server",
14+
"Markdown": {
15+
"language_servers": [
16+
"eslint"
17+
]
1918
},
20-
"TSX": {
21-
"language_servers": ["deno", "!typescript-language-server", "!vtsls", "!eslint"],
22-
"formatter": "language_server",
19+
"JSON": {
20+
"language_servers": [
21+
"eslint"
22+
]
2323
},
24+
"JSONC": {
25+
"language_servers": [
26+
"eslint"
27+
]
28+
},
29+
"YAML": {
30+
"language_servers": [
31+
"eslint"
32+
]
33+
},
34+
"CSS": {
35+
"language_servers": [
36+
"eslint"
37+
]
38+
}
2439
},
25-
"file_scan_exclusions": [
26-
"**/.git",
27-
"os-unix/scripts/setup",
28-
".home",
29-
"**/.venv/",
30-
"**/node_modules/",
31-
],
40+
"lsp": {
41+
"eslint": {
42+
"settings": {
43+
"experimental": {
44+
"useFlatConfig": false
45+
},
46+
"rulesCustomizations": [
47+
{
48+
"rule": "style/*",
49+
"severity": "off",
50+
"fixable": true
51+
},
52+
{
53+
"rule": "format/*",
54+
"severity": "off",
55+
"fixable": true
56+
},
57+
{
58+
"rule": "*-indent",
59+
"severity": "off",
60+
"fixable": true
61+
},
62+
{
63+
"rule": "*-spacing",
64+
"severity": "off",
65+
"fixable": true
66+
},
67+
{
68+
"rule": "*-spaces",
69+
"severity": "off",
70+
"fixable": true
71+
},
72+
{
73+
"rule": "*-order",
74+
"severity": "off",
75+
"fixable": true
76+
},
77+
{
78+
"rule": "*-dangle",
79+
"severity": "off",
80+
"fixable": true
81+
},
82+
{
83+
"rule": "*-newline",
84+
"severity": "off",
85+
"fixable": true
86+
},
87+
{
88+
"rule": "*quotes",
89+
"severity": "off",
90+
"fixable": true
91+
},
92+
{
93+
"rule": "*semi",
94+
"severity": "off",
95+
"fixable": true
96+
}
97+
]
98+
}
99+
}
100+
}
32101
}

‎os-unix/config-editor/sublime-text.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
source ~/.dotfiles/os-unix/data/setup.sh
33

44
declare -g g_name='Sublime Text'
5+
declare -g g_sources_file='/etc/apt/sources.list.d/sublime-text.sources'
56

67
main() {
78
util.install_by_setup "$@"
@@ -15,7 +16,7 @@ install.debian() {
1516
"$gpg_file"
1617

1718
pkg.add_apt_repository \
18-
'/etc/apt/sources.list.d/sublime-text.sources' "
19+
"$g_sources_file" "
1920
Types: deb
2021
URIs: https://download.sublimetext.com/
2122
Suites: apt/stable/
@@ -32,7 +33,7 @@ install.ubuntu() {
3233
}
3334

3435
installed() {
35-
command -v subl &>/dev/null
36+
[ -f "$g_sources_file" ] && command -v subl &>/dev/null
3637
}
3738

3839
util.if_file_sourced || _setup "$@"

‎os-unix/config-editor/vscode.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
source ~/.dotfiles/os-unix/data/setup.sh
33

44
declare -g g_name='VSCode and VSCode Insiders'
5+
declare -g g_sources_file='/etc/apt/sources.list.d/vscode.sources'
56

67
main() {
78
util.install_by_setup "$@"
@@ -19,7 +20,7 @@ install.debian() {
1920
"$gpg_file"
2021

2122
pkg.add_apt_repository \
22-
'/etc/apt/sources.list.d/vscode.sources' "
23+
"$g_sources_file" "
2324
Types: deb
2425
URIs: https://packages.microsoft.com/repos/code
2526
Suites: stable
@@ -54,7 +55,7 @@ install.opensuse() {
5455
}
5556

5657
installed() {
57-
command -v code &>/dev/null && command -v code-insiders &>/dev/null
58+
[ -f "$g_sources_file" ] && command -v code &>/dev/null && command -v code-insiders &>/dev/null
5859
}
5960

6061
util.if_file_sourced || _setup "$@"

‎os-unix/config-linux-rice/.config/rofi/config.rasi‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ configuration {
44
cycle: true;
55
show-icons: true;
66
matching: "fuzzy";
7-
terminal: "fox-default launch terminal-emulator";
7+
terminal: "alacritty";
88

99
/* hide-scrollbar: true;
1010
disable-history: true;
@@ -15,4 +15,3 @@ configuration {
1515
display-window: "";
1616
columns: 3; */
1717
}
18-

‎os-unix/config-shell/.config/sh/modules/env.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ export CMD_ENV='linux'
8787

8888
# Python
8989
export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc.py"
90+
export PYTHON_HISTORY="$XDG_STATE_HOME/history/python_history"
9091

9192
# ripgrep
9293
export RIPGREP_CONFIG_PATH="$XDG_CONFIG_HOME/ripgrep/config"

‎os-unix/config-shell/.config/sh/modules/func.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ pbake() {
133133
print_shell_prompt_eval_string() {
134134
_file="${XDG_STATE_HOME:-${HOME:?}/.local/state}/dotfiles-shell-prompts/${1:-bash}/_${2:-starship}.txt"
135135

136-
if [ -f "$_file" ]; then
137-
cat "$_file"
138-
else
136+
if [ ! -f "$_file" ]; then
139137
printf 'false\n'
140138
return 1
141139
fi
142140

141+
cat "$_file"
142+
143143
unset -v _file
144144
}
145145

‎os-unix/config-shell/.config/zsh/.zshrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ if [ "$COLORTERM" = "truecolor" ] || [ "$COLORTERM" = "24bit" ]; then
8585
else
8686
PS1="%{$fg[red]%}[%n@%M %~]$%{$reset_color%} "
8787
if ! eval "$(
88-
if ! default launch shell-prompt-zsh; then
88+
if ! print_shell_prompt_eval_string zsh starship; then
8989
printf '%s\n' 'false' # Propagate error.
9090
fi
9191
)"; then
@@ -108,6 +108,6 @@ fi
108108

109109
# Modules.
110110
_util_source_dir "$XDG_CONFIG_HOME/zsh/modules"
111-
_util_source_dir "$XDG_CONFIG_HOME/zsh/zsh.d"
111+
# _util_source_dir "$XDG_CONFIG_HOME/zsh/zsh.d"
112112

113113
# ---

‎os-unix/config-shell/.config/zsh/modules/10-util.zsh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,15 @@ autoload -RUz run-help-svk
2323
# autoload -RUz promptinit
2424
# promptinit
2525

26+
# TODO
27+
typeset -g -A key
28+
key[Up]="${terminfo[kcuu1]}"
29+
key[Down]="${terminfo[kcud1]}"
30+
key[Control-Left]="${terminfo[kLFT5]}"
31+
key[Control-Right]="${terminfo[kRIT5]}"
32+
2633
[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-beginning-search
2734
[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search
28-
# key[Control-Left]="${terminfo[kLFT5]}"
29-
# key[Control-Right]="${terminfo[kRIT5]}"
3035

3136
[[ -n "${key[Control-Left]}" ]] && bindkey -- "${key[Control-Left]}" backward-word
3237
[[ -n "${key[Control-Right]}" ]] && bindkey -- "${key[Control-Right]}" forward-word

‎os-unix/config-shell/.config/zsh/modules/20-zle.zsh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,13 @@ zle -N down-line-or-beginning-search
148148

149149
# Finally, make sure the terminal is in application mode, when zle is
150150
# active. Only then are the values from $terminfo valid.
151-
if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
152-
autoload -Uz add-zle-hook-widget
153-
function zle_application_mode_start { echoti smkx }
154-
function zle_application_mode_stop { echoti rmkx }
155-
add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
156-
add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
157-
fi
158-
151+
# if [[ ${+terminfo[smkx]} && ${+terminfo[rmkx]} ]]; then
152+
# autoload -Uz add-zle-hook-widget
153+
# function zle_application_mode_start { echoti smkx }
154+
# function zle_application_mode_stop { echoti rmkx }
155+
# add-zle-hook-widget zle-line-init zle_application_mode_start
156+
# add-zle-hook-widget zle-line-finish zle_application_mode_stop
157+
# fi
159158

160159
bindkey -M vicmd '^T' history-incremental-pattern-search-backward # Patterned history search with zsh expansion, globbing, etc.
161160
bindkey '^T' history-incremental-pattern-search-backward

0 commit comments

Comments
 (0)