diff --git a/main.yml b/main.yml index 548d6ab..40a7775 100644 --- a/main.yml +++ b/main.yml @@ -11,8 +11,8 @@ tags: homebrew - role: vim tags: vim - - role: tmux - tags: tmux +# - role: tmux +# tags: tmux - role: zellij tags: zellij - role: alacritty diff --git a/roles/homebrew/defaults/main.yml b/roles/homebrew/defaults/main.yml index 393ed8c..e874296 100644 --- a/roles/homebrew/defaults/main.yml +++ b/roles/homebrew/defaults/main.yml @@ -1,15 +1,11 @@ --- homebrew_taps: - - homebrew/cask - - homebrew/cask-fonts - - homebrew/cask-versions - - homebrew/core + - hashicorp/tap - knqyf263/trivy - weaveworks/tap homebrew_cask_apps: - alacritty - - clipy - CotEditor - font-hack-nerd-font - google-chrome @@ -39,16 +35,17 @@ homebrew_packages: - fish - fzf - gawk + # GitHub CLI + - gh - git - git-delta - - goodwithtech/r/dockle - gpg - - hashicorp/tap/terraform-ls + - terraform-ls - httpie - infracost - jnv - jq - - knqyf263/trivy/trivy + - trivy - k6 - minikube # asdf alternative @@ -62,6 +59,8 @@ homebrew_packages: - protobuf - python3 # - reattach-to-user-namespace + # Launcher Tool + - raycast - ripgrep - starship - stats diff --git a/roles/shell/templates/config.fish.j2 b/roles/shell/templates/config.fish.j2 index ae15b67..be28fac 100644 --- a/roles/shell/templates/config.fish.j2 +++ b/roles/shell/templates/config.fish.j2 @@ -58,7 +58,7 @@ end # Go path set -x GOPATH $HOME/go -set -x PATH $PATH $GOPATH/bin +set -x PATH $GOPATH/bin $PATH # Editors path set -x EDITOR (brew --prefix)/bin/nvim diff --git a/roles/vim/files/copilot_chat_config.lua b/roles/vim/files/copilot_chat_config.lua index ebe479d..48e5476 100644 --- a/roles/vim/files/copilot_chat_config.lua +++ b/roles/vim/files/copilot_chat_config.lua @@ -4,10 +4,10 @@ local actions = require("CopilotChat.actions") require("CopilotChat").setup { - debug = true, -- Enable debugging + debug = true, -- Enable debugging - model = 'gpt-4', -- GPT model to use, 'gpt-3.5-turbo' or 'gpt-4' - temperature = 0.1, -- GPT temperature + model = 'gpt-4', -- GPT model to use, 'gpt-3.5-turbo' or 'gpt-4' + temperature = 0.1, -- GPT temperature prompts = { Explain = { @@ -33,17 +33,17 @@ require("CopilotChat").setup { -- default window options window = { - layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace' - width = 0.3, -- fractional width of parent, or absolute width in columns when > 1 - height = 0.3, -- fractional height of parent, or absolute height in rows when > 1 + layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace' + width = 0.3, -- fractional width of parent, or absolute width in columns when > 1 + height = 0.3, -- fractional height of parent, or absolute height in rows when > 1 -- Options below only apply to floating windows - relative = 'editor', -- 'editor', 'win', 'cursor', 'mouse' - border = 'single', -- 'none', single', 'double', 'rounded', 'solid', 'shadow' - row = nil, -- row position of the window, default is centered - col = nil, -- column position of the window, default is centered - title = 'Copilot Chat', -- title of chat window - footer = nil, -- footer of chat window - zindex = 1, -- determines if window is on top or below other floating windows + relative = 'editor', -- 'editor', 'win', 'cursor', 'mouse' + border = 'single', -- 'none', single', 'double', 'rounded', 'solid', 'shadow' + row = nil, -- row position of the window, default is centered + col = nil, -- column position of the window, default is centered + title = 'Copilot Chat', -- title of chat window + footer = nil, -- footer of chat window + zindex = 1, -- determines if window is on top or below other floating windows }, -- default mappings @@ -74,12 +74,12 @@ require("CopilotChat").setup { show_diff = { normal = 'gd' }, - show_system_prompt = { - normal = 'gp' - }, - show_user_selection = { - normal = 'gs' - }, + -- show_system_prompt = { + -- normal = 'gp' + -- }, + -- show_user_selection = { + -- normal = 'gs' + -- }, }, } diff --git a/roles/zellij/tasks/main.yml b/roles/zellij/tasks/main.yml index 65b0fc7..045bb26 100644 --- a/roles/zellij/tasks/main.yml +++ b/roles/zellij/tasks/main.yml @@ -1,10 +1,8 @@ --- - name: Create ~/.config directories ansible.builtin.file: - path: "{{ item }}" + path: "{{ ansible_env.HOME }}/.config/zellij" state: directory - loop: - - "{{ ansible_env.HOME }}/.zellij" - name: Unlink config file ansible.builtin.file: