From 1f5816f90c4e07c83a5262e3d3830d6094176b10 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Tue, 22 Nov 2022 10:33:57 +0000 Subject: [PATCH] Update dotfiles/.bashrc, dotfiles/.local/share/chezmoi/dot_bashrc.tmpl, dotfiles/.local/share/chezmoi/dot_ssh/private_id_rsa.tmpl, dotfiles/.local/share/chezmoi/dot_ssh/id_rsa.pub, dotfiles/.local/share/chezmoi/dot_ssh/authorized_keys.github.tmpl, dotfiles/.local/share/chezmoi/private_dot_config/brew/Brewfile.tmpl, dotfiles/.local/share/chezmoi/.chezmoidata.yaml, dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse.omp.json, dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json, dotfiles/.local/share/chezmoi/private_dot_config/powershell/user_profile.ps1, dotfiles/.local/share/chezmoi/dot_profile.tmpl, dotfiles/.local/share/chezmoi/private_dot_config/mimeapps.list, dotfiles/.local/share/chezmoi/private_dot_config/chromium-flags.conf, dotfiles/.local/share/chezmoi/private_dot_config/pgcli/config, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/settings.json, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions.json, dotfiles/.vscode/settings.json, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/README.md, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/icon.svg, dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/package.json Deleted dotfiles/.local/share/chezmoi/private_dot_config/powershell/takuya.omp.json --- dotfiles/.bashrc | 14 +- .../.local/share/chezmoi/.chezmoidata.yaml | 108 ++++++++-- dotfiles/.local/share/chezmoi/dot_bashrc.tmpl | 90 +++++++++ .../.local/share/chezmoi/dot_profile.tmpl | 4 + ..._keys.tmpl => authorized_keys.github.tmpl} | 0 .../.local/share/chezmoi/dot_ssh/id_rsa.pub | 1 + .../share/chezmoi/dot_ssh/private_id_rsa.tmpl | 1 + .../private_dot_config/brew/Brewfile.tmpl | 11 +- .../private_dot_config/chromium-flags.conf | 11 + .../chezmoi/private_dot_config/mimeapps.list | 44 ++++ .../oh-my-posh/Betelgeuse-minimal.omp.json | 111 +++++++++++ .../oh-my-posh/Betelgeuse.omp.json | 126 ++++++++++++ .../chezmoi/private_dot_config/pgcli/config | 188 ++++++++++++++++++ .../powershell/takuya.omp.json | 127 ------------ .../powershell/user_profile.ps1 | 14 +- .../private_Code/User/extensions.json | 43 ++++ .../theme-betelgeuse-vscode/README.md | 0 .../theme-betelgeuse-vscode/icon.svg | 0 .../theme-betelgeuse-vscode/package.json | 0 .../themes/themer-dark-color-theme.json | 0 .../themes/themer-light-color-theme.json | 0 .../private_Code/User/settings.json | 170 ++++++++++++++++ dotfiles/.vscode/settings.json | 67 ++++++- 23 files changed, 963 insertions(+), 167 deletions(-) rename dotfiles/.local/share/chezmoi/dot_ssh/{authorized_keys.tmpl => authorized_keys.github.tmpl} (100%) create mode 100644 dotfiles/.local/share/chezmoi/dot_ssh/id_rsa.pub create mode 100644 dotfiles/.local/share/chezmoi/dot_ssh/private_id_rsa.tmpl create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/chromium-flags.conf create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/mimeapps.list create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse.omp.json create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/pgcli/config delete mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/powershell/takuya.omp.json create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions.json rename dotfiles/{.vscode => .local/share/chezmoi/private_dot_config/private_Code/User}/extensions/theme-betelgeuse-vscode/README.md (100%) rename dotfiles/{.vscode => .local/share/chezmoi/private_dot_config/private_Code/User}/extensions/theme-betelgeuse-vscode/icon.svg (100%) rename dotfiles/{.vscode => .local/share/chezmoi/private_dot_config/private_Code/User}/extensions/theme-betelgeuse-vscode/package.json (100%) rename dotfiles/{.vscode => .local/share/chezmoi/private_dot_config/private_Code/User}/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json (100%) rename dotfiles/{.vscode => .local/share/chezmoi/private_dot_config/private_Code/User}/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json (100%) create mode 100644 dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/settings.json diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 27ea8314..7c70b805 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -18,13 +18,13 @@ if [ "$BASH_SUPPORT" = 'true' ]; then fi fi -### ~/.profile -if [ -f "$HOME/.profile" ]; then - . "$HOME/.profile" +### Import Common Settings +if [ -f "$HOME/.config/shell/profile" ]; then + . "$HOME/.config/shell/profile" fi ### Settings -if command -v shopt >/dev/null; then +if command -v shopt > /dev/null; then shopt -s globstar shopt -s histappend shopt -s checkwinsize @@ -45,13 +45,13 @@ if [ "$BASH_SUPPORT" = 'true' ]; then ### Directory Colors (https://github.com/trapd00r/LS_COLORS) command -v gdircolors > /dev/null 2>&1 || gdircolors() { dircolors "$@"; } - if command -v gdircolors > /dev/null && [ -f "$HOME/.config/dircolors" ]; then - eval "$(gdircolors -b "$HOME/.config/dircolors")" + if command -v gdircolors > /dev/null && [ -f "$XDG_CONFIG_HOME/dircolors" ]; then + eval "$(gdircolors -b "$XDG_CONFIG_HOME/dircolors")" fi fi fi -### Bash Completions +### Bash Initialization Hooks if [ "$BASH_SUPPORT" = 'true' ]; then ### direnv if command -v direnv > /dev/null; then diff --git a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml index 643ee8ca..a9734fdf 100644 --- a/dotfiles/.local/share/chezmoi/.chezmoidata.yaml +++ b/dotfiles/.local/share/chezmoi/.chezmoidata.yaml @@ -7,35 +7,97 @@ preference: - dnf - pacman - apk + - nix + - pkg + - zypper - brew + - port - yay - choco - scoop - winget - - cask - go - cargo + - npm + - pipx + - gem + - cask + - appimage - binary alternatives: delta: - brew: - - git-delta - - example-dependency + brew: git-delta scoop: delta + bottom: + brew: bottom + pacman: bottom + scoop: bottom + snap: bottom + gdu: + brew: gdu + go: github.com/dundee/gdu/v5/cmd/gdu@latest + pacman: gdu + snap: gdu-disk-usage-analyzer + gdu:debian: + apt: gdu git: apk: git apt: git brew: git dnf: git git-lfs: + _deps: + - git brew: git-lfs scoop: git-lfs + lazygit: + brew: lazygit + choco: lazygit + go: github.com/jesseduffield/lazygit@latest + pacman: lazygit + scoop: lazygit nb: brew: nb # :debian is defined so nothing will be installed on Debian for nb nb:debian: brew: [] + node: + brew: node + scoop: nodejs + oh-my-posh: + brew: jandedobbeleer/oh-my-posh/oh-my-posh + scoop: https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest/download/oh-my-posh.json + pipx: + brew: pipx + python: + apt: python3-pip + brew: python + dnf: python3-pip + pacman: python-pip + scoop: python + ripgrep: + apt: ripgrep + brew: ripgrep + cargo: ripgrep + choco: ripgrep + dnf: ripgrep + nix: ripgrep + pacman: ripgrep + pkg: ripgrep + port: ripgrep + scoop: ripgrep + zypper: ripgrep + ripgrep-all: + brew: + - ffmpeg + - pandoc + - poppler + - rga + - tesseract + choco: ripgrep-all + nix: ripgrep-all + pacman: ripgrep-all rsync: apt: rsync brew: rsync @@ -45,6 +107,8 @@ alternatives: choco: shotcut flatpak: org.shotcut.Shotcut snap: shotcut + tree-sitter-cli: + cargo: tree-sitter-cli volta: brew: volta scoop: volta @@ -55,23 +119,27 @@ alternatives: dnf: wget whalebrew: whalebrew/wget -dependencies: - git-lfs: - - git - -preinstall: - example-package: | - echo "preinstall routine" - postinstall: - git-lfs: | - git lfs install - git-lfs:darwin: | - echo ":darwin is defined so this step will be used on Darwin with PowerShell" - git-lfs:windows: | - echo ":windows is defined so this step will be used on Windows with PowerShell" - nb: | - nb completions install + bottom: + snap: | + sudo snap connect bottom:mount-observe + sudo snap connect bottom:hardware-observe + sudo snap connect bottom:system-observe + sudo snap connect bottom:process-control + gdu: + brew: brew link --overwrite gdu + snap: | + sudo snap connect gdu-disk-usage-analyzer:mount-observe :mount-observe + sudo snap connect gdu-disk-usage-analyzer:system-backup :system-backup + sudo snap alias gdu-disk-usage-analyzer.gdu gdu + git-lfs: git lfs install + nb: nb completions install + pipx: + brew: pipx ensurepath + python: + brew: | + python3 -m pip install --upgrade setuptools + python3 -m pip install --upgrade pip volta: | volta setup volta install node@latest diff --git a/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl b/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl index 8b137891..6a430ead 100644 --- a/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl +++ b/dotfiles/.local/share/chezmoi/dot_bashrc.tmpl @@ -1 +1,91 @@ +# shellcheck disable=SC1090,SC1091 +# Prefer US English +export LANG="en_US" + +# Detect support for advanced terminal features +if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then + export BASH_SUPPORT=true +fi + +### Fig / LC_ALL +if [ "$BASH_SUPPORT" = 'true' ]; then + if [[ "$(hostname)" != *'-minimal' ]]; then + export LC_ALL="en_US.UTF-8" + fi + if [ -f "$HOME/.fig/shell/bashrc.pre.bash" ]; then + . "$HOME/.fig/shell/bashrc.pre.bash" + fi +fi + +### Import Common Settings +if [ -f "$HOME/.config/shell/profile" ]; then + . "$HOME/.config/shell/profile" +fi + +### Settings +if command -v shopt > /dev/null; then + shopt -s globstar + shopt -s histappend + shopt -s checkwinsize +fi + +### History +export HISTFILE="$XDG_STATE_HOME/bash/history" + +# Prompt (on bash only) +if [ "$BASH_SUPPORT" = 'true' ]; then + if [[ "$(hostname)" != *'-minimal' ]]; then + ### Styled Terminal + if command -v oh-my-posh > /dev/null; then + # Oh My Posh (See: https://ohmyposh.dev/) + eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse.omp.json)" + else + # Basic styled terminal + case "$TERM" in + xterm* | rxvt* | Eterm | aterm | kterm | gnome* | alacritty) + PS1="\n \[\033[0;34m\]╭─\[\033[0;31m\]\[\033[0;37m\]\[\033[41m\] $OS_ICON \u \[\033[0m\]\[\033[0;31m\]\[\033[44m\]\[\033[0;34m\]\[\033[44m\]\[\033[0;30m\]\[\033[44m\] \w \[\033[0m\]\[\033[0;34m\] \n \[\033[0;34m\]╰ \[\033[1;36m\]\$ \[\033[0m\]" + ;; + esac + fi + + ### Directory Colors (https://github.com/trapd00r/LS_COLORS) + command -v gdircolors > /dev/null 2>&1 || gdircolors() { dircolors "$@"; } + if command -v gdircolors > /dev/null && [ -f "$XDG_CONFIG_HOME/dircolors" ]; then + eval "$(gdircolors -b "$XDG_CONFIG_HOME/dircolors")" + fi + else + # Minimal session + if command -v oh-my-posh > /dev/null; then + eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse-minimal.omp.json)" + fi + fi +fi + +### Bash Initialization Hooks +if [ "$BASH_SUPPORT" = 'true' ]; then + ### direnv + if command -v direnv > /dev/null; then + eval "$(direnv hook bash)" + fi + + ### Java (asdf) + if [ -f "$ASDF_DATA_DIR/plugins/java/set-java-home.bash" ]; then + . "$ASDF_DATA_DIR/plugins/java/set-java-home.bash" + fi + + ### zoxide + if command -v zoxide > /dev/null; then + eval "$(zoxide init --cmd cd bash)" + fi + + ### Fig + if [ -f "$HOME/.fig/shell/bashrc.post.bash" ]; then + . "$HOME/.fig/shell/bashrc.post.bash" + fi + + ### Vault + if command -v vault > /dev/null; then + complete -C vault vault + fi +fi diff --git a/dotfiles/.local/share/chezmoi/dot_profile.tmpl b/dotfiles/.local/share/chezmoi/dot_profile.tmpl index d68663c7..e1c3d05b 100644 --- a/dotfiles/.local/share/chezmoi/dot_profile.tmpl +++ b/dotfiles/.local/share/chezmoi/dot_profile.tmpl @@ -76,6 +76,10 @@ if [ "$BASH_SUPPORT" = 'true' ]; then if [ -f "$ASDF_DIR/asdf.sh" ]; then . "$ASDF_DIR/asdf.sh" fi + + ### Directory Colors + if [ -f "$] + . "~/.local/share/lscolors.sh" fi ### Colorize diff --git a/dotfiles/.local/share/chezmoi/dot_ssh/authorized_keys.tmpl b/dotfiles/.local/share/chezmoi/dot_ssh/authorized_keys.github.tmpl similarity index 100% rename from dotfiles/.local/share/chezmoi/dot_ssh/authorized_keys.tmpl rename to dotfiles/.local/share/chezmoi/dot_ssh/authorized_keys.github.tmpl diff --git a/dotfiles/.local/share/chezmoi/dot_ssh/id_rsa.pub b/dotfiles/.local/share/chezmoi/dot_ssh/id_rsa.pub new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/dot_ssh/id_rsa.pub @@ -0,0 +1 @@ + diff --git a/dotfiles/.local/share/chezmoi/dot_ssh/private_id_rsa.tmpl b/dotfiles/.local/share/chezmoi/dot_ssh/private_id_rsa.tmpl new file mode 100644 index 00000000..d5d9af98 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/dot_ssh/private_id_rsa.tmpl @@ -0,0 +1 @@ +{{ ( bitwarden "item" "dev.muniftanjim.ssh.personal.id_rsa.private" ).notes }} diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/brew/Brewfile.tmpl b/dotfiles/.local/share/chezmoi/private_dot_config/brew/Brewfile.tmpl index f4577c8a..cc3c56ca 100644 --- a/dotfiles/.local/share/chezmoi/private_dot_config/brew/Brewfile.tmpl +++ b/dotfiles/.local/share/chezmoi/private_dot_config/brew/Brewfile.tmpl @@ -1,3 +1,12 @@ {{- if (eq .host.distro.family "darwin") -}} {{- includeTemplate "darwin/brewfile" . -}} -{{- end -}} \ No newline at end of file +{{- end -}} + +cask "1password" unless File.directory?('/Applications/1Password.app') +cask "google-chrome" unless File.directory?('/Applications/Google Chrome.app') +cask "visual-studio-code" unless File.directory?('/Applications/Visual Studio Code.app') +cask "iterm2" unless File.directory?('/Applications/iTerm.app') +cask 'docker' unless File.directory?('/Applications/Docker.app') + +# Fonts + cask "font-hack-nerd-font" \ No newline at end of file diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/chromium-flags.conf b/dotfiles/.local/share/chezmoi/private_dot_config/chromium-flags.conf new file mode 100644 index 00000000..a584570c --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/chromium-flags.conf @@ -0,0 +1,11 @@ +# enable wayland +--ozone-platform-hint=auto +# force GPU acceleration +--enable-gpu-rasterization +--enable-zero-copy +# enable vulkan +--use-vulkan +--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,VaapiVideoDecoder,VaapiVideoEncoder,WebUIDarkMode,WaylandWindowDecorations +# custom settings +--force-dark-mode +--password-store=basic diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/mimeapps.list b/dotfiles/.local/share/chezmoi/private_dot_config/mimeapps.list new file mode 100644 index 00000000..eea471c0 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/mimeapps.list @@ -0,0 +1,44 @@ +[Default Applications] +application/json=text.desktop +application/pdf=pdf.desktop +application/x-extension-htm=firefox.desktop +application/x-extension-html=firefox.desktop +application/x-extension-shtml=firefox.desktop +application/x-extension-xht=firefox.desktop +application/x-extension-xhtml=firefox.desktop +application/x-xpinstall=firefox.desktop +application/xhtml+xml=firefox.desktop +application/xml=firefox.desktop +image/bmp=imv.desktop +image/gif=imv.desktop +image/heif=imv.desktop +image/jpeg=imv.desktop +image/png=imv.desktop +image/tiff=imv.desktop +image/vnd.zbrush.pcx=imv.desktop +image/x-portable-anymap=imv.desktop +image/x-portable-bitmap=imv.desktop +image/x-portable-graymap=imv.desktop +image/x-portable-pixmap=imv.desktop +image/x-tga=imv.desktop +image/x-xbitmap=imv.desktop +text/html=firefox.desktop +text/html=text.desktop +text/plain=text.desktop +text/tcl=text.desktop +text/x-c++hdr=text.desktop +text/x-c++src=text.desktop +text/x-chdr=text.desktop +text/x-csrc=text.desktop +text/x-google-video-pointer=text.desktop +text/x-java=text.desktop +text/x-makefile=text.desktop +text/x-moc=text.desktop +text/x-pascal=text.desktop +text/x-tex=text.desktop +x-scheme-handler/chrome=firefox.desktop +x-scheme-handler/http=firefox.desktop +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/https=firefox.desktop +x-scheme-handler/terminal=kitty.desktop diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json b/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json new file mode 100644 index 00000000..24167e12 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json @@ -0,0 +1,111 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "console_title_template": "{{if .Segments.Git.RepoName}} {{.Segments.Git.RepoName}} {{else}} {{.Folder}} {{end}}", + "blocks": [ + { + "type": "prompt", + "alignment": "left", + "newline": true, + "segments": [ + { + "type": "session", + "foreground": "#757575", + "properties": { + "display_host": true + }, + "style": "plain", + "template": "\u250c {{ if .SSHSession }}\uf817 {{ end }}{{ .UserName }}@{{ .HostName }} " + }, + { + "type": "path", + "background": "#91ddff", + "foreground": "#100e23", + "powerline_symbol": "\ue0b0", + "properties": { + "style": "agnoster_full" + }, + "style": "powerline", + "template": " {{ .Path }} " + }, + { + "type": "git", + "style": "powerline", + "powerline_symbol": "\ue0b0", + "foreground": "#100e23", + "background": "#95ffa4", + "background_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#ff9248{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#f26d50{{ end }}", + "{{ if gt .Ahead 0 }}#89d1dc{{ end }}", + "{{ if gt .Behind 0 }}#c5b6ad{{ end }}" + ], + "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} \u2502{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }} ", + "properties": { + "branch_ahead_icon": "\u2191", + "branch_behind_icon": "\u2193", + "branch_gone": "\u2262", + "branch_icon": "\ue0a0 ", + "branch_identical_icon": "\u2261", + "cherry_pick_icon": "\u2713 ", + "commit_icon": "\u25b7 ", + "fetch_stash_count": true, + "fetch_status": true, + "merge_icon": "\u25f4 ", + "no_commits_icon": "[no commits]", + "rebase_icon": "\u2c62 ", + "tag_icon": "\u25b6 ", + "untracked_modes": { + "/Users/user/Projects/oh-my-posh/": "no" + } + } + }, + { + "type": "terraform", + "background": "#ffee58", + "foreground": "#100e23", + "powerline_symbol": "\ue0b0", + "style": "powerline", + "template": " {{ .WorkspaceName }}{{ if .Version }} {{ .Version }}{{ end }} " + }, + { + "type": "exit", + "background": "#ff8080", + "foreground": "#ffffff", + "powerline_symbol": "\ue0b0", + "style": "powerline", + "template": " {{ if gt .Code 0 }}error{{ else }}\uf42e{{ end }} " + }, + { + "type": "time", + "foreground": "#689f38", + "properties": { + "time_format": "15:04:05" + }, + "style": "plain", + "template": " <#757575,>| {{ .CurrentDate | date .Format }}" + } + ] + }, + { + "type": "prompt", + "alignment": "left", + "newline": true, + "segments": [ + { + "type": "text", + "foreground": "#757575", + "style": "plain", + "template": "\u2514" + }, + { + "type": "text", + "foreground": "#ffffff", + "style": "plain", + "template": "$" + } + ] + } + ], + "final_space": true, + "version": 2 +} \ No newline at end of file diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse.omp.json b/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse.omp.json new file mode 100644 index 00000000..72555fa0 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/oh-my-posh/Betelgeuse.omp.json @@ -0,0 +1,126 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "background": "#2e9599", + "foreground": "#ffffff", + "leading_diamond": "\ue0b6", + "powerline_symbol": "\ue0b0", + "style": "diamond", + "template": "\uf91c {{ .HostName }} ", + "type": "session" + }, + { + "background": "#D51111", + "foreground": "#ffffff", + "powerline_symbol": "\ue0b0", + "properties": { + "home_icon": "\uf46d", + "folder_separator_icon": " \ue0b1 ", + "folder_icon": "\uf115", + "style": "agnoster" + }, + "style": "powerline", + "template": " {{ path .Path .Location }} ", + "type": "path" + }, + { + "background": "#c19c00", + "background_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#FFEB3B{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#FFA300{{ end }}", + "{{ if gt .Ahead 0 }}#FF7070{{ end }}", + "{{ if gt .Behind 0 }}#90F090{{ end }}" + ], + "foreground": "#000000", + "powerline_symbol": "\ue0b0", + "properties": { + "fetch_stash_count": true, + "fetch_status": true, + "fetch_upstream_icon": true + }, + "style": "powerline", + "template": " \uf113 {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \uf692 {{ .StashCount }}{{ end }} ", + "type": "git" + } + ], + "type": "prompt" + }, + { + "alignment": "right", + "segments": [ + { + "background": "#303030", + "foreground": "#3C873A", + "leading_diamond": "\ue0b6", + "properties": { + "fetch_package_manager": true, + "npm_icon": " <#cc3a3a>\ue5fa ", + "yarn_icon": " <#348cba>\uf61a" + }, + "style": "diamond", + "template": "\ue718 {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}", + "trailing_diamond": "\ue0b4 ", + "type": "node" + }, + { + "background": "#306998", + "foreground": "#FFE873", + "leading_diamond": "\ue0b6", + "style": "diamond", + "template": "\ue235 {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}{{ end }}", + "trailing_diamond": "\ue0b4 ", + "type": "python" + }, + { + "background": "#ffffff", + "foreground": "#06aad5", + "leading_diamond": "\ue0b6", + "style": "diamond", + "template": "\ufcd1 {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}", + "trailing_diamond": "\ue0b4 ", + "type": "go" + }, + { + "background": "#2e9599", + "foreground": "#fff", + "background_templates": [ + "{{ if gt .Code 0 }}#D51111{{ end }}" + ], + "leading_diamond": "\ue0b6", + "properties": { + "time_format": "_2, 15:04:05" + }, + "style": "diamond", + "template": " \uf5ef {{ .CurrentDate | date .Format }} ", + "trailing_diamond": "\ue0b4", + "type": "time" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#FFF", + "foreground_templates": [ + "{{ if gt .Code 0 }}#D51111{{ end }}" + ], + "style": "plain", + "template": " \uf0a4 ", + "type": "text" + } + ], + "type": "prompt" + } + ], + "console_title_template": "{{ .Folder }}", + "final_space": true, + "osc99": true, + "version": 2 +} diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/pgcli/config b/dotfiles/.local/share/chezmoi/private_dot_config/pgcli/config new file mode 100644 index 00000000..60ba948f --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/pgcli/config @@ -0,0 +1,188 @@ +# vi: ft=dosini +[main] + +# Enables context sensitive auto-completion. If this is disabled the all +# possible completions will be listed. +smart_completion = True + +# Display the completions in several columns. (More completions will be +# visible.) +wider_completion_menu = False + +# Multi-line mode allows breaking up the sql statements into multiple lines. If +# this is set to True, then the end of the statements must have a semi-colon. +# If this is set to False then sql statements can't be split into multiple +# lines. End of line (return) is considered as the end of the statement. +multi_line = False + +# If multi_line_mode is set to "psql", in multi-line mode, [Enter] will execute +# the current input if the input ends in a semicolon. +# If multi_line_mode is set to "safe", in multi-line mode, [Enter] will always +# insert a newline, and [Esc] [Enter] or [Alt]-[Enter] must be used to execute +# a command. +multi_line_mode = psql + +# Destructive warning mode will alert you before executing a sql statement +# that may cause harm to the database such as "drop table", "drop database" +# or "shutdown". +destructive_warning = True + +# Enables expand mode, which is similar to `\x` in psql. +expand = False + +# Enables auto expand mode, which is similar to `\x auto` in psql. +auto_expand = False + +# If set to True, table suggestions will include a table alias +generate_aliases = False + +# log_file location. +# In Unix/Linux: ~/.config/pgcli/log +# In Windows: %USERPROFILE%\AppData\Local\dbcli\pgcli\log +# %USERPROFILE% is typically C:\Users\{username} +log_file = default + +# keyword casing preference. Possible values "lower", "upper", "auto" +keyword_casing = auto + +# casing_file location. +# In Unix/Linux: ~/.config/pgcli/casing +# In Windows: %USERPROFILE%\AppData\Local\dbcli\pgcli\casing +# %USERPROFILE% is typically C:\Users\{username} +casing_file = default + +# If generate_casing_file is set to True and there is no file in the above +# location, one will be generated based on usage in SQL/PLPGSQL functions. +generate_casing_file = False + +# Casing of column headers based on the casing_file described above +case_column_headers = True + +# history_file location. +# In Unix/Linux: ~/.config/pgcli/history +# In Windows: %USERPROFILE%\AppData\Local\dbcli\pgcli\history +# %USERPROFILE% is typically C:\Users\{username} +history_file = default + +# Default log level. Possible values: "CRITICAL", "ERROR", "WARNING", "INFO" +# and "DEBUG". "NONE" disables logging. +log_level = INFO + +# Order of columns when expanding * to column list +# Possible values: "table_order" and "alphabetic" +asterisk_column_order = table_order + +# Whether to qualify with table alias/name when suggesting columns +# Possible values: "always", never" and "if_more_than_one_table" +qualify_columns = if_more_than_one_table + +# When no schema is entered, only suggest objects in search_path +search_path_filter = False + +# Default pager. +# By default 'PAGER' environment variable is used +# pager = less -SRXF + +# Timing of sql statments and table rendering. +timing = True + +# Table format. Possible values: psql, plain, simple, grid, fancy_grid, pipe, +# ascii, double, github, orgtbl, rst, mediawiki, html, latex, latex_booktabs, +# textile, moinmoin, jira, vertical, tsv, csv. +# Recommended: psql, fancy_grid and grid. +table_format = psql + +# Syntax Style. Possible values: manni, igor, xcode, vim, autumn, vs, rrt, +# native, perldoc, borland, tango, emacs, friendly, monokai, paraiso-dark, +# colorful, murphy, bw, pastie, paraiso-light, trac, default, fruity +syntax_style = default + +# Keybindings: +# When Vi mode is enabled you can use modal editing features offered by Vi in the REPL. +# When Vi mode is disabled emacs keybindings such as Ctrl-A for home and Ctrl-E +# for end are available in the REPL. +vi = True + +# Error handling +# When one of multiple SQL statements causes an error, choose to either +# continue executing the remaining statements, or stopping +# Possible values "STOP" or "RESUME" +on_error = STOP + +# Set threshold for row limit. Use 0 to disable limiting. +row_limit = 1000 + +# Skip intro on startup and goodbye on exit +less_chatty = True + +# Postgres prompt +# \t - Current date and time +# \u - Username +# \h - Short hostname of the server (up to first '.') +# \H - Hostname of the server +# \d - Database name +# \p - Database port +# \i - Postgres PID +# \# - "@" sign if logged in as superuser, '>' in other case +# \n - Newline +# \dsn_alias - name of dsn alias if -D option is used (empty otherwise) +# \x1b[...m - insert ANSI escape sequence +# eg: prompt = '\x1b[35m\u@\x1b[32m\h:\x1b[36m\d>' +prompt = '\u@\h:\d> ' + +# Number of lines to reserve for the suggestion menu +min_num_menu_lines = 4 + +# Character used to left pad multi-line queries to match the prompt size. +multiline_continuation_char = '' + +# The string used in place of a null value. +null_string = '' + +# manage pager on startup +enable_pager = True + +# Use keyring to automatically save and load password in a secure manner +keyring = False + +# Custom colors for the completion menu, toolbar, etc. +[colors] +completion-menu.completion.current = 'bg:#ffffff #000000' +completion-menu.completion = 'bg:#008888 #ffffff' +completion-menu.meta.completion.current = 'bg:#44aaaa #000000' +completion-menu.meta.completion = 'bg:#448888 #ffffff' +completion-menu.multi-column-meta = 'bg:#aaffff #000000' +scrollbar.arrow = 'bg:#003333' +scrollbar = 'bg:#00aaaa' +selected = '#ffffff bg:#6666aa' +search = '#ffffff bg:#4444aa' +search.current = '#ffffff bg:#44aa44' +bottom-toolbar = 'bg:#222222 #aaaaaa' +bottom-toolbar.off = 'bg:#222222 #888888' +bottom-toolbar.on = 'bg:#222222 #ffffff' +search-toolbar = 'noinherit bold' +search-toolbar.text = 'nobold' +system-toolbar = 'noinherit bold' +arg-toolbar = 'noinherit bold' +arg-toolbar.text = 'nobold' +bottom-toolbar.transaction.valid = 'bg:#222222 #00ff5f bold' +bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold' + +# style classes for colored table output +output.header = "#00ff5f bold" +output.odd-row = "" +output.even-row = "" + +# Named queries are queries you can execute by name. +[named queries] + +# DSN to call by -D option +[alias_dsn] +# example_dsn = postgresql://[user[:password]@][netloc][:port][/dbname] + +# Format for number representation +# for decimal "d" - 12345678, ",d" - 12,345,678 +# for float "g" - 123456.78, ",g" - 123,456.78 +[data_formats] +decimal = "" +float = "" diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/powershell/takuya.omp.json b/dotfiles/.local/share/chezmoi/private_dot_config/powershell/takuya.omp.json deleted file mode 100644 index 61011e48..00000000 --- a/dotfiles/.local/share/chezmoi/private_dot_config/powershell/takuya.omp.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "final_space": false, - "osc99": true, - "blocks": [ - { - "type": "prompt", - "alignment": "left", - "segments": [ - { - "type": "shell", - "style": "diamond", - "leading_diamond": "╭─", - "trailing_diamond": "", - "foreground": "#ffffff", - "background": "#0077c2", - "properties": { - } - }, - { - "type": "root", - "style": "diamond", - "leading_diamond": "", - "trailing_diamond": "", - "foreground": "#FFFB38", - "background": "#ef5350", - "properties": { - "root_icon": "\uf292", - "prefix": "\uE0B0 " - } - }, - { - "type": "path", - "style": "powerline", - "powerline_symbol": "\uE0B0", - "foreground": "#E4E4E4", - "background": "#444444", - "properties": { - "style": "full", - "enable_hyperlink": true - } - }, - { - "type": "git", - "style": "powerline", - "powerline_symbol": "\uE0B0", - "foreground": "#011627", - "background": "#FFFB38", - "background_templates": [ - "{{ if or (.Working.Changed) (.Staging.Changed) }}#ffeb95{{ end }}", - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#c5e478{{ end }}", - "{{ if gt .Ahead 0 }}#C792EA{{ end }}", - "{{ if gt .Behind 0 }}#C792EA{{ end }}" - ], - "properties": { - "branch_icon": "\ue725 ", - "fetch_status": true, - "fetch_upstream_icon": true, - "template": "{{ .HEAD }} {{ if .Working.Changed }}{{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}<#ef5350> \uF046 {{ .Staging.String }}{{ end }}" - } - } - ] - }, - { - "type": "prompt", - "alignment": "right", - "segments": [ - { - "type": "node", - "style": "diamond", - "leading_diamond": " \uE0B6", - "trailing_diamond": "\uE0B4", - "foreground": "#3C873A", - "background": "#303030", - "properties": { - "prefix": "\uE718 ", - "postfix": "", - "display_package_manager": true, - "yarn_icon": " <#348cba>", - "npm_icon": " <#cc3a3a> " - } - }, - { - "type": "time", - "style": "diamond", - "invert_powerline": true, - "leading_diamond": " \uE0B6", - "trailing_diamond": "\uE0B4", - "background": "#40c4ff", - "foreground": "#ffffff", - "properties": { - "prefix": " \uf5ef ", - "postfix": " " - } - } - ] - }, - { - "type": "prompt", - "alignment": "left", - "newline": true, - "segments": [ - { - "type": "text", - "style": "plain", - "foreground": "#21c7c7", - "properties": { - "prefix": "", - "postfix": "", - "text": "╰─" - } - }, - { - "type": "exit", - "style": "plain", - "foreground": "#e0f8ff", - "properties": { - "prefix": "\u276F", - "display_exit_code": false, - "always_enabled": true, - "error_color": "#ef5350" - } - } - ] - } - ] -} diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/powershell/user_profile.ps1 b/dotfiles/.local/share/chezmoi/private_dot_config/powershell/user_profile.ps1 index bb241d11..642ae995 100644 --- a/dotfiles/.local/share/chezmoi/private_dot_config/powershell/user_profile.ps1 +++ b/dotfiles/.local/share/chezmoi/private_dot_config/powershell/user_profile.ps1 @@ -1,18 +1,10 @@ # set PowerShell to UTF-8 [console]::InputEncoding = [console]::OutputEncoding = New-Object System.Text.UTF8Encoding -Install-Module posh-git -Scope CurrentUser -Install-Module oh-my-posh -Scope CurrentUser -Install-Module -Name PSReadLine -AllowPrerelease -Scope CurrentUser -Force -SkipPublisherCheck -Set-Prompt +### Oh My Posh +oh-my-posh init pwsh --config "$env:HOME/.config/oh-my-posh/Betelgeuse.omp.json" | Invoke-Expression -Import-Module posh-git -Import-Module oh-my-posh -$omp_config = Join-Path $PSScriptRoot ".\takuya.omp.json" -oh-my-posh --init --shell pwsh --config $omp_config | Invoke-Expression -Set-Theme Paradox - -Import-Module -Name Terminal-Icons +# Import-Module -Name Terminal-Icons # PSReadLine Set-PSReadLineOption -EditMode Vim diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions.json b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions.json new file mode 100644 index 00000000..578d0f17 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions.json @@ -0,0 +1,43 @@ +{ + "recommendations": [ + "chrmarti.regex", + "DavidAnson.vscode-markdownlint", + "dbaeumer.vscode-eslint", + "eamodio.gitlens", + "EditorConfig.EditorConfig", + "esbenp.prettier-vscode", + "ericadamski.carbon-now-sh", + "formulahendry.code-runner", + "GitHub.vscode-pull-request-github", + "GitLab.gitlab-workflow", + "GoogleCloudTools.cloudcode", + "HashiCorp.terraform", + "hediet.vscode-drawio", + "IBM.output-colorizer", + "Kelvin.vscode-sshfs", + "mads-hartmann.bash-ide-vscode", + "ms-azuretools.vscode-docker", + "ms-kubernetes-tools.vscode-kubernetes-tools", + "ms-vscode-remote.remote-containers", + "ms-vscode-remote.remote-ssh", + "ms-vscode-remote.remote-wsl", + "ms-vscode.PowerShell", + "MS-vsliveshare.vsliveshare", + "MS-vsliveshare.vsliveshare-audio", + "philnash.ngrok-for-vscode", + "PKief.material-icon-theme", + "redhat.ansible", + "redhat.vscode-yaml", + "richie5um2.vscode-sort-json", + "Rubymaniac.vscode-paste-and-indent", + "shd101wyy.markdown-preview-enhanced", + "softwaredotcom.swdc-vscode", + "timonwong.shellcheck", + "tyriar.sort-lines", + "usernamehw.errorlens", + "valentjn.vscode-ltex", + "vsls-contrib.codetour", + "vsls-contrib.gistfs", + "wayou.vscode-todo-highlight" + ] +} diff --git a/dotfiles/.vscode/extensions/theme-betelgeuse-vscode/README.md b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/README.md similarity index 100% rename from dotfiles/.vscode/extensions/theme-betelgeuse-vscode/README.md rename to dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/README.md diff --git a/dotfiles/.vscode/extensions/theme-betelgeuse-vscode/icon.svg b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/icon.svg similarity index 100% rename from dotfiles/.vscode/extensions/theme-betelgeuse-vscode/icon.svg rename to dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/icon.svg diff --git a/dotfiles/.vscode/extensions/theme-betelgeuse-vscode/package.json b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/package.json similarity index 100% rename from dotfiles/.vscode/extensions/theme-betelgeuse-vscode/package.json rename to dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/package.json diff --git a/dotfiles/.vscode/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json similarity index 100% rename from dotfiles/.vscode/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json rename to dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-dark-color-theme.json diff --git a/dotfiles/.vscode/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json similarity index 100% rename from dotfiles/.vscode/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json rename to dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/extensions/theme-betelgeuse-vscode/themes/themer-light-color-theme.json diff --git a/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/settings.json b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/settings.json new file mode 100644 index 00000000..6c476eca --- /dev/null +++ b/dotfiles/.local/share/chezmoi/private_dot_config/private_Code/User/settings.json @@ -0,0 +1,170 @@ +{ + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json5]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[toml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[vue]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "codetour.customTourDirectory": ".config/codetour.yml", + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.fontFamily": "'Hack Nerd Font', Menlo, Monaco, 'Courier New', monospace", + "editor.formatOnPaste": false, + "editor.formatOnSave": true, + "editor.inlineSuggest.enabled": true, + "editor.minimap.enabled": false, + "editor.scrollBeyondLastLine": false, + "eslint.alwaysShowStatus": true, + "eslint.format.enable": true, + "eslint.lintTask.enable": true, + "eslint.lintTask.options": "-c package.json --no-eslintrc --cache --cache-location .cache/eslintcache .", + "eslint.packageManager": "pnpm", + "eslint.validate": [ + "html", + "javascript", + "javascriptreact", + "json", + "jsonc", + "json5", + "markdown", + "toml", + "typescript", + "typescriptreact", + "vue", + "yaml" + ], + "explorer.confirmDelete": false, + "extensions.ignoreRecommendations": true, + "files.trimTrailingWhitespace": true, + "git.autofetch": true, + "git.autoStash": true, + "github.codespaces.showPerformanceExplorer": true, + "gitlab.showPipelineUpdateNotifications": true, + "gitlens.showWelcomeOnInstall": false, + "gitlens.showWhatsNewAfterUpgrades": false, + "go.lintFlags": ["--fast"], + "go.lintTool": "golangci-lint", + "html.format.endWithNewline": true, + "html.format.indentHandlebars": true, + "html.format.indentInnerHtml": true, + "html.format.templating": true, + "javascript.format.semicolons": "remove", + "javascript.suggest.completeFunctionCalls": true, + "ltex.additionalRules.enablePickyRules": true, + "ltex.completionEnabled": true, + "markdown-preview-enhanced.previewTheme": "solarized-light.css", + "material-icon-theme.showWelcomeMessage": false, + "merge-conflict.autoNavigateNextConflict.enabled": true, + "npm.enableRunFromFolder": true, + "npm.packageManager": "pnpm", + "prettier.printWidth": 120, + "prettier.singleQuote": true, + "python.languageServer": "Pylance", + "security.workspace.trust.banner": "never", + "security.workspace.trust.enabled": false, + "telemetry.telemetryLevel": "crash", + "terminal.integrated.sendKeybindingsToShell": true, + "typescript.enablePromptUseWorkspaceTsdk": true, + "typescript.format.semicolons": "remove", + "typescript.implementationsCodeLens.enabled": true, + "typescript.inlayHints.enumMemberValues.enabled": true, + "typescript.inlayHints.functionLikeReturnTypes.enabled": true, + "typescript.inlayHints.parameterTypes.enabled": true, + "typescript.inlayHints.variableTypes.enabled": true, + "typescript.preferences.quoteStyle": "single", + "typescript.referencesCodeLens.enabled": true, + "typescript.referencesCodeLens.showOnAllFunctions": true, + "typescript.suggest.completeFunctionCalls": true, + "typescript.tsdk": "node_modules/typescript/lib", + "typescript.updateImportsOnFileMove.enabled": "always", + "vim.enableNeovim": true, + "vim.handleKeys": { + "": false, + "": false + }, + "vim.leader": "", + "vim.neovimPath": "/usr/bin/nvim", + "vim.normalModeKeyBindings": [ + { + "before": [""], + "commands": [":nohl"] + }, + { + "before": ["leader", "w"], + "commands": ["workbench.action.files.save"] + }, + { + "before": ["leader", "b", "d"], + "commands": ["workbench.action.closeActiveEditor"] + }, + { + "before": ["leader", "l", "n"], + "commands": ["editor.action.marker.next"] + }, + { + "before": ["leader", "l", "p"], + "commands": ["editor.action.marker.prev"] + } + ], + "vscode-neovim.neovimClean": true, + "vscode-neovim.neovimExecutablePaths.linux": "/usr/bin/nvim", + "vsicons.dontShowNewVersionMessage": true, + "window.menuBarVisibility": "toggle", + "workbench.colorCustomizations": { + "terminal.foreground": "#708284", + "terminal.background": "#001e27", + "terminal.ansiBlack": "#002831", + "terminal.ansiBlue": "#2176c7", + "terminal.ansiCyan": "#259286", + "terminal.ansiGreen": "#738a05", + "terminal.ansiMagenta": "#c61c6f", + "terminal.ansiRed": "#d11c24", + "terminal.ansiWhite": "#eae3cb", + "terminal.ansiYellow": "#a57706", + "terminal.ansiBrightBlack": "#475b62", + "terminal.ansiBrightBlue": "#708284", + "terminal.ansiBrightCyan": "#819090", + "terminal.ansiBrightGreen": "#475b62", + "terminal.ansiBrightMagenta": "#5956ba", + "terminal.ansiBrightRed": "#bd3613", + "terminal.ansiBrightWhite": "#fcf4dc", + "terminal.ansiBrightYellow": "#536870", + "terminal.selectionBackground": "#002831", + "terminalCursor.foreground": "#708284" + }, + "workbench.colorTheme": "Betelgeuse Dark", + "workbench.iconTheme": "sweet-vscode-icons", + "workbench.startupEditor": "readme", + "workbench.welcomePage.walkthroughs.openOnInstall": false, + "yaml.format.printWidth": 160, + "yaml.format.singleQuote": true +} diff --git a/dotfiles/.vscode/settings.json b/dotfiles/.vscode/settings.json index c29fa1bd..6c476eca 100644 --- a/dotfiles/.vscode/settings.json +++ b/dotfiles/.vscode/settings.json @@ -40,6 +40,9 @@ "editor.fontFamily": "'Hack Nerd Font', Menlo, Monaco, 'Courier New', monospace", "editor.formatOnPaste": false, "editor.formatOnSave": true, + "editor.inlineSuggest.enabled": true, + "editor.minimap.enabled": false, + "editor.scrollBeyondLastLine": false, "eslint.alwaysShowStatus": true, "eslint.format.enable": true, "eslint.lintTask.enable": true, @@ -59,8 +62,11 @@ "vue", "yaml" ], - "git.autoStash": true, + "explorer.confirmDelete": false, + "extensions.ignoreRecommendations": true, + "files.trimTrailingWhitespace": true, "git.autofetch": true, + "git.autoStash": true, "github.codespaces.showPerformanceExplorer": true, "gitlab.showPipelineUpdateNotifications": true, "gitlens.showWelcomeOnInstall": false, @@ -86,6 +92,7 @@ "security.workspace.trust.banner": "never", "security.workspace.trust.enabled": false, "telemetry.telemetryLevel": "crash", + "terminal.integrated.sendKeybindingsToShell": true, "typescript.enablePromptUseWorkspaceTsdk": true, "typescript.format.semicolons": "remove", "typescript.implementationsCodeLens.enabled": true, @@ -98,6 +105,64 @@ "typescript.referencesCodeLens.showOnAllFunctions": true, "typescript.suggest.completeFunctionCalls": true, "typescript.tsdk": "node_modules/typescript/lib", + "typescript.updateImportsOnFileMove.enabled": "always", + "vim.enableNeovim": true, + "vim.handleKeys": { + "": false, + "": false + }, + "vim.leader": "", + "vim.neovimPath": "/usr/bin/nvim", + "vim.normalModeKeyBindings": [ + { + "before": [""], + "commands": [":nohl"] + }, + { + "before": ["leader", "w"], + "commands": ["workbench.action.files.save"] + }, + { + "before": ["leader", "b", "d"], + "commands": ["workbench.action.closeActiveEditor"] + }, + { + "before": ["leader", "l", "n"], + "commands": ["editor.action.marker.next"] + }, + { + "before": ["leader", "l", "p"], + "commands": ["editor.action.marker.prev"] + } + ], + "vscode-neovim.neovimClean": true, + "vscode-neovim.neovimExecutablePaths.linux": "/usr/bin/nvim", + "vsicons.dontShowNewVersionMessage": true, + "window.menuBarVisibility": "toggle", + "workbench.colorCustomizations": { + "terminal.foreground": "#708284", + "terminal.background": "#001e27", + "terminal.ansiBlack": "#002831", + "terminal.ansiBlue": "#2176c7", + "terminal.ansiCyan": "#259286", + "terminal.ansiGreen": "#738a05", + "terminal.ansiMagenta": "#c61c6f", + "terminal.ansiRed": "#d11c24", + "terminal.ansiWhite": "#eae3cb", + "terminal.ansiYellow": "#a57706", + "terminal.ansiBrightBlack": "#475b62", + "terminal.ansiBrightBlue": "#708284", + "terminal.ansiBrightCyan": "#819090", + "terminal.ansiBrightGreen": "#475b62", + "terminal.ansiBrightMagenta": "#5956ba", + "terminal.ansiBrightRed": "#bd3613", + "terminal.ansiBrightWhite": "#fcf4dc", + "terminal.ansiBrightYellow": "#536870", + "terminal.selectionBackground": "#002831", + "terminalCursor.foreground": "#708284" + }, + "workbench.colorTheme": "Betelgeuse Dark", + "workbench.iconTheme": "sweet-vscode-icons", "workbench.startupEditor": "readme", "workbench.welcomePage.walkthroughs.openOnInstall": false, "yaml.format.printWidth": 160,