Compare commits
No commits in common. "d295a752ee04950beacbe2f0fe7113225111f64c" and "fd090a31fa24d59baae5f59e372580c40682dcaa" have entirely different histories.
d295a752ee
...
fd090a31fa
@ -62,14 +62,9 @@
|
|||||||
"[json]": {
|
"[json]": {
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||||
},
|
},
|
||||||
"[toml]": {
|
|
||||||
"editor.defaultFormatter": "tamasfe.even-better-toml"
|
|
||||||
},
|
|
||||||
"cursor.chat.smoothStreaming": true,
|
"cursor.chat.smoothStreaming": true,
|
||||||
|
"godotTools.lsp.serverPort": 6005,
|
||||||
"debug.console.fontFamily": "FiraCode Nerd Font Mono",
|
"debug.console.fontFamily": "FiraCode Nerd Font Mono",
|
||||||
"git.openRepositoryInParentFolders": "never",
|
"git.openRepositoryInParentFolders": "never",
|
||||||
"typescript.updateImportsOnFileMove.enabled": "always",
|
"typescript.updateImportsOnFileMove.enabled": "always"
|
||||||
"evenBetterToml.formatter.indentEntries": true,
|
|
||||||
"evenBetterToml.formatter.indentTables": true,
|
|
||||||
"evenBetterToml.formatter.trailingNewline": true
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,239 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
|
|
||||||
"console_title_template": "{{ .Shell }} in {{ .Folder }}",
|
|
||||||
"final_space": true,
|
|
||||||
"version": 2,
|
|
||||||
"palette": {
|
|
||||||
"rosewater": "#F5E0DC",
|
|
||||||
"flamingo": "#F2CDCD",
|
|
||||||
"pink": "#F5C2E7",
|
|
||||||
"mauve": "#CBA6F7",
|
|
||||||
"red": "#F38BA8",
|
|
||||||
"maroon": "#EBA0AC",
|
|
||||||
"peach": "#FAB387",
|
|
||||||
"yellow": "#F9E2AF",
|
|
||||||
"green": "#A6E3A1",
|
|
||||||
"teal": "#94E2D5",
|
|
||||||
"sky": "#89DCEB",
|
|
||||||
"sapphire": "#74C7EC",
|
|
||||||
"blue": "#89B4FA",
|
|
||||||
"lavender": "#B4BEFE",
|
|
||||||
"text": "#CDD6F4",
|
|
||||||
"subtext1": "#BAC2DE",
|
|
||||||
"subtext0": "#A6ADC8",
|
|
||||||
"overlay2": "#9399B2",
|
|
||||||
"overlay1": "#7F849C",
|
|
||||||
"overlay0": "#6C7086",
|
|
||||||
"surface2": "#585B70",
|
|
||||||
"surface1": "#45475A",
|
|
||||||
"surface0": "#313244",
|
|
||||||
"base": "#1E1E2E",
|
|
||||||
"mantle": "#181825",
|
|
||||||
"crust": "#11111B",
|
|
||||||
"true": "p:green",
|
|
||||||
"false": "p:red"
|
|
||||||
},
|
|
||||||
"transient_prompt": {
|
|
||||||
"foreground": "p:text",
|
|
||||||
"template": "{{ now | date \"15:04:05\" }} {{ if gt .Code 0 }}<p:false>❯</>{{ else }}<p:true>\u276f</>{{ end }} "
|
|
||||||
},
|
|
||||||
"blocks": [
|
|
||||||
{
|
|
||||||
"alignment": "left",
|
|
||||||
"segments": [
|
|
||||||
{
|
|
||||||
"type": "os",
|
|
||||||
"background": "p:surface0",
|
|
||||||
"foreground": "p:text",
|
|
||||||
"leading_diamond": "",
|
|
||||||
"style": "diamond",
|
|
||||||
"template": " {{.Icon}} "
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "p:lavender",
|
|
||||||
"foreground": "p:base",
|
|
||||||
"powerline_symbol": "",
|
|
||||||
"properties": {
|
|
||||||
"home_icon": "~",
|
|
||||||
"style": "full"
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " \uf07c {{ .Path }} ",
|
|
||||||
"type": "path"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#4e9a06",
|
|
||||||
"background_templates": [
|
|
||||||
"{{ if or (.Working.Changed) (.Staging.Changed) }}#c4a000{{ end }}",
|
|
||||||
"{{ if and (gt .Ahead 0) (gt .Behind 0) }}#f26d50{{ end }}",
|
|
||||||
"{{ if gt .Ahead 0 }}#89d1dc{{ end }}",
|
|
||||||
"{{ if gt .Behind 0 }}#4e9a06{{ end }}"
|
|
||||||
],
|
|
||||||
"foreground": "#000000",
|
|
||||||
"powerline_symbol": "\ue0b0",
|
|
||||||
"properties": {
|
|
||||||
"branch_icon": "\uf126 ",
|
|
||||||
"fetch_stash_count": true,
|
|
||||||
"fetch_status": true,
|
|
||||||
"fetch_upstream_icon": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ .UpstreamIcon }}{{ .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 }} \ueb4b {{ .StashCount }}{{ end }} ",
|
|
||||||
"type": "git"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alignment": "right",
|
|
||||||
"segments": [
|
|
||||||
{
|
|
||||||
"background": "#689f63",
|
|
||||||
"foreground": "#ffffff",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"fetch_version": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} \ue718 ",
|
|
||||||
"type": "node"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#00acd7",
|
|
||||||
"foreground": "#111111",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"fetch_version": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} \ue627 ",
|
|
||||||
"type": "go"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#4063D8",
|
|
||||||
"foreground": "#111111",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"fetch_version": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} \ue624 ",
|
|
||||||
"type": "julia"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#FFDE57",
|
|
||||||
"foreground": "#111111",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"display_mode": "files",
|
|
||||||
"fetch_virtual_env": false
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} \ue235 ",
|
|
||||||
"type": "python"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#AE1401",
|
|
||||||
"foreground": "#ffffff",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"display_mode": "files",
|
|
||||||
"fetch_version": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} \ue791 ",
|
|
||||||
"type": "ruby"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#FEAC19",
|
|
||||||
"foreground": "#ffffff",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"display_mode": "files",
|
|
||||||
"fetch_version": false
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} \uf0e7",
|
|
||||||
"type": "azfunc"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background_templates": [
|
|
||||||
"{{if contains \"default\" .Profile}}#FFA400{{end}}",
|
|
||||||
"{{if contains \"jan\" .Profile}}#f1184c{{end}}"
|
|
||||||
],
|
|
||||||
"foreground": "#ffffff",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"display_default": false
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }} \ue7ad ",
|
|
||||||
"type": "aws"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#ffff66",
|
|
||||||
"foreground": "#111111",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " \uf0ad ",
|
|
||||||
"type": "root"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#c4a000",
|
|
||||||
"foreground": "#000000",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ .FormattedMs }} \uf252 ",
|
|
||||||
"type": "executiontime"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#000000",
|
|
||||||
"background_templates": [
|
|
||||||
"{{ if gt .Code 0 }}#cc2222{{ end }}"
|
|
||||||
],
|
|
||||||
"foreground": "#d3d7cf",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"powerline_symbol": "\ue0b2",
|
|
||||||
"properties": {
|
|
||||||
"always_enabled": true
|
|
||||||
},
|
|
||||||
"style": "powerline",
|
|
||||||
"template": " {{ if gt .Code 0 }}{{ reason .Code }}{{ else }}\uf42e{{ end }} ",
|
|
||||||
"type": "status"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"background": "#d3d7cf",
|
|
||||||
"foreground": "#000000",
|
|
||||||
"invert_powerline": true,
|
|
||||||
"style": "diamond",
|
|
||||||
"template": " {{ .CurrentDate | date .Format }} \uf017 ",
|
|
||||||
"trailing_diamond": "",
|
|
||||||
"type": "time"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "prompt"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alignment": "left",
|
|
||||||
"newline": true,
|
|
||||||
"segments": [
|
|
||||||
{
|
|
||||||
"foreground": "#d3d7cf",
|
|
||||||
"style": "plain",
|
|
||||||
"template": "❯",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"type": "prompt"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
1842
zsh/.p10k.zsh
Normal file
1842
zsh/.p10k.zsh
Normal file
File diff suppressed because it is too large
Load Diff
12
zsh/.zshrc
12
zsh/.zshrc
@ -1,3 +1,10 @@
|
|||||||
|
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||||
|
# Initialization code that may require console input (password prompts, [y/n]
|
||||||
|
# confirmations, etc.) must go above this block; everything else may go below.
|
||||||
|
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||||
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
|
ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
|
||||||
|
|
||||||
if [ ! -d "$ZINIT_HOME" ]; then
|
if [ ! -d "$ZINIT_HOME" ]; then
|
||||||
@ -7,6 +14,8 @@ fi
|
|||||||
|
|
||||||
source "${ZINIT_HOME}/zinit.zsh"
|
source "${ZINIT_HOME}/zinit.zsh"
|
||||||
|
|
||||||
|
zinit ice depth=1; zinit light romkatv/powerlevel10k
|
||||||
|
|
||||||
zinit light zsh-users/zsh-syntax-highlighting
|
zinit light zsh-users/zsh-syntax-highlighting
|
||||||
zinit light zsh-users/zsh-completions
|
zinit light zsh-users/zsh-completions
|
||||||
zinit light zsh-users/zsh-autosuggestions
|
zinit light zsh-users/zsh-autosuggestions
|
||||||
@ -20,7 +29,8 @@ autoload -Uz compinit && compinit
|
|||||||
|
|
||||||
zinit cdreplay -q
|
zinit cdreplay -q
|
||||||
|
|
||||||
eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/config.json)"
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
|
||||||
# Keybindings
|
# Keybindings
|
||||||
bindkey -e
|
bindkey -e
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user