mirror of
https://mau.dev/andreijiroh-dev/dotfiles.git
synced 2024-11-12 17:42:24 +00:00
chore(global): just casual merge conflict fix btw
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
parent
5c84218091
commit
669efc81cd
12 changed files with 108 additions and 31 deletions
File diff suppressed because one or more lines are too long
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"editor.formatOnPaste": true,
|
||||
"git.autofetch": true,
|
||||
"[markdown]": {
|
||||
"[markdown]": {
|
||||
"editor.wordWrap": "on",
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"[typescript]": {
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
"editor.defaultFormatter": "vscode.typescript-language-features"
|
||||
},
|
||||
"editor.tokenColorCustomizations": {
|
||||
"textMateRules": []
|
||||
|
|
@ -46,5 +46,8 @@
|
|||
"workbench.editor.limit.excludeDirty": true,
|
||||
"workbench.editor.limit.enabled": true,
|
||||
"workbench.editor.limit.perEditorGroup": true,
|
||||
"terminal.integrated.scrollback": 100000
|
||||
"terminal.integrated.scrollback": 100000,
|
||||
"diffEditor.maxComputationTime": 0,
|
||||
"editor.tabSize": 2,
|
||||
"typescript.updateImportsOnFileMove.enabled": "always"
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,14 +1,6 @@
|
|||
{
|
||||
"workbench.colorTheme": "GitHub Dark Colorblind (Beta)",
|
||||
"editor.tokenColorCustomizations": {
|
||||
"textMateRules": [
|
||||
{
|
||||
"scope": "keyword.other.dotenv",
|
||||
"settings": {
|
||||
"foreground": "#FF000000"
|
||||
}
|
||||
}
|
||||
]
|
||||
"textMateRules": []
|
||||
},
|
||||
"workbench.iconTheme": "material-icon-theme",
|
||||
"workbench.productIconTheme": "material-product-icons",
|
||||
|
|
@ -21,7 +13,6 @@
|
|||
"git.confirmSync": false,
|
||||
"git.autofetch": true,
|
||||
"window.customTitleBarVisibility": "auto",
|
||||
"window.confirmBeforeClose": "never",
|
||||
"window.titleBarStyle": "custom",
|
||||
"window.menuBarVisibility": "visible",
|
||||
"gpgIndicator.enablePassphraseCache": true,
|
||||
|
|
@ -70,7 +61,6 @@
|
|||
"caddyfile.executable"
|
||||
],
|
||||
"redhat.telemetry.enabled": true,
|
||||
"window.autoDetectColorScheme": true,
|
||||
"workbench.preferredDarkColorTheme": "GitHub Dark Colorblind (Beta)",
|
||||
"workbench.preferredHighContrastColorTheme": "GitHub Dark High Contrast",
|
||||
"workbench.preferredHighContrastLightColorTheme": "GitHub Light High Contrast",
|
||||
|
|
@ -116,5 +106,32 @@
|
|||
],
|
||||
"terminal.integrated.persistentSessionScrollback": 100000,
|
||||
"arcade-vsc.notifications.startReminder": false,
|
||||
"keyboard.layout": "us"
|
||||
"keyboard.layout": "us",
|
||||
"conventionalCommits.lineBreak": "nw",
|
||||
"conventionalCommits.promptCI": true,
|
||||
"conventionalCommits.showEditor": true,
|
||||
"conventionalCommits.scopes": [
|
||||
"global",
|
||||
"github-actions",
|
||||
"gitlab-ci",
|
||||
"readme",
|
||||
"license",
|
||||
"utils",
|
||||
"scripts"
|
||||
],
|
||||
"[typescript]": {
|
||||
"editor.defaultFormatter": "vscode.typescript-language-features"
|
||||
},
|
||||
"git.openRepositoryInParentFolders": "never",
|
||||
"gpgIndicator.statusStyle": "fingerprint",
|
||||
"remote.SSH.remotePlatform": {
|
||||
"*.gitpod.local": "linux",
|
||||
"*.gitpod.remote": "linux"
|
||||
},
|
||||
"[markdown]": {
|
||||
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
|
||||
},
|
||||
"workbench.colorTheme": "GitHub Dark Colorblind (Beta)",
|
||||
"remoteHub.commitDirectlyWarning": "off",
|
||||
"github.experimental.multipleAccounts": true
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC1090
|
||||
|
||||
for file in "${HOME}"/.config/bash/tools/*.bashrc; do
|
||||
if [ "$file" == "${HOME}/.config/bash/tools/automated-deploy.bashrc" ]; then
|
||||
|
|
@ -12,4 +13,4 @@ done
|
|||
for file in "${HOME}"/.config/bash/completions/*.bash; do
|
||||
[[ $DEBUG != "" ]] && echo "[shell-completions] sourcing $file"
|
||||
source "$file"
|
||||
fi
|
||||
done
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo
|
|||
# You may want to put all your additions into a separate file like
|
||||
# ~/.bash_aliases, instead of adding them here directly.
|
||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||
source "${HOME}/.config/bash/aliases"
|
||||
source "${HOME}/.config/bash/functions"
|
||||
source "${HOME}/.config/bash/aliases.bashrc"
|
||||
source "${HOME}/.config/bash/functions.bashrc"
|
||||
source "${HOME}/.config/bash/autoloader.bashrc"
|
||||
|
||||
# enable programmable completion features (you don't need to enable
|
||||
|
|
@ -88,4 +88,4 @@ if ! shopt -oq posix; then
|
|||
fi
|
||||
|
||||
[ -f "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc" ] \
|
||||
&& . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"
|
||||
&& . "${HOME}/.config/bash/hosts/${HOSTNAME_BASH}.bashrc"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#? Config file for btop v. 1.2.13
|
||||
#? Config file for btop v. 1.4.0
|
||||
|
||||
#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
|
||||
#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
|
||||
|
|
@ -37,6 +37,9 @@ graph_symbol = "braille"
|
|||
# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
|
||||
graph_symbol_cpu = "default"
|
||||
|
||||
# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
|
||||
graph_symbol_gpu = "default"
|
||||
|
||||
# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
|
||||
graph_symbol_mem = "default"
|
||||
|
||||
|
|
@ -46,7 +49,7 @@ graph_symbol_net = "default"
|
|||
# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
|
||||
graph_symbol_proc = "default"
|
||||
|
||||
#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
|
||||
#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
|
||||
shown_boxes = "cpu mem net proc"
|
||||
|
||||
#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
|
||||
|
|
@ -54,7 +57,7 @@ update_ms = 300
|
|||
|
||||
#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
|
||||
#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
|
||||
proc_sorting = "cpu lazy"
|
||||
proc_sorting = "pid"
|
||||
|
||||
#* Reverse sorting order, True or False.
|
||||
proc_reversed = False
|
||||
|
|
@ -86,6 +89,9 @@ proc_left = False
|
|||
#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
|
||||
proc_filter_kernel = False
|
||||
|
||||
#* In tree-view, always accumulate child process resources in the parent process.
|
||||
proc_aggregate = False
|
||||
|
||||
#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
|
||||
#* Select from a list of detected attributes from the options menu.
|
||||
cpu_graph_upper = "Auto"
|
||||
|
|
@ -94,6 +100,9 @@ cpu_graph_upper = "Auto"
|
|||
#* Select from a list of detected attributes from the options menu.
|
||||
cpu_graph_lower = "Auto"
|
||||
|
||||
#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
|
||||
show_gpu_info = "Auto"
|
||||
|
||||
#* Toggles if the lower CPU graph should be inverted.
|
||||
cpu_invert_lower = True
|
||||
|
||||
|
|
@ -207,6 +216,33 @@ show_battery = True
|
|||
#* Which battery to use if multiple are present. "Auto" for auto detection.
|
||||
selected_battery = "Auto"
|
||||
|
||||
#* Show power stats of battery next to charge indicator.
|
||||
show_battery_watts = True
|
||||
|
||||
#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
|
||||
#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
|
||||
log_level = "WARNING"
|
||||
log_level = "WARNING"
|
||||
|
||||
#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
|
||||
nvml_measure_pcie_speeds = True
|
||||
|
||||
#* Horizontally mirror the GPU graph.
|
||||
gpu_mirror_graph = True
|
||||
|
||||
#* Custom gpu0 model name, empty string to disable.
|
||||
custom_gpu_name0 = ""
|
||||
|
||||
#* Custom gpu1 model name, empty string to disable.
|
||||
custom_gpu_name1 = ""
|
||||
|
||||
#* Custom gpu2 model name, empty string to disable.
|
||||
custom_gpu_name2 = ""
|
||||
|
||||
#* Custom gpu3 model name, empty string to disable.
|
||||
custom_gpu_name3 = ""
|
||||
|
||||
#* Custom gpu4 model name, empty string to disable.
|
||||
custom_gpu_name4 = ""
|
||||
|
||||
#* Custom gpu5 model name, empty string to disable.
|
||||
custom_gpu_name5 = ""
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@ DefaultProfile=Meta Config.profile
|
|||
ConfigVersion=1
|
||||
|
||||
[KonsoleWindow]
|
||||
AllowMenuAccelerators=true
|
||||
FocusFollowsMouse=true
|
||||
RememberWindowSize=false
|
||||
ShowWindowTitleOnTitleBar=true
|
||||
|
||||
[MainWindow]
|
||||
1209x683 screen: Height=624
|
||||
|
|
|
|||
|
|
@ -46,3 +46,20 @@ devzat.hackclub.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7oO3Zh+NMk8qsakdy7pvc
|
|||
|1|UlBPVuTLGM0t+eO6gqwOniaaBqc=|pIIYRRadNOTzZ+bqorAUxUl6Kdo= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICO76F2Bj2b1O3Q7Ln2x94kq6Ai2ev2aOyXur9XgSsM0
|
||||
|1|xDilDLeS/mY21JJLSeESaf6EsQU=|+a3048St9462R+Eat+iJKEtNing= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJNV/VLejsM22QLGaE0IFvLAKgBzmv+KZH0YXUwakDwlkLEzqCS3vIEU7hYK6LN9//O56tY/peGsfey5jQIIJ6WFuyezNdpLpScprLukBb7baKlb5Sei5S5Gn4LdLu2927HnbK6bcCRN52DfVmrLDvfc4m9tsV9Uz/aCwGaFU7UYJUJrYsd/+o0yR6FOeZLXWyQhhJKC9e5ueI8mQEUn3h5hhU12AQuvI7c7GPpsq3zK0n1iHbmtAK+o1iuQEP7ynWkh9/9gUYJy5PufIQQYWLesR6CEC47zgBiYtCJkPLzbavrkPhb77v/5Q52hFhsla5fszXyjXG4SPnRZ+7yvlEKDrqh0kFIT5g9WSDGjiho6DrIqNYrlbHWhpfUx/g8YXsTgHqfE44LrqVyWdhpsVeW4q+kfhd7yse/QnWoc0zSrdFmqVHQlBbEQxiwslrENfXuTVpHlUGMO0OvlSPezYknjRklYkA3nFUX6Zj9LjvrgUobtbKi2w/gO+t+qZOOD8=
|
||||
|1|7+Cc7ortn5euZmvXoM2T1cXMSww=|q7tPRYcIZWNPn402o2uPDzIOCOI= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMLxa34Hhx89dTu4blnP+mA5AeWNTMqRyFYrCcJIKop6FtZ571Xyt4ign4zg7QFRQ5CciO783fMPK+K/gDXXAf8=
|
||||
proxypartylab-prod-gcp.tuna-skate.ts.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPHt7ZyKtROakUF3NONpI/waD1NwrEOSC0h8BvPplM3Q
|
||||
lecturify.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLm6cZs1DABFUa6s7qa0BiRFFJOlBF2ZJ/ud/z4IxSA
|
||||
lecturify.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQ6EaluW7kDOFdqvftPVVTCbpe9cO/oJiMRbfuT2XElF/vb5KZPsDKGNV0TUraSiKbktH7NJPDwAlg1gDSgCGQeurnOI7t+FSyR6N9GxFin7n+Uyje3HQAlSm7/+TUWSbvj16ySXWjxqDMJObwsVaSilUYQ4Su5sM/+CWbrtD1HUfD0P/qmztR1tDF4BtvMpE4F3pdadEMU/HJ/CU3xt4zWNWzoxwieZJfclWbCX2iTFrhmdD+QdS7iaaUxgbsXPd9lMuw729yjlb2Zokeju83E0/J5wujvOOzkXPO+VviWSjzAdLAWgmM0kixfpeYCaHEVkRL7RGcEDTyp8ELO/+XLMlSKLcFy633ezAKTYAWjpdprOK5zSZV60udT/9sHt3rDGgP99rJsn7WrnCXMbbXPPbjrtyCYloHwQg5WqX+1pF4RgFM6RUgY2BBz/WCb7gKvFeJXGKAIZF1o8TMUOH0ovCoRXgYYHqh2ObVJf9uAqzCb5mN4RY2C8JT/IBsVX8=
|
||||
lecturify.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGsYM8YHESf0c6YdB+X80j0iuoenTvgUqSkWhL0oCuV3QFaaAjExUf9LylcdYgN0vtRKl8Y7qtG/PCPzgZmZJiA=
|
||||
# ec2-3-27-48-25.ap-southeast-2.compute.amazonaws.com:22 SSH-2.0-supervisor_main-gha.11898
|
||||
ec2-3-27-48-25.ap-southeast-2.compute.amazonaws.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSIPy8CSgGK0xBodMRqqtvhgTG7AV/wab1D5RERrbdJ
|
||||
# ec2-3-27-32-113.ap-southeast-2.compute.amazonaws.com:22 SSH-2.0-supervisor_main-gha.11898
|
||||
01924adc-7e37-708d-be4a-af7c7e20e2fd.gitpod.environment ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSIPy8CSgGK0xBodMRqqtvhgTG7AV/wab1D5RERrbdJ
|
||||
# ec2-3-27-32-113.ap-southeast-2.compute.amazonaws.com:22 SSH-2.0-supervisor_main-gha.11898
|
||||
ec2-3-27-32-113.ap-southeast-2.compute.amazonaws.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSIPy8CSgGK0xBodMRqqtvhgTG7AV/wab1D5RERrbdJ
|
||||
direct.labs.play-with-docker.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdfqAPldXHXgLzdBJQ/EA0JSVPchyWVFcTxAqOovDcft54IFHBV+sK4RdJNuWIf/lUzcedKFcbq1dWrYl62rZ+c1ioiQ2LU3q/QavwBpLw4Q4EE86ataNVXS5ON/CFnhfi/BLOvKTSyhY4CeIz2T0uh1g6xJLfZSyBJgePlox2cRpLtJRS1buy/uKDsiaJlI4AzS4C1tX27qc7UFNsqpfJUgCZuJvPxkTzBDZc4q6A2waN1F4NqTUVkcDx8O3DwBe+2LY9+7Qwk2xoYmftsQ4/pxpx6VayFYiRTASKz/GCdemvQQ4QqCPZ6deOdJYdySejWKFwOvS29U6SwqCjGFZM9iglxD15tHl7uzdOtICLL6IbH6u2ba9C9UhVaQmmQhhf9JVgCSwv8U4RnvVVHrTsWZA+VZNcofT4KUaW2GR216RjRQECMjbRnVyn/O3EfV537AWHD5KyQj2y09PZ9ar30yvWi87VCmWw+ZpKKagynonWSkZgo5vsTTtvCGbbHaU=
|
||||
ec2-54-166-217-106.compute-1.amazonaws.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINg603LYCd3fJWEQKqcE8WbXTF+3z6fC9SfZgvxF/+A9
|
||||
ec2-54-166-217-106.compute-1.amazonaws.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDjY8BDegn6MrX6Cuv/EblCkzrwrGZ6QdVhd66Dc9BOXgh2C70g76Xsyp6d9kHV4WB7eAP4cnYFDRhzMc26myC2Zyk7oR7A5zxG9lQEqzRv3h43SktUKbHrub0b6At1q5VpJ12whJf7K747yWlV6g2EAgesYxOCfPW6ejynQokXrAYRL3OEw7Oup6EZ6bnotW/dCZuYs0hb60nMS9EJdxCaEWA1DEr6/2LEzlU6PSm6KfnK5vz0jdnTngXbY6K4TJBGWC1AYFTrK45UBln5v82XXaOOK0eKu3jkbt1KUYldXNVqk1zm9R70M5Ou5qsNDvV6UsUDMCglKTM/OQMPbL0Ss+fiStTx4oiGyK4btvtftpg7pMeaUgVtT0yyVisfqwxPuR4hCNcN2nO4G4wi3LOkrmuRpOHDBySfpuTA2cKlR73FwMjkZk8yKQUy8hxVvTKZ+inCjqHVkuglGO7fbsogXzl6+tHXZo7Qb4aa5l74d2pg/EZP0LmpRzUgRu/uCF8=
|
||||
ec2-54-166-217-106.compute-1.amazonaws.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNQhVFsTEeGHUHwnOrAgQF0vgGjPr3Wstxq8AigBXHjT340Af639K4dpsuCEbjtcmNk6dhHJze0jwL3ZXfcVCSg=
|
||||
matrix-homelab-chaos ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINg603LYCd3fJWEQKqcE8WbXTF+3z6fC9SfZgvxF/+A9
|
||||
matrix-homelab-chaos.fawn-cod.ts.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINg603LYCd3fJWEQKqcE8WbXTF+3z6fC9SfZgvxF/+A9
|
||||
iapetus.uberspace.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKg+eW11Us1uWXJZ9tmU2RNhRr+iIqHxUcWTOaVD1fJe
|
||||
|
|
|
|||
12
README.md
12
README.md
|
|
@ -12,18 +12,20 @@ curl -fsSL https://scripts.andreijiroh.dev/dotfiles/setup.sh | bash -
|
|||
|
||||
## Available Git mirrors
|
||||
|
||||
This project is hosted on [hosted instance of sourcehut git](https://git.sr.ht) at the
|
||||
[`~ajhalili2006/dotfiles`][git.sr.ht] Git repository, alongside the following
|
||||
Git mirrors:
|
||||
This project is hosted on [~tulir]'s Manimum GitLab instance ([mau.dev]) at
|
||||
<https://mau.dev/andreijiroh-dev/dotfiles>, although I manitain the following
|
||||
git mirrors for conveience:
|
||||
|
||||
* mau.dev: <https://mau.dev/andreijiroh-dev/dotfiles> (technically canonical due
|
||||
to how mirroring work and usualy pushed there first)
|
||||
* GitHub: <https://github.com/andreijiroh-dev>
|
||||
* GitHub: <https://github.com/andreijiroh-dev/dotfiles>
|
||||
* Launchpad.net: <https://git.launchpad.net/ajhalili2006-dotfiles>
|
||||
* ~vern git: <https://git.vern.cc/ajhalili2006/dotfiles-modern>
|
||||
* tildegit: <https://tildegit.org/ajhalili2006/dotfiles-modern>
|
||||
* Hack Club Nest: <https://git.hackclub.app/andreijiroh-dev/dotfiles>
|
||||
|
||||
[git.sr.ht]: https://git.sr.ht/~ajhalili2006/dotfiles
|
||||
[~tulir]: https://mau.fi
|
||||
[mau.dev]: https://mau.dev
|
||||
|
||||
## Setup
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue