diff --git a/flake.lock b/flake.lock index dba772b..2c7fefd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736349844, - "narHash": "sha256-jpmKC8zNcFMt9ATsju2mryBuimIm+bR7HETCp0Rxd3s=", + "lastModified": 1737120639, + "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcc4259cdbcb76138b48ed36b4f41c521910db0d", + "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1736085891, - "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", + "lastModified": 1737085297, + "narHash": "sha256-0gpgsX7hCauT6pblVg+hrDnt83lPoYzq/2BqqyvU8Tc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", + "rev": "09414c7e2def24a5c52e588017b8524bcb68972a", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736241350, - "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736344604, - "narHash": "sha256-sKX29IV8KxIAAEbTi2tsgVKjovHbwZoFnNE7wb22d6k=", + "lastModified": 1737116815, + "narHash": "sha256-eQh4gikqS2AX1QP4JK48fY1hxO42nqbpiI+PKxf5jrg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4dbf4eca6ae8b69d71dcb43295c57bbb2542bb7c", + "rev": "7b12d41769470b1483c04ee8a67b75c0c302c42f", "type": "github" }, "original": { diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix index e7b1a32..a31c5b2 100644 --- a/hosts/mba/nix.nix +++ b/hosts/mba/nix.nix @@ -24,6 +24,6 @@ # https://github.com/NixOS/nix/issues/7273 nix.settings = { - auto-optimise-store = false; + auto-optimise-store = false; }; } diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/carbonfox.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/carbonfox.lua deleted file mode 100644 index fddb173..0000000 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/carbonfox.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - -- "EdenEast/nightfox.nvim", - -- lazy = false, - -- priority = 1000, - -- init = function() - -- require("nightfox").setup { - -- transparent_background = true, - -- } - -- vim.cmd.colorscheme "carbonfox" - -- - -- vim.cmd.hi "Comment gui=none" - -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - -- vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) - -- - -- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - -- border = "rounded", - -- }) - -- - -- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - -- border = "rounded", - -- }) - -- - -- vim.diagnostic.config { - -- float = { border = "rounded" }, - -- } - -- end, -} diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua index dbee734..f6f0489 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/conform.lua @@ -12,7 +12,7 @@ return { formatters_by_ft = { c = { "clang-format" }, css = { "prettier" }, - go = { "gofumpt", "goimports_reviser" }, + go = { "gofumpt", "goimports-reviser" }, html = { "prettier" }, lua = { "stylua" }, typescript = { "prettier" }, diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/dadbod.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/dadbod.lua deleted file mode 100644 index e683c47..0000000 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/dadbod.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "tpope/vim-dadbod", - "kristijanhusak/vim-dadbod-completion", - "kristijanhusak/vim-dadbod-ui", -} diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua index 212c275..6eb43bc 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/debug.lua @@ -16,7 +16,6 @@ return { -- GO DEBUG "leoluz/nvim-dap-go", - "mfussenegger/nvim-dap-python", }, config = function() local dap = require "dap" @@ -56,6 +55,7 @@ return { }, } + -- the very common keybind `db` overlaps with some other keybind vim.keymap.set("n", "dt", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" }) vim.keymap.set("n", "?", function() @@ -84,6 +84,5 @@ return { end require("dap-go").setup() - require("dap-python").setup "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python" end, } diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua index 1dbc117..5986307 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lint.lua @@ -6,7 +6,7 @@ return { local lint = require "lint" lint.linters_by_ft = { - python = { "ruff", "mypy" }, + -- python = { "ruff", "mypy" }, dockerfile = { "hadolint" }, json = { "jsonlint" }, markdown = { "vale" }, diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua index 9fbe15b..288032c 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/lsp.lua @@ -67,9 +67,9 @@ return { "goimports-reviser", "hadolint", "jsonlint", - "mypy", + -- "mypy", "prettier", - "ruff", + -- "ruff", "stylua", "vale", }) @@ -131,7 +131,7 @@ return { -- Execute a code action, usually your cursor needs to be on top of an error -- or a suggestion from your LSP for this to activate. - map("ca", vim.lsp.buf.code_action, "[C]ode [A]ction") + map(vim.lsp.buf.code_action, "[C]ode [A]ction", "ca") -- Opens a popup that displays documentation about the word under your cursor -- See `:help K` for why this keymap. diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua index 5ad63af..82720f9 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/mini.lua @@ -22,8 +22,8 @@ return { ---@diagnostic disable-next-line: duplicate-set-field statusline.active = function() local mode, mode_hl = statusline.section_mode { trunc_width = 120 } - local git = statusline.section_git {} - local diagnostics = statusline.section_diagnostics { trunc_width = 75 } + local git = statusline.section_git + local diagnostics = statusline.section_diagnostics local filename = statusline.section_filename { trunc_width = 140 } -- local fileinfo = statusline.section_fileinfo() local location = statusline.section_location() diff --git a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua index c03ec0f..9149f69 100644 --- a/pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua +++ b/pkgs/nvim-conf/nvim/lua/lilJ/plugins/treesitter.lua @@ -5,7 +5,7 @@ return { "nvim-treesitter/nvim-treesitter-textobjects", }, opts = { - ensure_installed = { "c", "go", "html", "lua", "python", "typescript", "tsx" }, + ensure_installed = { "go", "lua" }, auto_install = true, highlight = { enable = true,