diff --git a/misc_config/ohmyposh.json b/misc_config/ohmyposh.json index 6c28ed5..b4b02ec 100644 --- a/misc_config/ohmyposh.json +++ b/misc_config/ohmyposh.json @@ -1,123 +1,119 @@ { - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "blocks": [ - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#E5C07B", - "properties": { - "time_format": "15:04" - }, - "style": "plain", - "template": "[{{ .CurrentDate | date .Format }}]", - "type": "time" + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#E5C07B", + "properties": { + "time_format": "15:04" }, - { - "type": "shell", - "style": "plain", - "foreground": "#E06C75", - "properties": { - "mapped_shell_names": { - "pwsh": "Shell", - "powershell": "Shell", - "cmd": "Cmd", - "bash": "Bash" - } - }, - "template": " \ue795 {{ .Name }}" + "style": "plain", + "template": "\uf017 {{ .CurrentDate | date .Format }}", + "type": "time" + }, + { + "type": "shell", + "style": "plain", + "foreground": "#E06C75", + "properties": { + "mapped_shell_names": { + "pwsh": "Shell", + "powershell": "Shell", + "cmd": "Cmd", + "bash": "Bash" + } }, - { - "foreground": "#F3C267", - "foreground_templates": [ - "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", - "{{ if gt .Ahead 0 }}#B388FF{{ end }}", - "{{ if gt .Behind 0 }}#B388FF{{ end }}" - ], - "properties": { - "branch_max_length": 25, - "fetch_stash_count": true, - "fetch_status": true, - "fetch_upstream_icon": true - }, - "style": "plain", - "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": [ - { - "type": "status", - "style": "plain", - "foreground": "#b8ff75", - "foreground_templates": [ - "{{ if gt .Code 0 }}#E06C75{{ end }}" - ], - "template": " x{{ reason .Code }}" + "template": " \ue795 {{ .Name }}" + }, + { + "foreground": "#F3C267", + "foreground_templates": [ + "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}", + "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}", + "{{ if gt .Ahead 0 }}#B388FF{{ end }}", + "{{ if gt .Behind 0 }}#B388FF{{ end }}" + ], + "properties": { + "branch_max_length": 25, + "fetch_stash_count": true, + "fetch_status": true, + "fetch_upstream_icon": true }, - { - "foreground": "#b8ff75", - "foreground_templates": [ - "{{ if gt .Code 0 }}#E06C75{{ end }}" - ], - "properties": { - "style": "roundrock", - "always_enabled": true - }, - "style": "diamond", - "template": " {{ .FormattedMs }} ", - "type": "executiontime" - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#61AFEF", - "properties": { - "style": "full" - }, - "style": "plain", - "template": "\ue5ff {{ .Path }}", - "type": "path" - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#E06C75", - "style": "plain", - "template": "\u0021", - "type": "root" - }, - { - "foreground": "#E06C75", - "style": "plain", - "template": "\u276f", - "type": "text" - } - ], - "type": "prompt" - } - ], - "transient_prompt": { - "background": "transparent", - "foreground": "#ffffff", - "template": "{{ .Shell }}> " + "style": "plain", + "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" }, - "final_space": true, - "version": 2 - } + { + "alignment": "right", + "segments": [ + { + "type": "status", + "style": "plain", + "foreground": "#b8ff75", + "foreground_templates": ["{{ if gt .Code 0 }}#E06C75{{ end }}"], + "template": " x{{ reason .Code }}" + }, + { + "foreground": "#E5C07B", + "foreground_templates": ["{{ if gt .Code 0 }}#E06C75{{ end }}"], + "properties": { + "style": "roundrock", + "always_enabled": true + }, + "style": "diamond", + "template": " {{ .FormattedMs }} ", + "type": "executiontime" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#61AFEF", + "properties": { + "style": "full" + }, + "style": "plain", + "template": "\ue5ff {{ .Path }}", + "type": "path" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#E06C75", + "style": "plain", + "template": "\u0021", + "type": "root" + }, + { + "foreground": "#E06C75", + "style": "plain", + "template": "\u276f", + "type": "text" + } + ], + "type": "prompt" + } + ], + "transient_prompt": { + "background": "transparent", + "foreground": "#ffffff", + "template": "{{ .Shell }}> " + }, + "final_space": true, + "version": 2 +} diff --git a/zed_config/keymap.json b/zed_config/keymap.json index 9922a47..d1d2153 100644 --- a/zed_config/keymap.json +++ b/zed_config/keymap.json @@ -35,7 +35,8 @@ "cmd-h": "zed::Hide", "alt-cmd-h": "zed::HideOthers", "cmd-m": "zed::Minimize", - "ctrl-cmd-f": "zed::ToggleFullScreen" + "ctrl-cmd-f": "zed::ToggleFullScreen", + "ctrl-r": "projects::OpenRecent" } }, { diff --git a/zed_config/settings.json b/zed_config/settings.json index 36fcf1c..91e7603 100644 --- a/zed_config/settings.json +++ b/zed_config/settings.json @@ -23,7 +23,7 @@ }, "theme": { "mode": "system", - "light": "Ayu Light", + "light": "One Light", "dark": "Catppuccin Mocha" }, "scrollbar": { @@ -31,10 +31,10 @@ }, "scroll_beyond_last_line": "vertical_scroll_margin", "vertical_scroll_margin": 20, - "ui_font_family": "SF Mono", + // "ui_font_family": ".SystemUIFont", "ui_font_features": {}, "ui_font_size": 17, - "buffer_font_family": "SF Mono", + "buffer_font_family": "Rec Mono Linear", "buffer_font_size": 15, "terminal": { "font_family": "FiraCode Nerd Font Mono" @@ -43,7 +43,8 @@ "soft_wrap": "editor_width", "tabs": { "close_position": "left", - "git_status": true + "git_status": true, + "file_icons": true }, "notification_panel": { "button": false