diff --git a/dotfiles/.gitignore b/dotfiles/.gitignore index 3980959..cdaa328 100644 --- a/dotfiles/.gitignore +++ b/dotfiles/.gitignore @@ -37,3 +37,4 @@ pre temp temp.* temp +.databricks diff --git a/nvim/lua/config/keymap.lua b/nvim/lua/config/keymap.lua index 04d3823..9f251c9 100644 --- a/nvim/lua/config/keymap.lua +++ b/nvim/lua/config/keymap.lua @@ -127,6 +127,9 @@ vim.keymap.set("n", "o", "split | Oil") -- CopilotChat vim.keymap.set("n", "c", ":CopilotChat") +vim.keymap.set("n", "sc", function() + require("CopilotChat").toggle({ window = { layout = "horizontal" } }) +end, { desc = "Toggle Copilot Chat (horizontal)" }) -- ZenMode vim.keymap.set("n", "z", ":ZenMode") diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index c75152a..c18e5ce 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -27,7 +27,7 @@ return { keymap = { [""] = { "select_next", - -- "fallback" + "fallback", }, [""] = { "select_prev", diff --git a/nvim/lua/plugins/copilot.lua b/nvim/lua/plugins/copilot.lua index b1e5c86..4381806 100644 --- a/nvim/lua/plugins/copilot.lua +++ b/nvim/lua/plugins/copilot.lua @@ -38,11 +38,17 @@ return { { "nvim-lua/plenary.nvim" }, }, opts = { + system_prompt = [[You are an expert software engineer. +- Provide clear, concise explanations +- Do not include comments unless necessary +- Include docstrings +- Any Python code should pass strict type checking]], debug = true, context = "buffers", history_path = vim.fn.stdpath("data") .. "/copilotchat_history", auto_follow_cursor = false, - model = "gpt-4o", + auto_insert_mode = true, + model = "gpt-4o-mini", }, }, } diff --git a/nvim/lua/plugins/formatting.lua b/nvim/lua/plugins/formatting.lua index 599658f..5e2159f 100644 --- a/nvim/lua/plugins/formatting.lua +++ b/nvim/lua/plugins/formatting.lua @@ -11,15 +11,22 @@ return { }, formatters_by_ft = { - bash = { "beautysh", "shellharden" }, + bash = { + "beautysh", + "shellharden", + }, sh = { "beautysh", "shellharden" }, html = { "djlintJinja", "prettier" }, jinja = { "djlintJinja" }, json = { "jq" }, lua = { "stylua" }, go = { "gofmt" }, - python = { "isort", "ruff_format" }, - markdown = { "injected" }, + python = { + "isort", + "ruff_format", + "trim_whitespace", + }, + -- markdown = { "injected" }, javascript = { "prettier" }, css = { "stylelint" }, yaml = { "yamlfix" }, @@ -27,8 +34,6 @@ return { ["*"] = { "codespell", "trim_newlines", - "injected", - "trim_whitespace", }, }, }) @@ -78,7 +83,7 @@ return { javascript = "js", julia = "jl", latex = "tex", - markdown = "md", + -- markdown = "md", python = "py", ruby = "rb", rust = "rs", diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 8c95703..b193def 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -32,7 +32,7 @@ return { layout_config = { width = 0.9 }, prompt_prefix = " ", selection_caret = " ", - path_display = { "smart" }, + path_display = { "filename_first" }, mappings = { i = { [""] = actions.move_selection_next, diff --git a/scripts/aliases.sh b/scripts/aliases.sh index b442a8c..4b534ea 100755 --- a/scripts/aliases.sh +++ b/scripts/aliases.sh @@ -155,3 +155,5 @@ alias air='ssh adamgreen@air.local' alias macbook='ssh adam@macbook.local' alias f='fish' + +alias secret='nvim /home/adam/src/.env.secret' diff --git a/starship/starship.toml b/starship/starship.toml index 66e77dc..1971391 100644 --- a/starship/starship.toml +++ b/starship/starship.toml @@ -5,9 +5,9 @@ format = """$shell$hostname$directory$line_break$character""" right_format = """$cmd_duration$git_branch$python$nix_shell""" [shell] -fish_indicator = "[  ](bold purple)" -zsh_indicator = " 󰬇" -bash_indicator = " $" +fish_indicator = " fish" +zsh_indicator = " zsh" +bash_indicator = " bash" disabled = false [localip]