From 5990bbe121cf8c331ce8bf1a8753363636d5c126 Mon Sep 17 00:00:00 2001 From: Florian Beisel Date: Wed, 9 Oct 2024 16:20:24 +0200 Subject: [PATCH] Update .chezmoidata/packages.yaml Update .p10k.zsh Update Library/Application Support/Code/User/settings.json --- .chezmoidata/packages.yaml | 47 +++++ dot_p10k.zsh | 57 ++---- .../private_Code/User/settings.json | 186 +++++++++--------- 3 files changed, 153 insertions(+), 137 deletions(-) diff --git a/.chezmoidata/packages.yaml b/.chezmoidata/packages.yaml index 7104287..e86df0b 100644 --- a/.chezmoidata/packages.yaml +++ b/.chezmoidata/packages.yaml @@ -9,6 +9,7 @@ packages: - automake - awscli - azure-cli + - bash - bitwarden-cli - brotli - c-ares @@ -16,19 +17,32 @@ packages: - certifi - cffi - chezmoi + - cmake - coreutils - cryptography + - devcontainer + - direnv - eza + - firefox-profile-switcher-connector - gettext + - gh - git + - git-absorb + - gitu + - gitui - gmp + - gnu-getopt - gnutls - go + - go@1.22 - icu4c + - icu4c@75 - jless - jq - jsoncpp + - lazygit - libassuan + - libassuan@2 - libevent - libgit2 - libgpg-error @@ -43,22 +57,27 @@ packages: - libuv - libvterm - libyaml + - llvm@18 - lpeg - lua - luajit - luv + - lz4 - m4 - mactop - make + - mise - mosh - mpdecimal - msgpack + - ncurses - neofetch - neovim - nettle - nmap - node - oh-my-posh + - ollama - oniguruma - openconnect - openfortivpn @@ -77,32 +96,60 @@ packages: - python@3.11 - python@3.12 - readline + - rust - screenresolution - shellcheck + - shfmt - sqlite - stoken + - telnet + - terraform + - terramate - thefuck + - tmux - tree - tree-sitter - typescript - unbound - unibilium - unixodbc + - usage + - utf8proc - xz - z - zsh-autocomplete + - zstd casks: - alacritty + - amazon-q - batteryboi - bitwarden + - chatgpt + - coscreen - crystalfetch - divvy - docker + - dotnet-sdk + - firefox + - google-chrome + - iterm2 - jordanbaird-ice - keepingyouawake - logseq - loop - moonlight + - obs + - pop - powershell + - prusaslicer + - quickrecorder + - raycast - signal + - soundsource + - spotify - utm + - visual-studio-code + - vmware-fusion + - vmware-horizon-client + - whatsapp + - zoom diff --git a/dot_p10k.zsh b/dot_p10k.zsh index 0fe8fee..797c5d8 100644 --- a/dot_p10k.zsh +++ b/dot_p10k.zsh @@ -1,7 +1,7 @@ -# Generated by Powerlevel10k configuration wizard on 2024-04-23 at 18:17 CEST. +# Generated by Powerlevel10k configuration wizard on 2024-09-30 at 14:02 CEST. # Based on romkatv/powerlevel10k/config/p10k-lean.zsh, checksum 52020. # Wizard options: nerdfont-complete + powerline, small icons, unicode, lean, 24h time, -# 2 lines, dotted, no frame, darkest-ornaments, compact, many icons, concise, +# 2 lines, dotted, no frame, light-ornaments, compact, many icons, fluent, # transient_prompt, instant_prompt=verbose. # Type `p10k configure` to generate another config. # @@ -65,7 +65,7 @@ # php_version # php version (https://www.php.net/) # laravel_version # laravel php framework version (https://laravel.com/) # java_version # java version (https://www.java.com/) - # package # name@version from package.json (https://docs.npmjs.com/files/package.json) + package # name@version from package.json (https://docs.npmjs.com/files/package.json) rbenv # ruby version from rbenv (https://github.com/rbenv/rbenv) rvm # ruby version from rvm (https://rvm.io) fvm # flutter version management (https://github.com/leoafarias/fvm) @@ -106,7 +106,6 @@ taskwarrior # taskwarrior task count (https://taskwarrior.org/) per_directory_history # Oh My Zsh per-directory-history local/global indicator # cpu_arch # CPU architecture - pulumistack time # current time # =========================[ Line #2 ]========================= newline @@ -166,7 +165,7 @@ # POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR=' ' below. typeset -g POWERLEVEL9K_SHOW_RULER=false typeset -g POWERLEVEL9K_RULER_CHAR='─' # reasonable alternative: '·' - typeset -g POWERLEVEL9K_RULER_FOREGROUND=238 + typeset -g POWERLEVEL9K_RULER_FOREGROUND=242 # Filler between left and right prompt on the first prompt line. You can set it to '·' or '─' # to make it easier to see the alignment between left and right prompt and to separate prompt @@ -177,7 +176,7 @@ typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR='·' if [[ $POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_CHAR != ' ' ]]; then # The color of the filler. - typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=238 + typeset -g POWERLEVEL9K_MULTILINE_FIRST_PROMPT_GAP_FOREGROUND=242 # Add a space between the end of left prompt and the filler. typeset -g POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL=' ' # Add a space between the filler and the start of right prompt. @@ -497,7 +496,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_VCS_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_VCS_PREFIX='%fon ' + typeset -g POWERLEVEL9K_VCS_PREFIX='%fon ' # Show status of repositories of these types. You can add svn and/or hg if you are # using them. If you do, your prompt may become slow even when your current directory @@ -558,7 +557,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%ftook ' + typeset -g POWERLEVEL9K_COMMAND_EXECUTION_TIME_PREFIX='%ftook ' #######################[ background_jobs: presence of background jobs ]####################### # Don't show the number of background jobs. @@ -923,7 +922,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_CONTEXT_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%fwith ' + typeset -g POWERLEVEL9K_CONTEXT_PREFIX='%fwith ' ###[ virtualenv: python virtual environment (https://docs.python.org/3/library/venv.html) ]### # Python virtual environment color. @@ -1315,7 +1314,7 @@ POWERLEVEL9K_KUBECONTEXT_DEFAULT_CONTENT_EXPANSION+='${${:-/$P9K_KUBECONTEXT_NAMESPACE}:#/default}' # Custom prefix. - # typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%fat ' + typeset -g POWERLEVEL9K_KUBECONTEXT_PREFIX='%fat ' ################[ terraform: terraform workspace (https://www.terraform.io) ]################# # Don't show terraform workspace if it's literally "default". @@ -1544,7 +1543,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_TOOLBOX_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_TOOLBOX_PREFIX='%fin ' + typeset -g POWERLEVEL9K_TOOLBOX_PREFIX='%fin ' ###############################[ public_ip: public IP address ]############################### # Public IP color. @@ -1647,7 +1646,7 @@ # Custom icon. # typeset -g POWERLEVEL9K_TIME_VISUAL_IDENTIFIER_EXPANSION='⭐' # Custom prefix. - # typeset -g POWERLEVEL9K_TIME_PREFIX='%fat ' + typeset -g POWERLEVEL9K_TIME_PREFIX='%fat ' # Example of a user-defined prompt segment. Function prompt_example will be called on every # prompt if `example` prompt segment is added to POWERLEVEL9K_LEFT_PROMPT_ELEMENTS or @@ -1677,40 +1676,6 @@ prompt_example } - #############[ pulumistack: current pulumi stack (https://www.pulumi.com/) ]############# - # Show pulumistack only when the the command you are typing invokes one of these tools. - # Tip: Remove the next line to always show pulumistack. - typeset -g POWERLEVEL9K_PULUMISTACK_SHOW_ON_COMMAND='pulumi' - - function prompt_pulumistack() { - # Check working directory is a pulumi project - local ext - if [ -f "./Pulumi.yaml" ]; then - ext="yaml" - elif [ -f "./Pulumi.yml" ]; then - ext="yml" - else - return - fi - - # Check pulumi workspace file exist - local pjt_name=$(basename $PWD) - local pjt_hash=$(echo -n $PWD/Pulumi.${ext} | sha1sum | head -c 40) - local ws_path="$HOME/.pulumi/workspaces/${pjt_name}-${pjt_hash}-workspace.json" - if [ ! -f ${ws_path} ]; then - return - fi - # Print stack name - local stack_name=$(cat ${ws_path} | jq ".stack" -r) - if [ ! -z "${stack_name}" ]; then - p10k segment -i '⏣' -f 13 -t ${stack_name} - fi - } - - function instant_prompt_pulumistack() { - prompt_pulumistack - } - # User-defined prompt segments can be customized the same way as built-in segments. # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208 # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐' diff --git a/private_Library/private_Application Support/private_Code/User/settings.json b/private_Library/private_Application Support/private_Code/User/settings.json index d029781..445ea7f 100644 --- a/private_Library/private_Application Support/private_Code/User/settings.json +++ b/private_Library/private_Application Support/private_Code/User/settings.json @@ -1,95 +1,99 @@ { - "workbench.startupEditor": "none", - "git.autofetch": true, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[markdown]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[shellscript]": { + "editor.defaultFormatter": "shakram02.bash-beautify" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "atlascode.bitbucket.enabled": false, + "atlascode.jira.jqlList": [ + { + "enabled": false, + "id": "e4c6fa3b-43de-4118-83f0-29a8cc35fd4a", + "monitor": true, + "name": "My intersport-idea Issues", + "query": "assignee = currentUser() AND resolution = Unresolved ORDER BY lastViewed DESC", + "siteId": "c81b2682-1865-41a2-8f04-d7d4c9b4daf4" }, - "github.copilot.editor.enableAutoCompletions": true, - "yaml.schemas": { - "file:///Users/beisel/.vscode/extensions/atlassian.atlascode-3.0.10/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" - }, - "redhat.telemetry.enabled": false, - "atlascode.jira.jqlList": [ - { - "id": "e4c6fa3b-43de-4118-83f0-29a8cc35fd4a", - "enabled": false, - "name": "My intersport-idea Issues", - "query": "assignee = currentUser() AND resolution = Unresolved ORDER BY lastViewed DESC", - "siteId": "c81b2682-1865-41a2-8f04-d7d4c9b4daf4", - "monitor": true - }, - { - "id": "fd487582-bd7a-477b-b8d7-eafedd58150b", - "enabled": true, - "name": "My INTERSPORT Digital GmbH Issues", - "query": "assignee = currentUser() AND resolution = Unresolved AND status != Closed ORDER BY lastViewed DESC", - "siteId": "caad4e53-f67d-4bc7-878a-db221f3e28ff", - "monitor": true - } - ], - "atlascode.bitbucket.enabled": false, - "atlascode.jira.statusbar.showProduct": true, - "atlascode.jira.statusbar.showUser": true, - "workbench.colorTheme": "Catppuccin Macchiato", - "workbench.iconTheme": "material-icon-theme", - "projectManager.git.baseFolders": [ - "~/private/", - "~/src/work/" - ], - "debug.console.fontFamily": "MesloLGS NF", - "terminal.integrated.fontFamily": "MesloLGS NF", - "terminal.integrated.fontSize": 13, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "gitlens.showWelcomeOnInstall": false, - "gitlens.showWhatsNewAfterUpgrades": false, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "git.openRepositoryInParentFolders": "always", - "javascript.inlayHints.enumMemberValues.enabled": true, - "javascript.inlayHints.functionLikeReturnTypes.enabled": true, - "javascript.inlayHints.parameterTypes.enabled": true, - "javascript.inlayHints.parameterNames.enabled": "all", - "javascript.inlayHints.variableTypes.enabled": true, - "typescript.inlayHints.parameterTypes.enabled": true, - "typescript.inlayHints.propertyDeclarationTypes.enabled": true, - "typescript.inlayHints.enumMemberValues.enabled": true, - "typescript.inlayHints.functionLikeReturnTypes.enabled": true, - "typescript.inlayHints.parameterNames.enabled": "all", - "go.inlayHints.parameterNames": true, - "[yaml]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "typescript.inlayHints.variableTypes.enabled": true, - "github.copilot.enable": { - "*": true, - "plaintext": false, - "markdown": true, - "scminput": false - }, - "go.toolsManagement.autoUpdate": true, - "files.associations": { - "*.tm.hcl": "terramate" - }, - "vscode-home-assistant.hostUrl": "http://192.168.80.87:8123", - "vscode-home-assistant.longLivedAccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2ZmY1ZmFiNWZmODc0YWVkOWU4NGQ1NjQ3YWUyZjA3ZiIsImlhdCI6MTcyMTk5MjE3NiwiZXhwIjoyMDM3MzUyMTc2fQ.zwfXV3qO-ACE8NFnspDlq85AQLoCZqvX42h95O7_BgU", - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[markdown]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "projectManager.groupList": true, - "projectManager.removeCurrentProjectFromList": false, - "workbench.productIconTheme": "macos-modern", - "gitlab.duoCodeSuggestions.enabled": false, - "git.confirmSync": false, - "[shellscript]": { - "editor.defaultFormatter": "shakram02.bash-beautify" + { + "enabled": true, + "id": "fd487582-bd7a-477b-b8d7-eafedd58150b", + "monitor": true, + "name": "My INTERSPORT Digital GmbH Issues", + "query": "assignee = currentUser() AND resolution = Unresolved AND status != Closed ORDER BY lastViewed DESC", + "siteId": "caad4e53-f67d-4bc7-878a-db221f3e28ff" } + ], + "atlascode.jira.statusbar.showProduct": true, + "atlascode.jira.statusbar.showUser": true, + "debug.console.fontFamily": "MesloLGS NF", + "editor.accessibilitySupport": "off", + "files.associations": { + "*.tm.hcl": "terramate" + }, + "git.autofetch": true, + "git.confirmSync": false, + "git.openRepositoryInParentFolders": "always", + "github.copilot.editor.enableAutoCompletions": true, + "github.copilot.enable": { + "*": true, + "markdown": true, + "plaintext": false, + "scminput": false + }, + "gitlab.duoCodeSuggestions.enabled": false, + "gitlens.showWelcomeOnInstall": false, + "gitlens.showWhatsNewAfterUpgrades": false, + "go.inlayHints.parameterNames": true, + "go.toolsManagement.autoUpdate": true, + "javascript.inlayHints.enumMemberValues.enabled": true, + "javascript.inlayHints.functionLikeReturnTypes.enabled": true, + "javascript.inlayHints.parameterNames.enabled": "all", + "javascript.inlayHints.parameterTypes.enabled": true, + "javascript.inlayHints.variableTypes.enabled": true, + "projectManager.git.baseFolders": [ + "~/private/", + "~/src/work/" + ], + "projectManager.groupList": true, + "projectManager.removeCurrentProjectFromList": false, + "redhat.telemetry.enabled": false, + "terminal.integrated.fontFamily": "MesloLGS NF", + "terminal.integrated.fontSize": 13, + "typescript.inlayHints.enumMemberValues.enabled": true, + "typescript.inlayHints.functionLikeReturnTypes.enabled": true, + "typescript.inlayHints.parameterNames.enabled": "all", + "typescript.inlayHints.parameterTypes.enabled": true, + "typescript.inlayHints.propertyDeclarationTypes.enabled": true, + "typescript.inlayHints.variableTypes.enabled": true, + "vscode-home-assistant.hostUrl": "http://192.168.80.87:8123", + "vscode-home-assistant.longLivedAccessToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2ZmY1ZmFiNWZmODc0YWVkOWU4NGQ1NjQ3YWUyZjA3ZiIsImlhdCI6MTcyMTk5MjE3NiwiZXhwIjoyMDM3MzUyMTc2fQ.zwfXV3qO-ACE8NFnspDlq85AQLoCZqvX42h95O7_BgU", + "workbench.colorTheme": "Tokyo Night Storm", + "workbench.iconTheme": "material-icon-theme", + "workbench.productIconTheme": "macos-modern", + "workbench.startupEditor": "none", + "yaml.schemas": { + "file:///Users/beisel/.vscode/extensions/atlassian.atlascode-3.0.10/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml" + }, + "terminal.integrated.env.osx": { + "Q_NEW_SESSION": "1" + } } \ No newline at end of file