diff --git a/flake.lock b/flake.lock index dfcd31c..f6ff599 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1748389978, - "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", + "lastModified": 1749553941, + "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", + "rev": "150e5130886f2368f9b303bc8a312a48ab7b0ead", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1747860236, - "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", + "lastModified": 1749127971, + "narHash": "sha256-x3WRiZnF2JhurxgN8N2xAG4gWi2VcDZz8QUBoqmmghE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", + "rev": "5271933f7cea9f6b1c7de953379469010ed4553a", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1748376831, - "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", + "lastModified": 1749074056, + "narHash": "sha256-sGdT9KvBwK1alV4ocapnhRwJhNT7KfzrNJnqzpMJCJc=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", + "rev": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1748258625, - "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748380727, - "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1748365238, - "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", + "lastModified": 1749502840, + "narHash": "sha256-3Tn4xIgjE+subR8nEp8yB01mMPExsO8UaRWYud5tLYo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", + "rev": "98543263f95dd191fd6d3b08500680d18bebe214", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1748270776, - "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "56a9dfd1e05868cf3189369aad87242941396563", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1747829807, - "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", + "lastModified": 1748967690, + "narHash": "sha256-L2ccr8gquqGBVP/KDfbSjV2AKAEG/x+go6cjHRqxrbA=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "8b729e489f1475615dc6c9737da917b3bc163605", + "rev": "d0f90ef51d4be86b824b012ec52ed715b5622e51", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748004396, - "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", + "lastModified": 1748532608, + "narHash": "sha256-1bUp5YPXJ4Smc2unn7IN5tNv7UVFZvKPcxd5wnDt3Ig=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", + "rev": "145b930954a3146cfb5b8a73cdcad42eb7d2740c", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1747924806, - "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", + "lastModified": 1749125183, + "narHash": "sha256-+Ma1QG4CcAxHhXuBwIpFhv+uFC8hY0azTOfzj/jDV0s=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", + "rev": "cc26ae6a620298bb3f33b0e0681f99a10ae57781", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748287881, - "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", + "lastModified": 1748737685, + "narHash": "sha256-ndndReTxl8qZYgIXA++XWC9JA+JSNjfkTBXZQNXFw8g=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", + "rev": "a0c8e9698ef90bcfdf42806a38bf55b612b65b18", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1748350935, - "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", + "lastModified": 1749345812, + "narHash": "sha256-gO7QDAYmU6ez1TAYuS2VCf9V3C2AYIj6yynQNGNa9Jw=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", + "rev": "a182334ba933e58240c2c45e6ae2d9c7ae313e00", "type": "github" }, "original": { @@ -498,11 +498,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1747719337, - "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1747786963, - "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748230341, - "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", + "lastModified": 1748820067, + "narHash": "sha256-iCtFRqBhgpjHnTPNN3jagfm+qAGkb3glMxqRHJb+Iqk=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", + "rev": "1c733e8c1957dc67f47580fe9c458a13b5612d5b", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748354888, - "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", + "lastModified": 1748856318, + "narHash": "sha256-GPaujTCGmVWF15YhzzVouf+XkzrIfJky3ILhN6mhFOE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", + "rev": "464a443b5a6657f39772b20baa95d02ffe97b268", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1747884293, - "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -866,11 +866,11 @@ "nvim_plugin-yetone/avante.nvim": { "flake": false, "locked": { - "lastModified": 1748339096, - "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", + "lastModified": 1749541623, + "narHash": "sha256-6zVk1MmiNBxzsBd2sbSXpMlIrM9IBvJarSBt+fmXYBY=", "owner": "yetone", "repo": "avante.nvim", - "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", + "rev": "e2b34f6435edcb9ef0a051ddcf24693a5d8bba2b", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1748023521, - "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "a620a5a97b73faba009a8160bab2885316e1451c", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -980,11 +980,11 @@ ] }, "locked": { - "lastModified": 1748313401, - "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", + "lastModified": 1749523120, + "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", + "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0fe82b3..4d94d95 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "RingOfStorms's Neovim configuration using nix flake for portability"; # Nixpkgs / NixOS version to use. inputs = { - # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs"; rust-overlay.url = "github:oxalica/rust-overlay"; diff --git a/init.lua b/init.lua index 103aee4..7145d16 100644 --- a/init.lua +++ b/init.lua @@ -14,6 +14,8 @@ U = require("util") -- NOTE global U[til] require("options") require("keymaps") +local home_dir = + -- print("IS NIX " .. tostring(NIX ~= nil)); -- When using nix, it will set lazy via LAZY env variable. diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua index b670c48..8ad598e 100644 --- a/lua/plugins/avante.lua +++ b/lua/plugins/avante.lua @@ -35,19 +35,34 @@ return { end, lazy = false, opts = function() - local provider = os.getenv("ANTHROPIC_API_KEY") and "claude" or "copilot" - + -- local provider = os.getenv("ANTHROPIC_API_KEY") and "claude" or "copilot" return { - provider = provider, - auto_suggestions_provider = provider, - hints = { enabled = false }, + provider = "copilot", + auto_suggestions_provider = "copilot", + -- providers = { + -- ollama = { + -- endpoint = "http://100.64.0.6:11434/", -- Note that there is no /v1 at the end. + -- model = "gemma3:12b", + -- }, + -- ollamafast = { + -- __inherited_from = "ollama", + -- endpoint = "http://100.64.0.6:11434/", -- Note that there is no /v1 at the end. + -- model = "gemma3:4b", + -- }, + -- }, + hints = { enabled = true }, behavior = { auto_suggestions = true, + auto_set_highlight_group = true, auto_set_keymaps = false, support_paste_from_clipboard = true, auto_apply_diff_after_generation = false, minimize_diff = true, }, + suggestion = { + debounce = 200, + throttle = 200, + }, windows = { position = "right", wrap = true,