Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dotfiles/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ pre
temp
temp.*
temp
.databricks
3 changes: 3 additions & 0 deletions nvim/lua/config/keymap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ vim.keymap.set("n", "<leader>o", "<CMD>split | Oil<CR>")

-- CopilotChat
vim.keymap.set("n", "<leader>c", ":CopilotChat<CR>")
vim.keymap.set("n", "<leader>sc", function()
require("CopilotChat").toggle({ window = { layout = "horizontal" } })
end, { desc = "Toggle Copilot Chat (horizontal)" })

-- ZenMode
vim.keymap.set("n", "<leader>z", ":ZenMode<CR>")
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ return {
keymap = {
["<Tab>"] = {
"select_next",
-- "fallback"
"fallback",
},
["<S-Tab>"] = {
"select_prev",
Expand Down
8 changes: 7 additions & 1 deletion nvim/lua/plugins/copilot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
}
17 changes: 11 additions & 6 deletions nvim/lua/plugins/formatting.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,29 @@ 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" },
sql = { "sqlfluff" },
["*"] = {
"codespell",
"trim_newlines",
"injected",
"trim_whitespace",
},
},
})
Expand Down Expand Up @@ -78,7 +83,7 @@ return {
javascript = "js",
julia = "jl",
latex = "tex",
markdown = "md",
-- markdown = "md",
python = "py",
ruby = "rb",
rust = "rs",
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ return {
layout_config = { width = 0.9 },
prompt_prefix = " ",
selection_caret = " ",
path_display = { "smart" },
path_display = { "filename_first" },
mappings = {
i = {
["<C-n>"] = actions.move_selection_next,
Expand Down
2 changes: 2 additions & 0 deletions scripts/aliases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 3 additions & 3 deletions starship/starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down