From db7b065b6c26cf28ee4674d48af2698b5ab2cf2d Mon Sep 17 00:00:00 2001 From: Gal Szkolnik Date: Mon, 23 May 2022 00:40:30 -0400 Subject: [PATCH] repo housekeeping + theming + terraform + terraform auto-completion + oh-my-posh + nerd-font: Code New Roman Nerd Font --- .chezmoiexternal.toml | 41 +++- .chezmoiignore | 1 + .chezmoiroot | 1 + dot_bashrc => _home/dot_bashrc | 0 dot_emacs-profile => _home/dot_emacs-profile | 0 .../dot_emacs-profiles.el | 0 .../dot_sz.shrc.d}/aliases | 0 .../bash.post/99_chezmoi.complete | 0 .../bash.post/99_gcloud.complete | 0 .../bash.post/99_terraform.complete | 3 + _home/dot_sz.shrc.d/bash.post/oh-my-posh | 1 + .../dot_sz.shrc.d}/bash.pre/00_default.pop_os | 0 .../dot_sz.shrc.d}/bin.path | 0 _home/dot_sz.shrc.d/byobu | 5 + _home/dot_sz.shrc.d/chezmoi.changes | 1 + .../copyq.flatpack.desktop | 0 .../spacemacs.client.desktop | 0 .../spacemacs.daemon.desktop | 0 _home/private_readonly_dot_poshtheme.omp.json | 216 ++++++++++++++++++ .../symlink_dot_emacs.d.tmpl | 0 20 files changed, 260 insertions(+), 9 deletions(-) create mode 100644 .chezmoiignore create mode 100644 .chezmoiroot rename dot_bashrc => _home/dot_bashrc (100%) rename dot_emacs-profile => _home/dot_emacs-profile (100%) rename dot_emacs-profiles.el => _home/dot_emacs-profiles.el (100%) rename {dot_sz.shrc.d => _home/dot_sz.shrc.d}/aliases (100%) rename {dot_sz.shrc.d => _home/dot_sz.shrc.d}/bash.post/99_chezmoi.complete (100%) rename {dot_sz.shrc.d => _home/dot_sz.shrc.d}/bash.post/99_gcloud.complete (100%) create mode 100644 _home/dot_sz.shrc.d/bash.post/99_terraform.complete create mode 100644 _home/dot_sz.shrc.d/bash.post/oh-my-posh rename {dot_sz.shrc.d => _home/dot_sz.shrc.d}/bash.pre/00_default.pop_os (100%) rename {dot_sz.shrc.d => _home/dot_sz.shrc.d}/bin.path (100%) create mode 100644 _home/dot_sz.shrc.d/byobu create mode 100644 _home/dot_sz.shrc.d/chezmoi.changes rename {private_dot_local => _home/private_dot_local}/private_share/private_applications/copyq.flatpack.desktop (100%) rename {private_dot_local => _home/private_dot_local}/private_share/private_applications/spacemacs.client.desktop (100%) rename {private_dot_local => _home/private_dot_local}/private_share/private_applications/spacemacs.daemon.desktop (100%) create mode 100644 _home/private_readonly_dot_poshtheme.omp.json rename symlink_dot_emacs.d.tmpl => _home/symlink_dot_emacs.d.tmpl (100%) diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml index b9706b8..405e416 100644 --- a/.chezmoiexternal.toml +++ b/.chezmoiexternal.toml @@ -1,10 +1,33 @@ -["my/code/from_web/chemacs2"] - type = "git-repo" - url = "https://github.com/plexus/chemacs2.git" - refreshPeriod = "168h" # 7 days +['my/code/from_web/chemacs2'] + type = 'git-repo' + url = 'https://github.com/plexus/chemacs2.git' + refreshPeriod = '168h' # 7 days -[".emacs.my/spacemacs/emacs.d"] - type = "git-repo" - url = "https://github.com/syl20bnr/spacemacs.git" - clone.args = ["--depth=1","--branch=develop"] - refreshPeriod = "168h" # 7 days +['.emacs.my/spacemacs/emacs.d'] + type = 'git-repo' + url = 'https://github.com/syl20bnr/spacemacs.git' + clone.args = ['--depth=1','--branch=develop'] + refreshPeriod = '168h' # 7 days + +# ['my/code/from_web/nerd-fonts'] +# type = 'git-repo' +# url = 'https://github.com/ryanoasis/nerd-fonts.git' +# clone.args = ['--depth=1'] +# refreshPeriod = '168h' # 7 days + +['.local/share/fonts/NerdFonts'] + type = 'archive' + url = 'https://github.com/ryanoasis/nerd-fonts/releases/download/2.2.0-RC/CodeNewRoman.zip' + exact = true + refreshPeriod = '168h' # 7 days + +['.local/bin/oh-my-posh'] + type = 'file' + url = 'https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest/download/posh-linux-amd64' + executable = true + +['.poshthemes'] + type = 'archive' + url = 'https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest/download/themes.zip' + exact = true + refreshPeriod = '168h' # 7 days diff --git a/.chezmoiignore b/.chezmoiignore new file mode 100644 index 0000000..ba2336d --- /dev/null +++ b/.chezmoiignore @@ -0,0 +1 @@ +.local/share/fonts/NerdFonts/* diff --git a/.chezmoiroot b/.chezmoiroot new file mode 100644 index 0000000..65cabf6 --- /dev/null +++ b/.chezmoiroot @@ -0,0 +1 @@ +_home diff --git a/dot_bashrc b/_home/dot_bashrc similarity index 100% rename from dot_bashrc rename to _home/dot_bashrc diff --git a/dot_emacs-profile b/_home/dot_emacs-profile similarity index 100% rename from dot_emacs-profile rename to _home/dot_emacs-profile diff --git a/dot_emacs-profiles.el b/_home/dot_emacs-profiles.el similarity index 100% rename from dot_emacs-profiles.el rename to _home/dot_emacs-profiles.el diff --git a/dot_sz.shrc.d/aliases b/_home/dot_sz.shrc.d/aliases similarity index 100% rename from dot_sz.shrc.d/aliases rename to _home/dot_sz.shrc.d/aliases diff --git a/dot_sz.shrc.d/bash.post/99_chezmoi.complete b/_home/dot_sz.shrc.d/bash.post/99_chezmoi.complete similarity index 100% rename from dot_sz.shrc.d/bash.post/99_chezmoi.complete rename to _home/dot_sz.shrc.d/bash.post/99_chezmoi.complete diff --git a/dot_sz.shrc.d/bash.post/99_gcloud.complete b/_home/dot_sz.shrc.d/bash.post/99_gcloud.complete similarity index 100% rename from dot_sz.shrc.d/bash.post/99_gcloud.complete rename to _home/dot_sz.shrc.d/bash.post/99_gcloud.complete diff --git a/_home/dot_sz.shrc.d/bash.post/99_terraform.complete b/_home/dot_sz.shrc.d/bash.post/99_terraform.complete new file mode 100644 index 0000000..c6d3921 --- /dev/null +++ b/_home/dot_sz.shrc.d/bash.post/99_terraform.complete @@ -0,0 +1,3 @@ +if [ -r /usr/bin/terraform ]; then + complete -C /usr/bin/terraform terraform +fi diff --git a/_home/dot_sz.shrc.d/bash.post/oh-my-posh b/_home/dot_sz.shrc.d/bash.post/oh-my-posh new file mode 100644 index 0000000..8b1c092 --- /dev/null +++ b/_home/dot_sz.shrc.d/bash.post/oh-my-posh @@ -0,0 +1 @@ +eval "$(oh-my-posh init bash --config ~/.poshtheme.omp.json)" diff --git a/dot_sz.shrc.d/bash.pre/00_default.pop_os b/_home/dot_sz.shrc.d/bash.pre/00_default.pop_os similarity index 100% rename from dot_sz.shrc.d/bash.pre/00_default.pop_os rename to _home/dot_sz.shrc.d/bash.pre/00_default.pop_os diff --git a/dot_sz.shrc.d/bin.path b/_home/dot_sz.shrc.d/bin.path similarity index 100% rename from dot_sz.shrc.d/bin.path rename to _home/dot_sz.shrc.d/bin.path diff --git a/_home/dot_sz.shrc.d/byobu b/_home/dot_sz.shrc.d/byobu new file mode 100644 index 0000000..7319dcc --- /dev/null +++ b/_home/dot_sz.shrc.d/byobu @@ -0,0 +1,5 @@ +if [ -z $_byobu_sourced ]; then + _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true + exit +fi + diff --git a/_home/dot_sz.shrc.d/chezmoi.changes b/_home/dot_sz.shrc.d/chezmoi.changes new file mode 100644 index 0000000..d684aa9 --- /dev/null +++ b/_home/dot_sz.shrc.d/chezmoi.changes @@ -0,0 +1 @@ +chezmoi status || true diff --git a/private_dot_local/private_share/private_applications/copyq.flatpack.desktop b/_home/private_dot_local/private_share/private_applications/copyq.flatpack.desktop similarity index 100% rename from private_dot_local/private_share/private_applications/copyq.flatpack.desktop rename to _home/private_dot_local/private_share/private_applications/copyq.flatpack.desktop diff --git a/private_dot_local/private_share/private_applications/spacemacs.client.desktop b/_home/private_dot_local/private_share/private_applications/spacemacs.client.desktop similarity index 100% rename from private_dot_local/private_share/private_applications/spacemacs.client.desktop rename to _home/private_dot_local/private_share/private_applications/spacemacs.client.desktop diff --git a/private_dot_local/private_share/private_applications/spacemacs.daemon.desktop b/_home/private_dot_local/private_share/private_applications/spacemacs.daemon.desktop similarity index 100% rename from private_dot_local/private_share/private_applications/spacemacs.daemon.desktop rename to _home/private_dot_local/private_share/private_applications/spacemacs.daemon.desktop diff --git a/_home/private_readonly_dot_poshtheme.omp.json b/_home/private_readonly_dot_poshtheme.omp.json new file mode 100644 index 0000000..b8f7ef8 --- /dev/null +++ b/_home/private_readonly_dot_poshtheme.omp.json @@ -0,0 +1,216 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "background": "#d3d7cf", + "foreground": "#000000", + "leading_diamond": "\u256d\u2500\ue0b2", + "style": "diamond", + "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}} ", + "type": "os" + }, + { + "background": "#3465a4", + "foreground": "#e4e4e4", + "powerline_symbol": "\ue0b0", + "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 }}{{ .BranchStatus }}{{ 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": "#689f63", + "foreground": "#ffffff", + "invert_powerline": true, + "powerline_symbol": "\ue0b2", + "properties": { + "fetch_version": true + }, + "style": "powerline", + "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }} \uf898 ", + "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 }}{{ .Meaning }}{{ else }}\u2714{{ end }} ", + "type": "exit" + }, + { + "background": "#d3d7cf", + "foreground": "#000000", + "invert_powerline": true, + "style": "diamond", + "template": " {{ .CurrentDate | date .Format }} \uf017 ", + "trailing_diamond": "\ue0b0\u2500\u256e", + "type": "time" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#d3d7cf", + "style": "plain", + "template": "\u2570\u2500", + "type": "text" + } + ], + "type": "prompt" + }, + { + "segments": [ + { + "foreground": "#d3d7cf", + "style": "plain", + "template": "\u2500\u256f", + "type": "text" + } + ], + "type": "rprompt" + } + ], + "console_title_template": "{{ .Shell }} in {{ .Folder }}", + "final_space": true, + "version": 2 +} diff --git a/symlink_dot_emacs.d.tmpl b/_home/symlink_dot_emacs.d.tmpl similarity index 100% rename from symlink_dot_emacs.d.tmpl rename to _home/symlink_dot_emacs.d.tmpl