diff --git a/disks/root.nix b/disks/root.nix index c622b97..2f0f3c1 100644 --- a/disks/root.nix +++ b/disks/root.nix @@ -9,7 +9,6 @@ partitions = [ # Boot partition { - type = "partition"; name = "ESP"; start = "0"; end = "512MiB"; @@ -24,7 +23,6 @@ } # Root partition ext4 { - type = "partition"; name = "root"; start = "512MiB"; end = "100%"; diff --git a/flake.lock b/flake.lock index efe4c2c..8a45701 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "bufferline-nvim-src": { "flake": false, "locked": { - "lastModified": 1681547098, - "narHash": "sha256-WZAJiDm77rS9S4tN7dz03jjnv1jFvTur6dLg8OkYVM4=", + "lastModified": 1682348289, + "narHash": "sha256-Iz3z59H6Zj1sydoHShWtbPT40HkyIe+tq50NezI+Qyg=", "owner": "akinsho", "repo": "bufferline.nvim", - "rev": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf", + "rev": "a4bd44523316928a7c4a5c09a3407d02c30b6027", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1681154394, - "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", + "lastModified": 1682009832, + "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", + "rev": "a1ee4d333b092bc055655fb06229eb3013755812", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1681674661, - "narHash": "sha256-UNaleEsACF/AZt2XKdml4OdbXOnnsDfvWAs6ojvG+VA=", + "lastModified": 1682299489, + "narHash": "sha256-bqHo0/82KB+IyBMyjBd6QdyZWJl/YZeGggjBsAgRFlY=", "owner": "nix-community", "repo": "disko", - "rev": "ba53a0433d1694b96c63ea67db0f3e1292bb2b01", + "rev": "8ab9e5609929379ab15f03fd3bdc1f85419e5a3a", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1681519700, - "narHash": "sha256-w8rrVHfZcbmLGtHC3INwz4qOZSGP9aTisWydoQX9itw=", + "lastModified": 1682556573, + "narHash": "sha256-n0My2cA3nsP4Df8Bnje1SJyQfm3ZXLQZltRZXdXvHmc=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "1430cdc0fed3a77bb113516805805d631275ef68", + "rev": "c36e24b480db582477e9a355a1fc115acbc35aa1", "type": "github" }, "original": { @@ -124,12 +124,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -139,12 +142,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -175,11 +181,11 @@ ] }, "locked": { - "lastModified": 1681685177, - "narHash": "sha256-dpwwLJxMj7iPFWVnVE6kkv2OnDmZtJCtibZW6N9xzfU=", + "lastModified": 1682535786, + "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1d0ee37c315537cdcadbcf0f773694e9da0605d", + "rev": "d82c9af8175878a461a0fdf914e67cc446664570", "type": "github" }, "original": { @@ -217,11 +223,11 @@ ] }, "locked": { - "lastModified": 1673891598, - "narHash": "sha256-EevceKxQtA+I0XVA8tBGKmYV1V1KbWc3gsswysMzeDk=", + "lastModified": 1682346855, + "narHash": "sha256-Q1+02NaOyIywqKg/hhdB80yfEBZW8CWA9IDBDyLhEf0=", "owner": "gytis-ivaskevicius", "repo": "nix2vim", - "rev": "5b31eb81e2c6c74f9e8a4911660f3bf585d55158", + "rev": "4b8dfdc3434e8fd1ecf08eed9228ab02560eff4c", "type": "github" }, "original": { @@ -253,11 +259,11 @@ ] }, "locked": { - "lastModified": 1681464810, - "narHash": "sha256-G7AD9qMvD7lU+5K7tTZpUMXvQa0kFR5KKY9y/okcX+w=", + "lastModified": 1682332772, + "narHash": "sha256-GMoWhChQdeNM2FFqVbEZgBABSdi/+JgSP6v+jUz5b24=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "5ad9f98194cfe7aa990929fb8cae28c500da7620", + "rev": "d774aeedc0685e5871be1e1ee0511900deeb21c2", "type": "github" }, "original": { @@ -284,11 +290,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680487167, - "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", + "lastModified": 1682018913, + "narHash": "sha256-Eo2ZkWB8+qy8fnmxtJUNJl6HHYYAgXDR29+OwDIzm1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53dad94e874c9586e71decf82d972dfb640ef044", + "rev": "7048a48bc79b4361f77740420000d2b5454b0df7", "type": "github" }, "original": { @@ -300,11 +306,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1681737997, - "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=", + "lastModified": 1682453498, + "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f00994e78cd39e6fc966f0c4103f908e63284780", + "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "type": "github" }, "original": { @@ -333,11 +339,11 @@ "null-ls-nvim-src": { "flake": false, "locked": { - "lastModified": 1681223720, - "narHash": "sha256-L3inC3YpiNdFdArqHdqR0n7g//moTvLYybQafFgkbDE=", + "lastModified": 1682519403, + "narHash": "sha256-cwpfhYcoD+biMgyAXkf9gE89yRSQnNyAowIeuyUKqmI=", "owner": "jose-elias-alvarez", "repo": "null-ls.nvim", - "rev": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed", + "rev": "33b853a3933eed3137cd055aac4e539e69832ad0", "type": "github" }, "original": { @@ -348,11 +354,11 @@ }, "nur": { "locked": { - "lastModified": 1681682097, - "narHash": "sha256-mglDzwLQ4keRWQ0yth3bE//Uw3Ucztewe9zCCAwW13A=", + "lastModified": 1682558081, + "narHash": "sha256-dzez8eBDMVs9GhC5bAKm6avCxWRZmXLzHuv1U8nNVJQ=", "owner": "nix-community", "repo": "nur", - "rev": "6cf9a90c6991f17dc212fa79a6063551c973aa70", + "rev": "4ac53a1d6c73f1b326256da444bfbac53c317d76", "type": "github" }, "original": { @@ -364,11 +370,11 @@ "nvim-lspconfig-src": { "flake": false, "locked": { - "lastModified": 1681647398, - "narHash": "sha256-jrVzwC9nO2gLmIKQ9gTRW/fsXc4ad7/rR917Krmv874=", + "lastModified": 1682559850, + "narHash": "sha256-i2dhqrPHtegZHwTHCnvpkpwkGSo/Mn5UtGI8ynyO8jg=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0", + "rev": "427378a03ffc1e1bc023275583a49b1993e524d0", "type": "github" }, "original": { @@ -380,11 +386,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1681624690, - "narHash": "sha256-kLvRB1w4wHGOOWj4fQ6pyhvKJ4+mqOkhYe04uicfHmA=", + "lastModified": 1682305439, + "narHash": "sha256-vSe1QUwfI+GbOsnY31PywsePuxvfK7sNR4BERKo8+iI=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "8f392fa763b7ee80a48c714b630acaf6d1fe1854", + "rev": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3", "type": "github" }, "original": { @@ -447,11 +453,11 @@ ] }, "locked": { - "lastModified": 1680488274, - "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", + "lastModified": 1682043560, + "narHash": "sha256-ZsF4Yee9pQbvLtwSVGgYux+az4yFSLXrxPyGHm3ptJM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", + "rev": "48037a6f8faeee138ede96bf607bc95c9dab9aec", "type": "github" }, "original": { @@ -460,14 +466,44 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "telescope-nvim-src": { "flake": false, "locked": { - "lastModified": 1681122231, - "narHash": "sha256-UMidzUf2nhG577Minzm3QYu0ZNPoK/rXEyUdvZ/5nFw=", + "lastModified": 1682482973, + "narHash": "sha256-K3jhTlB9Win94oLMXTB4WGl5QY9mE8YrFtLudHlhKj0=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "6258d50b09f9ae087317e392efe7c05a7323492d", + "rev": "713d26b98583b160b50fb827adb751f768238ed3", "type": "github" }, "original": { @@ -495,11 +531,11 @@ "toggleterm-nvim-src": { "flake": false, "locked": { - "lastModified": 1681296186, - "narHash": "sha256-y8CvzzW4ezqdnSzeon39KVN1JEU+9SSJ78n51A5XHVQ=", + "lastModified": 1682361318, + "narHash": "sha256-G5W1XN5mXnrx3TR8/0H8nHmO6o38z9i+ZkrTz22HlxI=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "1c5996ee3c30b54751093fe68d40676859e7778f", + "rev": "68fdf851c2b7901a7065ff129b77d3483419ddce", "type": "github" }, "original": { diff --git a/modules/common/neovim/config/tree.nix b/modules/common/neovim/config/tree.nix index 69f9aff..60825c6 100644 --- a/modules/common/neovim/config/tree.nix +++ b/modules/common/neovim/config/tree.nix @@ -43,30 +43,25 @@ }; }; }; + on_attach = dsl.rawLua '' + function (bufnr) + local api = require('nvim-tree.api') + local function opts(desc) + return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } + end + api.config.mappings.default_on_attach(bufnr) + + vim.keymap.set('n', 'l', api.node.open.edit, opts('Open')) + vim.keymap.set('n', '', api.node.open.edit, opts('Open')) + vim.keymap.set('n', 'o', api.node.open.edit, opts('Open')) + vim.keymap.set('n', 'h', api.node.navigate.parent_close, opts('Close Directory')) + vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split')) + end + ''; view = { width = 30; hide_root_folder = false; side = "left"; - mappings = { - custom_only = false; - list = [ - { - key = [ "l" "" "o" ]; - cb = dsl.rawLua - "require('nvim-tree.config').nvim_tree_callback('edit')"; - } - { - key = "h"; - cb = dsl.rawLua - "require('nvim-tree.config').nvim_tree_callback('close_node')"; - } - { - key = "v"; - cb = dsl.rawLua - "require('nvim-tree.config').nvim_tree_callback('vsplit')"; - } - ]; - }; number = false; relativenumber = false; };