From b695754d7c64dea53f63712552485b0ed97ad8ac Mon Sep 17 00:00:00 2001 From: ssulca Date: Tue, 14 Oct 2025 08:49:31 -0300 Subject: [PATCH 1/3] feat(starship): Add starship config --- .config/starship.toml | 119 ++++++++++++++++++++++++++++++++++++++++ .pre-commit-config.yaml | 13 +++++ sqls.json | 8 --- 3 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 .config/starship.toml create mode 100644 .pre-commit-config.yaml delete mode 100644 sqls.json diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..6520288 --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,119 @@ +format = """ +[░▒▓](#303030)\ +[  ](bg:#303030 fg:#097969)\ +[](bg:#303030 fg:#616161)\ +$directory\ +[](bg:#303030 fg:#616161)\ +[▓▒░](#303030)\ +$git_branch\ +$git_status\ +$time\ +\n$character""" + + +[directory] +style = "bold fg:#2EA8FF bg:#303030" +format = "[ $path ]($style)" +# truncation_symbol = "…/" +# configure directory +read_only = " " +# truncation_length = 10 +truncate_to_repo = false # truncates directory to root folder if in github repo +# style = "bold blue" + +# [directory.substitutions] +# "Documents" = " " +# "Downloads" = " " +# "Music" = " " +# "Pictures" = " " + + +[localip] +ssh_only = false +format = '📟 [$localipv4](bold red) ' +disabled = true + +[username] +style_user = "green bold" +style_root = "red bold" +format = "   [$user]($style) " +disabled = false +show_always = true + +[hostname] +ssh_only = false +format = '[$hostname](bold yellow) ' +trim_at = "." +disabled = true + +# Replace the "❯" symbol in the prompt with "➜" +[character] # The name of the module we are configuring is "character" +success_symbol = "[❯](bold green)" # The "success_symbol" segment is being set to "➜" with the color "bold green" +error_symbol = "[✗](bold red)" +#   +[cmd_duration] +min_time = 4 +show_milliseconds = false +disabled = false +style = "bold italic red" + +[aws] +symbol = " " + +[docker_context] +symbol = " " +format = "via [$symbol$context]($style) " +style = "blue bold" +only_with_files = true +detect_files = ["docker-compose.yml", "docker-compose.yaml", "Dockerfile"] +detect_folders = [] +disabled = false + +[git_branch] +# style = 'bold purple bg:#303030' +symbol = " " + +[golang] +symbol = " " + +[hg_branch] +symbol = " " + +[memory_usage] +symbol = "󰍛 " + +[nim] +symbol = " " + +[nix_shell] +symbol = " " + +[package] +symbol = "󰏗 " + +[perl] +symbol = " " + +[python] +symbol = " " +#pyenv_version_name = true +format = 'via [${symbol}python (${version} )(\($virtualenv\) )]($style)' +style = "bold yellow" +pyenv_prefix = "venv " +python_binary = ["./venv/bin/python", "python", "python3", "python2"] +detect_extensions = ["py"] +version_format = "v${raw}" + +[ruby] +symbol = " " + +[rust] +symbol = " " + +[shlvl] +symbol = " " + +[nodejs] +format = "via [ Node.js $version](bold green) " +detect_files = ["package.json", ".node-version"] +detect_folders = ["node_modules"] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..6ca911f --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,13 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v6.0.0 + hooks: + - id: trailing-whitespace + - id: check-merge-conflict + - id: check-added-large-files + - id: check-toml + - id: check-yaml + - id: check-json + - id: debug-statements + - id: detect-private-key + - id: end-of-file-fixer diff --git a/sqls.json b/sqls.json deleted file mode 100644 index 40283b0..0000000 --- a/sqls.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sqls": { - "connections": [{ - "driver": "mysql", - "dataSourceName": "user1:password1@tcp(localhost:3306)/sample_db" - }] - } -} From afa9da522dd786b565f320f1b6bd59faff2086aa Mon Sep 17 00:00:00 2001 From: ssulca Date: Tue, 14 Oct 2025 08:52:36 -0300 Subject: [PATCH 2/3] feat(spacemacs): update spacemacs config --- .spacemacs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.spacemacs b/.spacemacs index 028573c..386d1fb 100644 --- a/.spacemacs +++ b/.spacemacs @@ -45,8 +45,7 @@ This function should only modify configuration layer settings." common-lisp lsp helm - ;; ansible - ;; nginx + multiple-cursors spacemacs-completion spacemacs-layouts spacemacs-editing @@ -55,14 +54,9 @@ This function should only modify configuration layer settings." spacemacs-language spacemacs-misc spacemacs-modeline - ;; spacemacs-navigation - spacemacs-org - ;; spacemacs-purpose spacemacs-visual spell-checking syntax-checking - ;; languagetool - ;; web-beautify ;; -- version control -- (shell :variables shell-default-height 30 @@ -81,9 +75,8 @@ This function should only modify configuration layer settings." treemacs-use-filewatch-mode t treemacs-use-all-the-icons-theme t) ;; tabs - - ;; -- files -- ;; html + toml (markdown :variables markdown-live-preview-engine 'vmd markdown-mmm-auto-modes '("c" "c++" "python" "scala" ("elisp" "emacs-lisp"))) @@ -105,8 +98,8 @@ This function should only modify configuration layer settings." python-fill-column 99) (sql :variables sql-auto-indent nil - sql-backend 'lsp - sql-lsp-sqls-workspace-config-path 'workspace + ;; sql-backend 'lsp + ;; sql-lsp-sqls-workspace-config-path 'workspace sql-capitalize-keywords nil sql-capitalize-keywords-blacklist '("name" "varchar")) (shell-scripts :variables shell-scripts-backend 'lsp) @@ -115,7 +108,6 @@ This function should only modify configuration layer settings." (docker :variables docker-dockerfile-backend 'lsp shell-scripts-format-on-save t) - ) From 9547360a127b420b3f0cf44f493c1921216471f0 Mon Sep 17 00:00:00 2001 From: ssulca Date: Tue, 14 Oct 2025 09:02:52 -0300 Subject: [PATCH 3/3] feat(spacemacs): Add terraform config --- .spacemacs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.spacemacs b/.spacemacs index 386d1fb..b110528 100644 --- a/.spacemacs +++ b/.spacemacs @@ -108,6 +108,9 @@ This function should only modify configuration layer settings." (docker :variables docker-dockerfile-backend 'lsp shell-scripts-format-on-save t) + (terraform :variables + terraform-auto-format-on-save t + terraform-backend 'lsp) )