diff --git a/flake.lock b/flake.lock index f7fd3a4..7354ca1 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1716258470, - "narHash": "sha256-66C/T8xSpKE1W/FFpW43Gw5GfiSiM+vttTbM3SkJlBQ=", + "lastModified": 1723134533, + "narHash": "sha256-YKp1IOBIt6StYpVZyTj3BMZM/+6Bp+galbFpuBKYeOM=", "owner": "lexical-lsp", "repo": "lexical", - "rev": "64ab159ff035346e66e4b7b26f52afb1120fc6a9", + "rev": "d6e1a734961a4e2b334b678de18a6701019915b6", "type": "github" }, "original": { @@ -78,11 +78,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712849433, - "narHash": "sha256-flQtf/ZPJgkLY/So3Fd+dGilw2DKIsiwgMEn7BbBHL0=", - "path": "/nix/store/3270z3wjyr53lr7w4sg9q1achj7sfrin-source", - "rev": "f173d0881eff3b21ebb29a2ef8bedbc106c86ea5", - "type": "path" + "lastModified": 1719931832, + "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0aeab749216e4c073cece5d34bc01b79e717c3e0", + "type": "github" }, "original": { "id": "nixpkgs", @@ -91,29 +92,23 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1716190602, - "narHash": "sha256-xYRimrR0duWvokWQEvB87bSsICeCvvX9DxpUOzCfsDE=", + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a5ac83292c7842072318f57d68a48474f8bd34d", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", "type": "github" }, "original": { diff --git a/nvim/init.lua b/nvim/init.lua index e7ea8b5..9224adf 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -75,6 +75,7 @@ vim.opt.shiftround = true vim.opt.shiftwidth = 4 vim.opt.softtabstop = 4 vim.opt.tabstop = 4 +vim.opt.splitkeep = "screen" require "my.keymaps" diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index e43ab37..021c7e2 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -44,4 +44,25 @@ return { require "mini.bufremove".setup() end }, + { + "yetone/avante.nvim", + event = "VeryLazy", + build = "make BUILD_FROM_SOURCE=true luajit", + opts = { + -- add any opts here + }, + dependencies = { + "stevearc/dressing.nvim", + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + --- The below is optional, make sure to setup it properly if you have lazy=true + { + 'MeanderingProgrammer/render-markdown.nvim', + opts = { + file_types = { "markdown", "Avante" }, + }, + ft = { "markdown", "Avante" }, + }, + }, + } } diff --git a/nvim/lua/plugins/theme.lua b/nvim/lua/plugins/theme.lua index 176a749..59b5f95 100644 --- a/nvim/lua/plugins/theme.lua +++ b/nvim/lua/plugins/theme.lua @@ -6,7 +6,7 @@ return { name = "catppuccin", opts = { flavour = "frappe", -- latte, frappe, macchiato, mocha - transparent_background = true, + transparent_background = false, -- dim_inactive = { -- enabled = true, -- shade = "dark",