diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2a95827 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +hosts/chmura/jacekpoz.pl/public/ +hosts/chmura/jacekpoz.pl/.hugo_build.lock diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d5b9759d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "hosts/chmura/jacekpoz.pl/themes/risotto"] + path = hosts/chmura/jacekpoz.pl/themes/risotto + url = https://github.com/jacekpoz/risotto.git diff --git a/flake.lock b/flake.lock index 9b415565..fdd48188 100644 --- a/flake.lock +++ b/flake.lock @@ -20,22 +20,6 @@ "type": "github" } }, - "alpha-nvim": { - "flake": false, - "locked": { - "lastModified": 1689470865, - "narHash": "sha256-wgjYus4XlJ0GoQWTo5gf7yyKYhseOXKOqUXEiwXpEJQ=", - "owner": "goolord", - "repo": "alpha-nvim", - "rev": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65", - "type": "github" - }, - "original": { - "owner": "goolord", - "repo": "alpha-nvim", - "type": "github" - } - }, "anyrun": { "inputs": { "flake-parts": "flake-parts", @@ -57,19 +41,26 @@ "type": "github" } }, - "bufdelete-nvim": { - "flake": false, + "beautysh": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "utils": "utils" + }, "locked": { - "lastModified": 1688027130, - "narHash": "sha256-UubYRfRAXZ89WOc3QFMvAMjNjLW6bV4nDgSa1CRZkIM=", - "owner": "famiu", - "repo": "bufdelete.nvim", - "rev": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4", + "lastModified": 1680308980, + "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", + "owner": "lovesegfault", + "repo": "beautysh", + "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", "type": "github" }, "original": { - "owner": "famiu", - "repo": "bufdelete.nvim", + "owner": "lovesegfault", + "repo": "beautysh", "type": "github" } }, @@ -89,198 +80,6 @@ "type": "github" } }, - "catppuccin": { - "flake": false, - "locked": { - "lastModified": 1690630440, - "narHash": "sha256-MSZcIrV3vvgb5mlMpO5uRlAYoENm2pZyuZbV5Q9Vg58=", - "owner": "catppuccin", - "repo": "nvim", - "rev": "057c34f849cf21059487d849e2f3b3efcd4ee0eb", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "nvim", - "type": "github" - } - }, - "ccc": { - "flake": false, - "locked": { - "lastModified": 1686587775, - "narHash": "sha256-T1ryyTdbU/335MpD184PSnBLgj4S2Kzf9hZnwc9to+I=", - "owner": "uga-rosa", - "repo": "ccc.nvim", - "rev": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6", - "type": "github" - }, - "original": { - "owner": "uga-rosa", - "repo": "ccc.nvim", - "type": "github" - } - }, - "cellular-automaton": { - "flake": false, - "locked": { - "lastModified": 1674679594, - "narHash": "sha256-h4KQCf8+GbxWSyZzDny07YFZm7j+aSSfm51lsaK0Ers=", - "owner": "Eandrju", - "repo": "cellular-automaton.nvim", - "rev": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f", - "type": "github" - }, - "original": { - "owner": "Eandrju", - "repo": "cellular-automaton.nvim", - "type": "github" - } - }, - "cheatsheet-nvim": { - "flake": false, - "locked": { - "lastModified": 1640255456, - "narHash": "sha256-TYkGB7cON2t4GwMaR9H1MDG2j3btBv2AR37ade8kqTY=", - "owner": "sudormrfbin", - "repo": "cheatsheet.nvim", - "rev": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef", - "type": "github" - }, - "original": { - "owner": "sudormrfbin", - "repo": "cheatsheet.nvim", - "type": "github" - } - }, - "cinnamon-nvim": { - "flake": false, - "locked": { - "lastModified": 1670143364, - "narHash": "sha256-JglXQhoPgN9sQ3yuv0+VQxmKMvoQTu5lbGLSRaQkytI=", - "owner": "declancm", - "repo": "cinnamon.nvim", - "rev": "c406ffda3a0302f32c23b24ab756ea20467d6578", - "type": "github" - }, - "original": { - "owner": "declancm", - "repo": "cinnamon.nvim", - "type": "github" - } - }, - "cmp-buffer": { - "flake": false, - "locked": { - "lastModified": 1660101488, - "narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=", - "owner": "hrsh7th", - "repo": "cmp-buffer", - "rev": "3022dbc9166796b644a841a02de8dd1cc1d311fa", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-buffer", - "type": "github" - } - }, - "cmp-nvim-lsp": { - "flake": false, - "locked": { - "lastModified": 1687494203, - "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=", - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "rev": "44b16d11215dce86f253ce0c30949813c0a90765", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-nvim-lsp", - "type": "github" - } - }, - "cmp-path": { - "flake": false, - "locked": { - "lastModified": 1664784283, - "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=", - "owner": "hrsh7th", - "repo": "cmp-path", - "rev": "91ff86cd9c29299a64f968ebb45846c485725f23", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-path", - "type": "github" - } - }, - "cmp-treesitter": { - "flake": false, - "locked": { - "lastModified": 1680745848, - "narHash": "sha256-WOcg6w4M20gpMCZjZ3DpPIA55SGLjV75fhckefiVfU0=", - "owner": "ray-x", - "repo": "cmp-treesitter", - "rev": "389eadd48c27aa6dc0e6b992644704f026802a2e", - "type": "github" - }, - "original": { - "owner": "ray-x", - "repo": "cmp-treesitter", - "type": "github" - } - }, - "cmp-vsnip": { - "flake": false, - "locked": { - "lastModified": 1669100283, - "narHash": "sha256-2mkN03noOr5vBvRbSb35xZKorSH+8savQNZtgM9+QcM=", - "owner": "hrsh7th", - "repo": "cmp-vsnip", - "rev": "989a8a73c44e926199bfd05fa7a516d51f2d2752", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "cmp-vsnip", - "type": "github" - } - }, - "codewindow-nvim": { - "flake": false, - "locked": { - "lastModified": 1690128662, - "narHash": "sha256-7ntC06PhxfuKnGyXpiW4juP3fWR97DH3Gygwvscv3OY=", - "owner": "gorbit99", - "repo": "codewindow.nvim", - "rev": "11fb5520898d22a563fe6a124a61c0d2887f3d3f", - "type": "github" - }, - "original": { - "owner": "gorbit99", - "repo": "codewindow.nvim", - "type": "github" - } - }, - "comment-nvim": { - "flake": false, - "locked": { - "lastModified": 1686546603, - "narHash": "sha256-XM9yhp+SGxfAOdN/eDunzM0TMoCJhVth3wpFKNCGf3g=", - "owner": "numToStr", - "repo": "Comment.nvim", - "rev": "176e85eeb63f1a5970d6b88f1725039d85ca0055", - "type": "github" - }, - "original": { - "owner": "numToStr", - "repo": "Comment.nvim", - "type": "github" - } - }, "conduit": { "inputs": { "crane": "crane", @@ -303,38 +102,6 @@ "type": "gitlab" } }, - "copilot-cmp": { - "flake": false, - "locked": { - "lastModified": 1683831407, - "narHash": "sha256-+MzEGnhlrYRvAfskOwmw69OC1CsPXt7s3z+xPe9XPqs=", - "owner": "zbirenbaum", - "repo": "copilot-cmp", - "rev": "c2cdb3c0f5078b0619055af192295830a7987790", - "type": "github" - }, - "original": { - "owner": "zbirenbaum", - "repo": "copilot-cmp", - "type": "github" - } - }, - "copilot-lua": { - "flake": false, - "locked": { - "lastModified": 1688190439, - "narHash": "sha256-lD9FdbKKZ6d/BjIfqp0Ust2hqSYNLpCFWxuaKUO9qLs=", - "owner": "zbirenbaum", - "repo": "copilot.lua", - "rev": "e48bd7020a98be217d85c006a298656294fd6210", - "type": "github" - }, - "original": { - "owner": "zbirenbaum", - "repo": "copilot.lua", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -392,22 +159,6 @@ "type": "github" } }, - "crates-nvim": { - "flake": false, - "locked": { - "lastModified": 1688295570, - "narHash": "sha256-ah+fTmzkZn+xuL3sG2RxlCtDiFsRv3SY1iJzYKMIaMg=", - "owner": "Saecki", - "repo": "crates.nvim", - "rev": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319", - "type": "github" - }, - "original": { - "owner": "Saecki", - "repo": "crates.nvim", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -430,119 +181,6 @@ "type": "github" } }, - "dashboard-nvim": { - "flake": false, - "locked": { - "lastModified": 1690351087, - "narHash": "sha256-aVMugjgA9lnORUVDBpa8G800Ev86htP4hDGrBq6Sw6s=", - "owner": "glepnir", - "repo": "dashboard-nvim", - "rev": "c17d3210b3dec8798b4fc82a11c542989251f85d", - "type": "github" - }, - "original": { - "owner": "glepnir", - "repo": "dashboard-nvim", - "type": "github" - } - }, - "diffview-nvim": { - "flake": false, - "locked": { - "lastModified": 1689788060, - "narHash": "sha256-0tsgwI/qZm8Gj3NyN9CA+YHf3qim7vGXI+vbEcFBKbQ=", - "owner": "sindrets", - "repo": "diffview.nvim", - "rev": "e91110d2a7f8e2f667666aba6ea089ff823f8748", - "type": "github" - }, - "original": { - "owner": "sindrets", - "repo": "diffview.nvim", - "type": "github" - } - }, - "dirt-samples-src": { - "flake": false, - "locked": { - "lastModified": 1588278411, - "narHash": "sha256-h8vQxRym6QzNLOTZU7A43VCHuG0H77l+BFwXnC0L1CE=", - "owner": "tidalcycles", - "repo": "dirt-samples", - "rev": "66d432418c9a7d82cf049d9246adfa62f46df2a6", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "master", - "repo": "dirt-samples", - "type": "github" - } - }, - "dracula": { - "flake": false, - "locked": { - "lastModified": 1690594744, - "narHash": "sha256-gblqxRTphGBpEOx57/4oU/B50O0OguIm1bFtd4LXuQ4=", - "owner": "Mofiqul", - "repo": "dracula.nvim", - "rev": "9fe831e685a76e1a1898a694623b33247c4d036c", - "type": "github" - }, - "original": { - "owner": "Mofiqul", - "repo": "dracula.nvim", - "type": "github" - } - }, - "dressing-nvim": { - "flake": false, - "locked": { - "lastModified": 1690648598, - "narHash": "sha256-hndRErSXhX1BHM90nuhiZkgHwkclLEMv5vtF+GDzUP4=", - "owner": "stevearc", - "repo": "dressing.nvim", - "rev": "829bc80400651aea31b03d8fc9a99135512fe67a", - "type": "github" - }, - "original": { - "owner": "stevearc", - "repo": "dressing.nvim", - "type": "github" - } - }, - "elixir-ls": { - "flake": false, - "locked": { - "lastModified": 1690526097, - "narHash": "sha256-lR1xsOJhz0W/Z3E2EUWujpUvpgUkLLDr0E6Ao31zi8s=", - "owner": "elixir-lsp", - "repo": "elixir-ls", - "rev": "216ff0e2969c2bbe45d324c4d6a5f08e6b681f5e", - "type": "github" - }, - "original": { - "owner": "elixir-lsp", - "repo": "elixir-ls", - "type": "github" - } - }, - "elixir-tools": { - "flake": false, - "locked": { - "lastModified": 1690555653, - "narHash": "sha256-7wDEChXTUGp8ONT6jufIJp05vawzo4AXg35ELNLvysA=", - "owner": "elixir-tools", - "repo": "elixir-tools.nvim", - "rev": "883933b57c9150c71ad2b99a4080685d83e095b8", - "type": "github" - }, - "original": { - "owner": "elixir-tools", - "repo": "elixir-tools.nvim", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -573,11 +211,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1697178193, - "narHash": "sha256-LBDLUWlwSDPMA1Ui9wC9YcQEnJL0UP627RoUmtz4TTo=", + "lastModified": 1700806945, + "narHash": "sha256-mV25HkKFHDmjp+FEmneLYaRCB7wHOGuZlDFdHUCKAJI=", "owner": "nix-community", "repo": "fenix", - "rev": "ff6c27356cbde594e598e388a32d79ef79cbe1b1", + "rev": "7ab9ec16d364b564da3aa0e73887b0af133eef59", "type": "github" }, "original": { @@ -586,23 +224,6 @@ "type": "github" } }, - "fidget-nvim": { - "flake": false, - "locked": { - "lastModified": 1686378433, - "narHash": "sha256-N3O/AvsD6Ckd62kDEN4z/K5A3SZNR15DnQeZhH6/Rr0=", - "owner": "j-hui", - "repo": "fidget.nvim", - "rev": "90c22e47be057562ee9566bad313ad42d622c1d3", - "type": "github" - }, - "original": { - "owner": "j-hui", - "ref": "legacy", - "repo": "fidget.nvim", - "type": "github" - } - }, "firefox-nightly": { "inputs": { "cachix": "cachix", @@ -614,11 +235,11 @@ ] }, "locked": { - "lastModified": 1697221741, - "narHash": "sha256-KCSUsOGr0N2DSprwLoOOExLI4Pqg2FPP7J3MzfpKexQ=", + "lastModified": 1700842988, + "narHash": "sha256-8quSprmWXYxMDhioKZZDGT6kPnfvXbglDQ62KtpiINQ=", "owner": "colemickens", "repo": "flake-firefox-nightly", - "rev": "9f7e5bcf3c7567d21f2ec912c7a0ffb87da370a3", + "rev": "cc0e03aa0fbca12a45fa8d4278aaf96676b69fd4", "type": "github" }, "original": { @@ -675,22 +296,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -706,7 +311,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -721,6 +326,22 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_7": { "flake": false, "locked": { @@ -758,59 +379,19 @@ "type": "github" } }, - "flake-parts_10": { - "inputs": { - "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_11": { - "inputs": { - "nixpkgs-lib": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -823,6 +404,7 @@ "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", + "hercules-ci-effects", "nixpkgs" ] }, @@ -834,44 +416,39 @@ "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, "original": { "id": "flake-parts", "type": "indirect" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1698579227, + "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "f76e870d64779109e41370848074ac4eaa1606ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -882,14 +459,17 @@ }, "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": [ + "nixpak", + "nixpkgs" + ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -900,14 +480,18 @@ }, "flake-parts_7": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -919,7 +503,7 @@ "flake-parts_8": { "inputs": { "nixpkgs-lib": [ - "nixpak", + "schizofox", "nixpkgs" ] }, @@ -937,29 +521,6 @@ "type": "github" } }, - "flake-parts_9": { - "inputs": { - "nixpkgs-lib": [ - "nixpak", - "hercules-ci-effects", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -1018,39 +579,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -1065,9 +593,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1694529238, @@ -1083,99 +611,61 @@ "type": "github" } }, - "flutter-tools": { - "flake": false, + "flake-utils_6": { + "inputs": { + "systems": "systems_7" + }, "locked": { - "lastModified": 1690188839, - "narHash": "sha256-h8s5g6KU7dMesDqiwzv2MmUGk6jlU5lBnuVA3LaoI1g=", - "owner": "akinsho", - "repo": "flutter-tools.nvim", - "rev": "561d85b16d8ca2938820a9c26b2fe74096d89c81", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { - "owner": "akinsho", - "repo": "flutter-tools.nvim", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "gesture-nvim": { - "flake": false, + "flake-utils_7": { + "inputs": { + "systems": "systems_8" + }, "locked": { - "lastModified": 1687655077, - "narHash": "sha256-ps/dAKIga2ZVunwj+KU/Iej4PGZbBvm5ZzcK30EiKMc=", - "owner": "notomo", - "repo": "gesture.nvim", - "rev": "aa273e7982943ac6ccf6b864f3fd40ad287a9fe2", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { - "owner": "notomo", - "repo": "gesture.nvim", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "gitsigns-nvim": { - "flake": false, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixvim", + "pre-commit-hooks", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1690463120, - "narHash": "sha256-kraK0GP5aLGbh1eVZCm41D6BztjFxthSXGnE5CxhrZs=", - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "rev": "5d73da785a3c05fd63ac31769079db05169a6ec7", + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "type": "github" }, "original": { - "owner": "lewis6991", - "repo": "gitsigns.nvim", - "type": "github" - } - }, - "glow-nvim": { - "flake": false, - "locked": { - "lastModified": 1690579937, - "narHash": "sha256-ZDlQfSJHq9CbOpTDgmIoMq4gDzHxoUslFfN5XKtrDtM=", - "owner": "ellisonleao", - "repo": "glow.nvim", - "rev": "8942dfb05794f436af4fbc90a34393f1fd36f361", - "type": "github" - }, - "original": { - "owner": "ellisonleao", - "repo": "glow.nvim", - "type": "github" - } - }, - "haskell-flake": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", - "type": "github" - } - }, - "haskell-flake_2": { - "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.3.0", - "repo": "haskell-flake", + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, @@ -1187,11 +677,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1697209736, - "narHash": "sha256-EBliRkJjZ4AP1CnRRyWXbIS8WFyKD+0SmQgql5b6lTg=", + "lastModified": 1700676250, + "narHash": "sha256-08aSqFjN/TR82M6dkRPYMwemRHzvZ5qShTam8ltpfQE=", "owner": "helix-editor", "repo": "helix", - "rev": "9f6e9a151228c3c95cddb9032849625883d2ac8a", + "rev": "090ed97e0045bfad1e5bff8b96c61707b996b85a", "type": "github" }, "original": { @@ -1200,59 +690,20 @@ "type": "github" } }, - "hercules-ci-agent": { - "inputs": { - "flake-parts": "flake-parts_5", - "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1688568579, - "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, - "hercules-ci-agent_2": { - "inputs": { - "flake-parts": "flake-parts_9", - "haskell-flake": "haskell-flake_2", - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1688568579, - "narHash": "sha256-ON0M56wtY/TIIGPkXDlJboAmuYwc73Hi8X9iJGtxOhM=", - "owner": "hercules-ci", - "repo": "hercules-ci-agent", - "rev": "367dd8cd649b57009a6502e878005a1e54ad78c5", - "type": "github" - }, - "original": { - "id": "hercules-ci-agent", - "type": "indirect" - } - }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", - "hercules-ci-agent": "hercules-ci-agent", + "flake-parts": "flake-parts_3", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1697031886, - "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=", + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", "type": "github" }, "original": { @@ -1267,18 +718,17 @@ "nixpak", "flake-parts" ], - "hercules-ci-agent": "hercules-ci-agent_2", "nixpkgs": [ "nixpak", "nixpkgs" ] }, "locked": { - "lastModified": 1697031886, - "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=", + "lastModified": 1699381651, + "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3", + "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", "type": "github" }, "original": { @@ -1315,11 +765,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1700847865, + "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "type": "github" }, "original": { @@ -1336,11 +786,11 @@ ] }, "locked": { - "lastModified": 1696446489, - "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", + "lastModified": 1697662575, + "narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=", "owner": "nix-community", "repo": "home-manager", - "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", + "rev": "3433206e51766b4164dad368a81325efbf343fbe", "type": "github" }, "original": { @@ -1349,32 +799,16 @@ "type": "github" } }, - "hop-nvim": { - "flake": false, - "locked": { - "lastModified": 1684332066, - "narHash": "sha256-xdjFbdp0+S3pVdwcOFmad8PMUU033WeDzswOSdxSQjg=", - "owner": "phaazon", - "repo": "hop.nvim", - "rev": "03f0434869f1f38868618198b5f4f2ab6d39aef2", - "type": "github" - }, - "original": { - "owner": "phaazon", - "repo": "hop.nvim", - "type": "github" - } - }, "hyprcontrib": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1696339530, - "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=", + "lastModified": 1700499713, + "narHash": "sha256-1+0EXzRXcHn3Zqy8+kdcHClDJR181sqGBRp0xVoedEA=", "owner": "hyprwm", "repo": "contrib", - "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542", + "rev": "11bbb96e44818f67e5259c1788231f30fe5fe2e7", "type": "github" }, "original": { @@ -1392,11 +826,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1697151905, - "narHash": "sha256-sfuiRn7D5D2NzDkXXN/DUUcs2d1ddlf3VmzDBzDO2Tk=", + "lastModified": 1700862359, + "narHash": "sha256-gNtAZ9m5gTT0C/HTiqAVGQ2MPH+TBoIKBvROPJvlHWQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3a61350286de842c7f1566c38e2b42821080ddf4", + "rev": "745b998587fc39db6e3f77caa54074da618cd509", "type": "github" }, "original": { @@ -1412,11 +846,11 @@ ] }, "locked": { - "lastModified": 1696973054, - "narHash": "sha256-jdJ9bgw1p7w6bkfSdGPtWBvjNoxm+Mohb2mSgT7d8CY=", + "lastModified": 1700860454, + "narHash": "sha256-UMxvkBykixT5corPSdTEv03imFvYhdADdZ7YPYbUwWQ=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "aa3517bec58c1d572c7f54deeed7f004fe52bdba", + "rev": "8d5c2f60c880f21851526b303fb254a3cd4c1fb0", "type": "github" }, "original": { @@ -1475,81 +909,17 @@ "type": "github" } }, - "icon-picker-nvim": { - "flake": false, - "locked": { - "lastModified": 1683205244, - "narHash": "sha256-/oi2Kj7GDXzN3ccPoxyxXtQTYSxtZndgELZa2XgZ3U8=", - "owner": "ziontee113", - "repo": "icon-picker.nvim", - "rev": "e6dca182518eeb7a51470c13605a5bce08a816e4", - "type": "github" - }, - "original": { - "owner": "ziontee113", - "repo": "icon-picker.nvim", - "type": "github" - } - }, - "indent-blankline": { - "flake": false, - "locked": { - "lastModified": 1688727830, - "narHash": "sha256-efMRkxjbr6o7kSKAEn0Kaw8lsDubRmc1N0Kd1BZ3A7k=", - "owner": "lukas-reineke", - "repo": "indent-blankline.nvim", - "rev": "4541d690816cb99a7fc248f1486aa87f3abce91c", - "type": "github" - }, - "original": { - "owner": "lukas-reineke", - "repo": "indent-blankline.nvim", - "type": "github" - } - }, - "kommentary": { - "flake": false, - "locked": { - "lastModified": 1672983049, - "narHash": "sha256-N4n5tjNB1yX/QxH+t5aG0VxNwZhUJejv0b5V62WEKDU=", - "owner": "b3nj5m1n", - "repo": "kommentary", - "rev": "3a80117148c6798972bb69414423311ab151d368", - "type": "github" - }, - "original": { - "owner": "b3nj5m1n", - "repo": "kommentary", - "type": "github" - } - }, - "leap-nvim": { - "flake": false, - "locked": { - "lastModified": 1690120911, - "narHash": "sha256-9GFZ5CuR92kFGwh/ouqSSp14eOLZLpzpoFTEuYL7biQ=", - "owner": "ggandor", - "repo": "leap.nvim", - "rev": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c", - "type": "github" - }, - "original": { - "owner": "ggandor", - "repo": "leap.nvim", - "type": "github" - } - }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1696766909, - "narHash": "sha256-lU1BmCWpQ9cx64YnJKc89lMg9cx4pCokXIbh5J//2t0=", + "lastModified": 1700395747, + "narHash": "sha256-pzLYZGK34vhAFfyAJjcZYX3BK0Ap/QY/rd8B6Q30tHo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "9f495e4feea66426589cbb59ac8b972993b5d872", + "rev": "474538707da35589543af5a1c8c31f9978841add", "type": "github" }, "original": { @@ -1560,15 +930,15 @@ }, "lib-aggregate_2": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs-lib": "nixpkgs-lib_6" + "flake-utils": "flake-utils_5", + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1696766909, - "narHash": "sha256-lU1BmCWpQ9cx64YnJKc89lMg9cx4pCokXIbh5J//2t0=", + "lastModified": 1700395747, + "narHash": "sha256-pzLYZGK34vhAFfyAJjcZYX3BK0Ap/QY/rd8B6Q30tHo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "9f495e4feea66426589cbb59ac8b972993b5d872", + "rev": "474538707da35589543af5a1c8c31f9978841add", "type": "github" }, "original": { @@ -1577,134 +947,6 @@ "type": "github" } }, - "lsp-lines": { - "flake": false, - "locked": { - "lastModified": 1684163755, - "narHash": "sha256-Zhf2xitLWtE+dWqhvWtLM1K1WdtBvkqqoRLSYIO42oY=", - "owner": "~whynothugo", - "repo": "lsp_lines.nvim", - "rev": "f53af96d4789eef39a082dbcce078d2bfc384ece", - "type": "sourcehut" - }, - "original": { - "owner": "~whynothugo", - "repo": "lsp_lines.nvim", - "type": "sourcehut" - } - }, - "lsp-signature": { - "flake": false, - "locked": { - "lastModified": 1690267930, - "narHash": "sha256-qvcs0KuO2/NdtiTZIxJ2vrwV0I5PjzjMvoAePPasaJM=", - "owner": "ray-x", - "repo": "lsp_signature.nvim", - "rev": "58d4e810801da74c29313da86075d6aea537501f", - "type": "github" - }, - "original": { - "owner": "ray-x", - "repo": "lsp_signature.nvim", - "type": "github" - } - }, - "lspkind": { - "flake": false, - "locked": { - "lastModified": 1683275543, - "narHash": "sha256-S+qZm51hw/cRujIfHV/1x1fYyCKI4XQ0utSL8uy4l6I=", - "owner": "onsails", - "repo": "lspkind-nvim", - "rev": "57610d5ab560c073c465d6faf0c19f200cb67e6e", - "type": "github" - }, - "original": { - "owner": "onsails", - "repo": "lspkind-nvim", - "type": "github" - } - }, - "lspsaga": { - "flake": false, - "locked": { - "lastModified": 1670360222, - "narHash": "sha256-7ENInq3LAPPTdm0Fb7klOc630j8m4LRj1kLZZFYLh68=", - "owner": "tami5", - "repo": "lspsaga.nvim", - "rev": "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81", - "type": "github" - }, - "original": { - "owner": "tami5", - "repo": "lspsaga.nvim", - "type": "github" - } - }, - "lualine": { - "flake": false, - "locked": { - "lastModified": 1683213422, - "narHash": "sha256-ltHE8UIquGo07BSlFGM1l3wmTNN43i8kx6QY7Fj2CNo=", - "owner": "hoob3rt", - "repo": "lualine.nvim", - "rev": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9", - "type": "github" - }, - "original": { - "owner": "hoob3rt", - "repo": "lualine.nvim", - "type": "github" - } - }, - "mind-nvim": { - "flake": false, - "locked": { - "lastModified": 1679526071, - "narHash": "sha256-JIhAhQYGLLRucwlhzfckQYU5qjqbHtNH52JlGS5a79w=", - "owner": "phaazon", - "repo": "mind.nvim", - "rev": "002137dd7cf97865ebd01b6a260209d2daf2da66", - "type": "github" - }, - "original": { - "owner": "phaazon", - "repo": "mind.nvim", - "type": "github" - } - }, - "minimap-vim": { - "flake": false, - "locked": { - "lastModified": 1690301768, - "narHash": "sha256-yRWZH9caSxrWjUXlM84fU90tZjNfX97m0m491ZsIHxA=", - "owner": "wfxr", - "repo": "minimap.vim", - "rev": "74573b63b9ef0583262b6bf6ef209eb7f3b06b94", - "type": "github" - }, - "original": { - "owner": "wfxr", - "repo": "minimap.vim", - "type": "github" - } - }, - "modes-nvim": { - "flake": false, - "locked": { - "lastModified": 1682778003, - "narHash": "sha256-qrGgraBdAvIc6AXqMMWESlOV29lM5zC1du1r5L2kpQQ=", - "owner": "mvllow", - "repo": "modes.nvim", - "rev": "4d97a51ebbdb649b85f6d79da0009fddd7081a6b", - "type": "github" - }, - "original": { - "owner": "mvllow", - "repo": "modes.nvim", - "type": "github" - } - }, "mozilla": { "flake": false, "locked": { @@ -1722,28 +964,6 @@ } }, "naersk": { - "inputs": { - "nixpkgs": [ - "neovim-flake", - "rnix-lsp", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", - "owner": "nix-community", - "repo": "naersk", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { "inputs": { "nixpkgs": [ "shadower", @@ -1764,143 +984,9 @@ "type": "github" } }, - "neodev-nvim": { - "flake": false, - "locked": { - "lastModified": 1695449121, - "narHash": "sha256-WisbNLKEz0IgO7gLDA2quNzK69hJaHzmvWkZSUPQb6k=", - "owner": "folke", - "repo": "neodev.nvim", - "rev": "c8e126393a34939fb448d48eeddb510971739e3a", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "neodev.nvim", - "type": "github" - } - }, "neovim-flake": { "inputs": { - "alpha-nvim": "alpha-nvim", - "bufdelete-nvim": "bufdelete-nvim", - "catppuccin": "catppuccin", - "ccc": "ccc", - "cellular-automaton": "cellular-automaton", - "cheatsheet-nvim": "cheatsheet-nvim", - "cinnamon-nvim": "cinnamon-nvim", - "cmp-buffer": "cmp-buffer", - "cmp-nvim-lsp": "cmp-nvim-lsp", - "cmp-path": "cmp-path", - "cmp-treesitter": "cmp-treesitter", - "cmp-vsnip": "cmp-vsnip", - "codewindow-nvim": "codewindow-nvim", - "comment-nvim": "comment-nvim", - "copilot-cmp": "copilot-cmp", - "copilot-lua": "copilot-lua", - "crates-nvim": "crates-nvim", - "dashboard-nvim": "dashboard-nvim", - "diffview-nvim": "diffview-nvim", - "dracula": "dracula", - "dressing-nvim": "dressing-nvim", - "elixir-ls": "elixir-ls", - "elixir-tools": "elixir-tools", - "fidget-nvim": "fidget-nvim", - "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_4", - "flutter-tools": "flutter-tools", - "gesture-nvim": "gesture-nvim", - "gitsigns-nvim": "gitsigns-nvim", - "glow-nvim": "glow-nvim", - "hop-nvim": "hop-nvim", - "icon-picker-nvim": "icon-picker-nvim", - "indent-blankline": "indent-blankline", - "kommentary": "kommentary", - "leap-nvim": "leap-nvim", - "lsp-lines": "lsp-lines", - "lsp-signature": "lsp-signature", - "lspkind": "lspkind", - "lspsaga": "lspsaga", - "lualine": "lualine", - "mind-nvim": "mind-nvim", - "minimap-vim": "minimap-vim", - "modes-nvim": "modes-nvim", - "neodev-nvim": "neodev-nvim", - "nil": "nil", - "nixpkgs": [ - "nixpkgs" - ], - "nmd": "nmd", - "noice-nvim": "noice-nvim", - "nui-nvim": "nui-nvim", - "null-ls": "null-ls", - "nvim-autopairs": "nvim-autopairs", - "nvim-bufferline-lua": "nvim-bufferline-lua", - "nvim-cmp": "nvim-cmp", - "nvim-code-action-menu": "nvim-code-action-menu", - "nvim-colorizer-lua": "nvim-colorizer-lua", - "nvim-compe": "nvim-compe", - "nvim-cursorline": "nvim-cursorline", - "nvim-dap": "nvim-dap", - "nvim-dap-ui": "nvim-dap-ui", - "nvim-lightbulb": "nvim-lightbulb", - "nvim-lspconfig": "nvim-lspconfig", - "nvim-navbuddy": "nvim-navbuddy", - "nvim-navic": "nvim-navic", - "nvim-neoclip": "nvim-neoclip", - "nvim-notify": "nvim-notify", - "nvim-session-manager": "nvim-session-manager", - "nvim-surround": "nvim-surround", - "nvim-tree-lua": "nvim-tree-lua", - "nvim-treesitter-context": "nvim-treesitter-context", - "nvim-ts-autotag": "nvim-ts-autotag", - "nvim-web-devicons": "nvim-web-devicons", - "obsidian-nvim": "obsidian-nvim", - "onedark": "onedark", - "orgmode-nvim": "orgmode-nvim", - "plenary-nvim": "plenary-nvim", - "presence-nvim": "presence-nvim", - "project-nvim": "project-nvim", - "registers": "registers", - "rnix-lsp": "rnix-lsp", - "rust-tools": "rust-tools", - "scrollbar-nvim": "scrollbar-nvim", - "smartcolumn": "smartcolumn", - "sqls-nvim": "sqls-nvim", - "systems": "systems_6", - "tabular": "tabular", - "telescope": "telescope", - "tidalcycles": "tidalcycles", - "todo-comments": "todo-comments", - "toggleterm-nvim": "toggleterm-nvim", - "tokyonight": "tokyonight", - "trouble": "trouble", - "vim-dirtytalk": "vim-dirtytalk", - "vim-illuminate": "vim-illuminate", - "vim-markdown": "vim-markdown", - "vim-repeat": "vim-repeat", - "vim-startify": "vim-startify", - "vim-vsnip": "vim-vsnip", - "which-key": "which-key", - "zig": "zig" - }, - "locked": { - "lastModified": 1697046997, - "narHash": "sha256-lHamAPibqMoDP6MyHqSyXDrofUOi87ZGT5zcmznGR+g=", - "owner": "NotAShelf", - "repo": "neovim-flake", - "rev": "767b5ec48a25f05d61869867887f0e48b91c1956", - "type": "github" - }, - "original": { - "owner": "NotAShelf", - "repo": "neovim-flake", - "type": "github" - } - }, - "neovim-flake_2": { - "inputs": { - "flake-utils": "flake-utils_6", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -1908,11 +994,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1697153265, - "narHash": "sha256-ZE2ViIiNqqsu72vd/VLx+sB0hWbUZtdUG4gb5UPjmtw=", + "lastModified": 1700415469, + "narHash": "sha256-uRdcRPnOkaL/rk3c/u2zUV6hPDoaplWAbJ6ajlhHdaw=", "owner": "neovim", "repo": "neovim", - "rev": "ebe489d8f0edbb3538a59733289d8969d1ffea22", + "rev": "7ca2d64e8bbfb73f33cf82a2f9c03808bfea3d95", "type": "github" }, "original": { @@ -1924,18 +1010,18 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_3", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake_2", - "nixpkgs": "nixpkgs_10" + "neovim-flake": "neovim-flake", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1697155251, - "narHash": "sha256-gKNcjjGOSt6VnUaURlrHjaweQdnG30gXXl7itqnjV/I=", + "lastModified": 1700438595, + "narHash": "sha256-3Kr57JalUnLCJ4EpencaE+Dh7orKF7VBcU/YyrjSWYM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "185a47b09d95c430187a16d89b1ec32391698e07", + "rev": "d811ebe5a826ccdc0c27f89b1e41314828d652aa", "type": "github" }, "original": { @@ -1946,18 +1032,18 @@ }, "nh": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_4", "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1696149398, - "narHash": "sha256-RwlAyww4bzeu2ndeQoScelYtlYiSxPdCn70R+xGdZBc=", + "lastModified": 1698826948, + "narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=", "owner": "viperML", "repo": "nh", - "rev": "2985f5a45d6f3e1a9d8d3ca5c777ef1bc9c7fbd1", + "rev": "23d21975231d569afbe3973eb19d955c650f8f08", "type": "github" }, "original": { @@ -1966,44 +1052,19 @@ "type": "github" } }, - "nil": { - "inputs": { - "flake-utils": [ - "neovim-flake", - "flake-utils" - ], - "nixpkgs": [ - "neovim-flake", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1689759503, - "narHash": "sha256-wFrcae6V58hIlDW+7NDoUXzXBmsU7W/k3V1KIePcwRA=", - "owner": "oxalica", - "repo": "nil", - "rev": "59bcad0b13b5d77668c0c125fef71d7b41406d7a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_10", - "nixpkgs": "nixpkgs_13", + "flake-parts": "flake-parts_7", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696813662, - "narHash": "sha256-dQTBtvjdzKa7+ViWiDdnBpdtDS4FD+gWuJJrfIrxSkc=", + "lastModified": 1700459485, + "narHash": "sha256-vHE+wNz3o0ygEY/XIC4XrQq18DlC6Ek7zu8tSdUbVzk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "7cdbfd5ffe59fe54fd5c44be96f58c45e25d5b62", + "rev": "575ca7a957cfd49f3e82c5434ac8029e2e6519d3", "type": "github" }, "original": { @@ -2044,17 +1105,17 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1697159786, - "narHash": "sha256-ccAt54mqvuq0JI4nsDgQqM0xEIcTehmVTDi3m84WWD8=", + "lastModified": 1700702053, + "narHash": "sha256-F/0DojDt48Ak9KGbyEf6L6dNeDXOKYdeWYr7va90lVM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b7e0ac262c55825ac6e2918780703aae6d772460", + "rev": "d4a02648d39ad40d1cc94c13b1f68b2a07641978", "type": "github" }, "original": { @@ -2063,20 +1124,42 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698974481, + "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_6", "hercules-ci-effects": "hercules-ci-effects_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1697078589, - "narHash": "sha256-OkmeB1+kJFV2+oqMMahr5FduoDIOpKUDy4a7+cAzKME=", + "lastModified": 1700707848, + "narHash": "sha256-25D16AZq4VLV3psWPLusHn1ksj2vpff++1za1p2EG+E=", "owner": "max-privatevoid", "repo": "nixpak", - "rev": "79c315ab6d09dcf970e4bd16474c66f752361953", + "rev": "857de989621eb62a6c180eaff6ed92a6b5e47d82", "type": "github" }, "original": { @@ -2103,11 +1186,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1696726172, - "narHash": "sha256-89yxFXzTA7JRyWo6hg7SD4DlS/ejYt8Y8IvGZHbSWsg=", + "lastModified": 1700354803, + "narHash": "sha256-kJYhswYp1XMdpI2p/2oRcZxvwW83e64r1av/9zypFLU=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "59da6ac0c02c48aa92dee37057f978412797db2a", + "rev": "07e160fb6ad2c4bcabecd43425ebaaa4336c5da2", "type": "github" }, "original": { @@ -2117,60 +1200,6 @@ } }, "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_4": { - "locked": { - "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib_5": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -2188,13 +1217,31 @@ "type": "github" } }, - "nixpkgs-lib_6": { + "nixpkgs-lib_3": { "locked": { - "lastModified": 1696726172, - "narHash": "sha256-89yxFXzTA7JRyWo6hg7SD4DlS/ejYt8Y8IvGZHbSWsg=", + "dir": "lib", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_4": { + "locked": { + "lastModified": 1700354803, + "narHash": "sha256-kJYhswYp1XMdpI2p/2oRcZxvwW83e64r1av/9zypFLU=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "59da6ac0c02c48aa92dee37057f978412797db2a", + "rev": "07e160fb6ad2c4bcabecd43425ebaaa4336c5da2", "type": "github" }, "original": { @@ -2203,19 +1250,35 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "lib-aggregate": "lib-aggregate_2", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1697217271, - "narHash": "sha256-Ug2mTr+cV8wyqNCCCxGxmX8MKA+x5Ye05Vv8acoGfHI=", + "lastModified": 1700860372, + "narHash": "sha256-jWNIMHxuvOC3if17goWqeqeBjAmTqUriqUtU9ZO1l7o=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "82a065daaa0254edb652d4858ecf5cd36b5a06e4", + "rev": "03721ba8f5cc8182508bc6f72b25daa34374294c", "type": "github" }, "original": { @@ -2225,86 +1288,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1696810678, - "narHash": "sha256-XAw8D1ZEbdqwhSvn8RsgeeNrDktx4YSikTb5V4ArsrA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "35c640b19a189ce3a86698ce2fdcd87d085a339b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { "locked": { "lastModified": 1682809678, "narHash": "sha256-jqR8t82mWotOSgnWZvr6xXCO/tc3fCPTLMPvI7Jo5rA=", @@ -2320,13 +1303,13 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_11": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { @@ -2386,11 +1369,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -2402,27 +1385,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", - "owner": "nixos", + "lastModified": 1700416016, + "narHash": "sha256-Qp8Of0BUYGjqodmE912h+/uGknB7J11ypcQMKnEDUrg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "0bf3f5cf6a98b5d077cdcdb00a6d4b3d92bc78b5", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1655400192, - "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d7435c638baffaa826b85459df0fff47f12317d", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -2434,53 +1417,60 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1689088367, - "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=", + "lastModified": 1700444282, + "narHash": "sha256-s/+tgT+Iz0LZO+nBvSms+xsMqvHt2LqYniG9r+CYyJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8", + "rev": "3f21a22b5aafefa1845dec6f4a378a8f53d8681c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "master", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", - "owner": "NixOS", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nmd": { - "flake": false, + "nixvim": { + "inputs": { + "beautysh": "beautysh", + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks" + }, "locked": { - "lastModified": 1696846470, - "narHash": "sha256-S/6s3nRcg+xZfsO7aLe01W+EMAKFVyieHa4eFvOKOLk=", - "owner": "horriblename", - "repo": "nmd", - "rev": "bcf805ce85b9e938f7e027b3311137ffbd995794", + "lastModified": 1700831612, + "narHash": "sha256-4rjt03g847UpPYshwItJqFqxHJ6l4aoXqDVT9CNOCu4=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "bacdae2c508defccdff1af8511e4d639d26d3d47", "type": "github" }, "original": { - "owner": "horriblename", - "repo": "nmd", + "owner": "nix-community", + "repo": "nixvim", "type": "github" } }, - "nmd_2": { + "nmd": { "flake": false, "locked": { "lastModified": 1687627428, @@ -2496,61 +1486,13 @@ "type": "sourcehut" } }, - "noice-nvim": { - "flake": false, - "locked": { - "lastModified": 1690306450, - "narHash": "sha256-Zca6meJkfF4fl17Y+6s77GYrqnhkkzIYW73vAhKg7e4=", - "owner": "folke", - "repo": "noice.nvim", - "rev": "894db25ec726d32047799d4d0a982b701bec453b", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "noice.nvim", - "type": "github" - } - }, - "nui-nvim": { - "flake": false, - "locked": { - "lastModified": 1689828309, - "narHash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", - "owner": "MunifTanjim", - "repo": "nui.nvim", - "rev": "9e3916e784660f55f47daa6f26053ad044db5d6a", - "type": "github" - }, - "original": { - "owner": "MunifTanjim", - "repo": "nui.nvim", - "type": "github" - } - }, - "null-ls": { - "flake": false, - "locked": { - "lastModified": 1688652536, - "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=", - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", - "rev": "db09b6c691def0038c456551e4e2772186449f35", - "type": "github" - }, - "original": { - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1697222698, - "narHash": "sha256-OYd5TvXTSbNLHg6og3gVsrBWmatNGipBrpnFc/xZCkw=", + "lastModified": 1700855055, + "narHash": "sha256-QKjcrEntfghcXBsrenDE46OxaF/4YQVStAQfyDOQcPA=", "owner": "nix-community", "repo": "NUR", - "rev": "be96886a0bb735ba9e3f0be46745372b7c80b45e", + "rev": "ebf2c68214f10ee5b9372ae4960a7b54af514bd3", "type": "github" }, "original": { @@ -2559,471 +1501,55 @@ "type": "github" } }, - "nvim-autopairs": { - "flake": false, - "locked": { - "lastModified": 1689332359, - "narHash": "sha256-bu+WpW5Wfk3pS74mzVvehl7dVMHgrttmV4ZSlfwbai4=", - "owner": "windwp", - "repo": "nvim-autopairs", - "rev": "ae5b41ce880a6d850055e262d6dfebd362bb276e", - "type": "github" - }, - "original": { - "owner": "windwp", - "repo": "nvim-autopairs", - "type": "github" - } - }, - "nvim-bufferline-lua": { - "flake": false, - "locked": { - "lastModified": 1690184232, - "narHash": "sha256-MiQsYeLgADCaUf1x88q/7gO17F992HMlt1pu9dYEmp0=", - "owner": "akinsho", - "repo": "nvim-bufferline.lua", - "rev": "99f0932365b34e22549ff58e1bea388465d15e99", - "type": "github" - }, - "original": { - "owner": "akinsho", - "repo": "nvim-bufferline.lua", - "type": "github" - } - }, - "nvim-cmp": { - "flake": false, - "locked": { - "lastModified": 1688965049, - "narHash": "sha256-Hq6YUfMQo1rHoay3/NieGCne7U/f06GwUPhN2HO0PdQ=", - "owner": "hrsh7th", - "repo": "nvim-cmp", - "rev": "c4e491a87eeacf0408902c32f031d802c7eafce8", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "nvim-cmp", - "type": "github" - } - }, - "nvim-code-action-menu": { - "flake": false, - "locked": { - "lastModified": 1671523188, - "narHash": "sha256-7szx+Me6WhrANbmfQ6C6gfSVB2owd02b3iZYhz7K6wY=", - "owner": "weilbith", - "repo": "nvim-code-action-menu", - "rev": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027", - "type": "github" - }, - "original": { - "owner": "weilbith", - "repo": "nvim-code-action-menu", - "type": "github" - } - }, - "nvim-colorizer-lua": { - "flake": false, - "locked": { - "lastModified": 1591879145, - "narHash": "sha256-6YrnItxExL2C8pNIdLd+hXCjsB2MbZANwWkah6dreD8=", - "owner": "norcalli", - "repo": "nvim-colorizer.lua", - "rev": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6", - "type": "github" - }, - "original": { - "owner": "norcalli", - "repo": "nvim-colorizer.lua", - "type": "github" - } - }, - "nvim-compe": { - "flake": false, - "locked": { - "lastModified": 1633188506, - "narHash": "sha256-Y2oqvsuAKM3qjmmtJVD9z34682eCRF25kPL+rxhhg7I=", - "owner": "hrsh7th", - "repo": "nvim-compe", - "rev": "d186d739c54823e0b010feb205c6f97792322c08", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "nvim-compe", - "type": "github" - } - }, - "nvim-cursorline": { - "flake": false, - "locked": { - "lastModified": 1650034925, - "narHash": "sha256-Uhw65p1KBjs8KsVOmTzuiu3XKclxBob8AVdWEt30C/8=", - "owner": "yamatsum", - "repo": "nvim-cursorline", - "rev": "804f0023692653b2b2368462d67d2a87056947f9", - "type": "github" - }, - "original": { - "owner": "yamatsum", - "repo": "nvim-cursorline", - "type": "github" - } - }, - "nvim-dap": { - "flake": false, - "locked": { - "lastModified": 1690444190, - "narHash": "sha256-OSJA+K8eGj87RWo2tE0kT6bAItGkMMtuR0HB8WEXZ4k=", - "owner": "mfussenegger", - "repo": "nvim-dap", - "rev": "2f28ea843bcdb378b171a66ddcd568516e431d55", - "type": "github" - }, - "original": { - "owner": "mfussenegger", - "repo": "nvim-dap", - "type": "github" - } - }, - "nvim-dap-ui": { - "flake": false, - "locked": { - "lastModified": 1689371609, - "narHash": "sha256-z6TFe7+r/g2tfgdXr6PCPri5lSboi66zZmsdyWTI1BM=", - "owner": "rcarriga", - "repo": "nvim-dap-ui", - "rev": "85b16ac2309d85c88577cd8ee1733ce52be8227e", - "type": "github" - }, - "original": { - "owner": "rcarriga", - "repo": "nvim-dap-ui", - "type": "github" - } - }, - "nvim-lightbulb": { - "flake": false, - "locked": { - "lastModified": 1689887436, - "narHash": "sha256-Meoop66jINllnxN6aohuPmU7DEjn64FMq/b8zuy9FEQ=", - "owner": "kosayoda", - "repo": "nvim-lightbulb", - "rev": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9", - "type": "github" - }, - "original": { - "owner": "kosayoda", - "repo": "nvim-lightbulb", - "type": "github" - } - }, - "nvim-lspconfig": { - "flake": false, - "locked": { - "lastModified": 1690356683, - "narHash": "sha256-Ama9nLC/T1wJWal6bKvgY0ywUUiJ5VLuIxoY1xbJKtY=", - "owner": "neovim", - "repo": "nvim-lspconfig", - "rev": "b6091272422bb0fbd729f7f5d17a56d37499c54f", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "nvim-lspconfig", - "type": "github" - } - }, - "nvim-navbuddy": { - "flake": false, - "locked": { - "lastModified": 1688569844, - "narHash": "sha256-011RT/wnQdBR1vMrXFwxbicBAgdcd4eQYPbok/o3CIE=", - "owner": "SmiteshP", - "repo": "nvim-navbuddy", - "rev": "244a4cded6f2b568403684131d148048efe4e8af", - "type": "github" - }, - "original": { - "owner": "SmiteshP", - "repo": "nvim-navbuddy", - "type": "github" - } - }, - "nvim-navic": { - "flake": false, - "locked": { - "lastModified": 1689944100, - "narHash": "sha256-M7BT1C9xHyLgr22JI3b+wyD+bYs6FgKc6PIqMrXnNr4=", - "owner": "SmiteshP", - "repo": "nvim-navic", - "rev": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0", - "type": "github" - }, - "original": { - "owner": "SmiteshP", - "repo": "nvim-navic", - "type": "github" - } - }, - "nvim-neoclip": { - "flake": false, - "locked": { - "lastModified": 1684196333, - "narHash": "sha256-96AwMgyC7PTDEPS5tXwDT3WfK8jJJuIYGE+q+j6U5Uc=", - "owner": "AckslD", - "repo": "nvim-neoclip.lua", - "rev": "4e406ae0f759262518731538f2585abb9d269bac", - "type": "github" - }, - "original": { - "owner": "AckslD", - "repo": "nvim-neoclip.lua", - "type": "github" - } - }, - "nvim-notify": { - "flake": false, - "locked": { - "lastModified": 1685978736, - "narHash": "sha256-Rr2tzuEr06M9ZbvQbC07qcxkyjFJFYdABwRpYelKBFI=", - "owner": "rcarriga", - "repo": "nvim-notify", - "rev": "ea9c8ce7a37f2238f934e087c255758659948e0f", - "type": "github" - }, - "original": { - "owner": "rcarriga", - "repo": "nvim-notify", - "type": "github" - } - }, - "nvim-session-manager": { - "flake": false, - "locked": { - "lastModified": 1689976511, - "narHash": "sha256-04GL+0JdtD2hEOSrRJUh3Wdpoy2igjHt95Nf3WioFU4=", - "owner": "Shatur", - "repo": "neovim-session-manager", - "rev": "4883372b1ef2bdcf4cbdac44c98d68c216914462", - "type": "github" - }, - "original": { - "owner": "Shatur", - "repo": "neovim-session-manager", - "type": "github" - } - }, - "nvim-surround": { - "flake": false, - "locked": { - "lastModified": 1685464327, - "narHash": "sha256-r3D5WTqEnIL1T3p7cmkRmBY8qgwFFJptM7BKNNsCT8k=", - "owner": "kylechui", - "repo": "nvim-surround", - "rev": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18", - "type": "github" - }, - "original": { - "owner": "kylechui", - "repo": "nvim-surround", - "type": "github" - } - }, - "nvim-tree-lua": { - "flake": false, - "locked": { - "lastModified": 1690616703, - "narHash": "sha256-kTbYvT21wLfiwEpQAgGZtep2GP4F9e7e6XGVpr4D1hY=", - "owner": "nvim-tree", - "repo": "nvim-tree.lua", - "rev": "4bd30f0137e44dcf3e74cc1164efb568f78f2b02", - "type": "github" - }, - "original": { - "owner": "nvim-tree", - "repo": "nvim-tree.lua", - "type": "github" - } - }, - "nvim-treesitter-context": { - "flake": false, - "locked": { - "lastModified": 1689239188, - "narHash": "sha256-AJamiDezFK7l0bqb/VFm+pzBKugQNCmQ6JAWKmjH76g=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "rev": "6f8f788738b968f24a108ee599c5be0031f94f06", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-context", - "type": "github" - } - }, - "nvim-ts-autotag": { - "flake": false, - "locked": { - "lastModified": 1686883732, - "narHash": "sha256-4qTtXYA5HyG1sADV0wsiccO/G89qEoYPmlg8tTx7h8g=", - "owner": "windwp", - "repo": "nvim-ts-autotag", - "rev": "6be1192965df35f94b8ea6d323354f7dc7a557e4", - "type": "github" - }, - "original": { - "owner": "windwp", - "repo": "nvim-ts-autotag", - "type": "github" - } - }, - "nvim-web-devicons": { - "flake": false, - "locked": { - "lastModified": 1689474464, - "narHash": "sha256-FtEJBhqvs+c/Rvy4qXf3iyoMTTKrDBvQw5g63n4KEYo=", - "owner": "nvim-tree", - "repo": "nvim-web-devicons", - "rev": "efbfed0567ef4bfac3ce630524a0f6c8451c5534", - "type": "github" - }, - "original": { - "owner": "nvim-tree", - "repo": "nvim-web-devicons", - "type": "github" - } - }, - "obsidian-nvim": { - "flake": false, - "locked": { - "lastModified": 1690662423, - "narHash": "sha256-qemlp11QSp4BnWadN3+3ndv47e+1yS+w91GumbzQric=", - "owner": "epwalsh", - "repo": "obsidian.nvim", - "rev": "f81ddfa56b87fda158d3a56625a8040a7cf23fef", - "type": "github" - }, - "original": { - "owner": "epwalsh", - "repo": "obsidian.nvim", - "type": "github" - } - }, - "onedark": { - "flake": false, - "locked": { - "lastModified": 1689269544, - "narHash": "sha256-HfyYEppo9NFswYlPKnHNOZO5eiTQSORQhWAkzCmM2m4=", - "owner": "navarasu", - "repo": "onedark.nvim", - "rev": "cae5fdf035ee92c407a29ee2ccfcff503d2be7f1", - "type": "github" - }, - "original": { - "owner": "navarasu", - "repo": "onedark.nvim", - "type": "github" - } - }, - "orgmode-nvim": { - "flake": false, - "locked": { - "lastModified": 1690291768, - "narHash": "sha256-jc89zEAtHBh8785gNW/UZ9jkgTee/XYMm4+jyW7G2Oo=", - "owner": "nvim-orgmode", - "repo": "orgmode", - "rev": "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b", - "type": "github" - }, - "original": { - "owner": "nvim-orgmode", - "repo": "orgmode", - "type": "github" - } - }, - "plenary-nvim": { - "flake": false, - "locked": { - "lastModified": 1689589150, - "narHash": "sha256-oRtNcURQzrIRS3D88tWAl3HuFHxVJr8m/zzL7xoa/II=", - "owner": "nvim-lua", - "repo": "plenary.nvim", - "rev": "267282a9ce242bbb0c5dc31445b6d353bed978bb", - "type": "github" - }, - "original": { - "owner": "nvim-lua", - "repo": "plenary.nvim", - "type": "github" - } - }, - "presence-nvim": { - "flake": false, - "locked": { - "lastModified": 1674984077, - "narHash": "sha256-ZpsunLsn//zYgUtmAm5FqKVueVd/Pa1r55ZDqxCimBk=", - "owner": "andweeb", - "repo": "presence.nvim", - "rev": "87c857a56b7703f976d3a5ef15967d80508df6e6", - "type": "github" - }, - "original": { - "owner": "andweeb", - "repo": "presence.nvim", - "type": "github" - } - }, - "project-nvim": { - "flake": false, - "locked": { - "lastModified": 1680567592, - "narHash": "sha256-avV3wMiDbraxW4mqlEsKy0oeewaRj9Q33K8NzWoaptU=", - "owner": "ahmedkhalf", - "repo": "project.nvim", - "rev": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb", - "type": "github" - }, - "original": { - "owner": "ahmedkhalf", - "repo": "project.nvim", - "type": "github" - } - }, - "registers": { - "flake": false, - "locked": { - "lastModified": 1680595111, - "narHash": "sha256-MeBlcF5LLk6bhIofYuG+0Z2xwc0BVqP85yNCvjH66fw=", - "owner": "tversteeg", - "repo": "registers.nvim", - "rev": "2ab8372bb837f05fae6b43091f10a0b725d113ca", - "type": "github" - }, - "original": { - "owner": "tversteeg", - "repo": "registers.nvim", - "type": "github" - } - }, - "rnix-lsp": { + "poetry2nix": { "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_6", - "utils": "utils" + "flake-utils": [ + "nixvim", + "beautysh", + "utils" + ], + "nixpkgs": [ + "nixvim", + "beautysh", + "nixpkgs" + ] }, "locked": { - "lastModified": 1669555118, - "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=", + "lastModified": 1658665240, + "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", "owner": "nix-community", - "repo": "rnix-lsp", - "rev": "95d40673fe43642e2e1144341e86d0036abd95d9", + "repo": "poetry2nix", + "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", "type": "github" }, "original": { "owner": "nix-community", - "repo": "rnix-lsp", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_7", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -3039,13 +1565,13 @@ "hyprcontrib": "hyprcontrib", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "neovim-flake": "neovim-flake", "neovim-nightly-overlay": "neovim-nightly-overlay", "nh": "nh", "nix-gaming": "nix-gaming", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_7", "nixpkgs-wayland": "nixpkgs-wayland", + "nixvim": "nixvim", "nur": "nur", "schizofox": "schizofox", "shadower": "shadower", @@ -3073,11 +1599,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1697098808, - "narHash": "sha256-OfatUxSwuzYd17IDy9eNOedwioq0dX6mOuiTghKol3s=", + "lastModified": 1700744506, + "narHash": "sha256-zE+ncUiKUJjMYVgvLsRnphyk+lPB4fta+4eiXKz4t4I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "84e1d273439413ab4ca1718db0b574dffba443ce", + "rev": "cccc7ca2c630865239f68af480878824041c7c05", "type": "github" }, "original": { @@ -3139,53 +1665,10 @@ "type": "github" } }, - "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "neovim-flake", - "nil", - "flake-utils" - ], - "nixpkgs": [ - "neovim-flake", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-tools": { - "flake": false, - "locked": { - "lastModified": 1689033186, - "narHash": "sha256-jtfyDxifchznUupLSao6nmpVqaX1yO0xN+NhqS9fgxg=", - "owner": "simrat39", - "repo": "rust-tools.nvim", - "rev": "0cc8adab23117783a0292a0c8a2fbed1005dc645", - "type": "github" - }, - "original": { - "owner": "simrat39", - "repo": "rust-tools.nvim", - "type": "github" - } - }, "schizofox": { "inputs": { "flake-compat": "flake-compat_7", - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_8", "home-manager": "home-manager_3", "nixpak": [ "nixpak" @@ -3193,14 +1676,14 @@ "nixpkgs": [ "nixpkgs" ], - "nmd": "nmd_2" + "nmd": "nmd" }, "locked": { - "lastModified": 1696625102, - "narHash": "sha256-GNk+FZf457zBVONbDh7Rh19TnxqRO+eNv2PtLamRAZ8=", + "lastModified": 1698293239, + "narHash": "sha256-z+PS49V/GTWT3wqXS4LqPudj82L3ixtS9H0CMPpLeUw=", "owner": "schizofox", "repo": "schizofox", - "rev": "4a953104e73b69cafe464bc413ce05c48836105e", + "rev": "f1372e306349f1b154dada0ceea51fc6b4b21036", "type": "github" }, "original": { @@ -3209,26 +1692,10 @@ "type": "github" } }, - "scrollbar-nvim": { - "flake": false, - "locked": { - "lastModified": 1684886154, - "narHash": "sha256-zLBexSxQCn9HPY04a9w/UCJP1F5ShI2X12I9xE9H0cM=", - "owner": "petertriho", - "repo": "nvim-scrollbar", - "rev": "35f99d559041c7c0eff3a41f9093581ceea534e8", - "type": "github" - }, - "original": { - "owner": "petertriho", - "repo": "nvim-scrollbar", - "type": "github" - } - }, "shadower": { "inputs": { - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_15" + "naersk": "naersk", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1683924844, @@ -3244,22 +1711,6 @@ "type": "github" } }, - "smartcolumn": { - "flake": false, - "locked": { - "lastModified": 1679417638, - "narHash": "sha256-DjPWBOLbzdfOQAx+6xgV1CD5NKuP1N6An2lmHNHd39Q=", - "owner": "m4xshen", - "repo": "smartcolumn.nvim", - "rev": "0c572e3eae48874f25b74394a486f38cadb5c958", - "type": "github" - }, - "original": { - "owner": "m4xshen", - "repo": "smartcolumn.nvim", - "type": "github" - } - }, "split-monitor-workspaces": { "inputs": { "hyprland": [ @@ -3268,11 +1719,11 @@ "nix-filter": "nix-filter_2" }, "locked": { - "lastModified": 1697056199, - "narHash": "sha256-Tkd4cI4Vq6cczZjiZdfs1Q9Gke+4iL1+S3c2GAGhEvc=", + "lastModified": 1698179193, + "narHash": "sha256-zDW+72enuRGuLLRbO1+pYk8FgRjQrBGksIAOk88OwOI=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "9b40de35aeb8c62df3326eae7979b438f3ee0fb1", + "rev": "2b1abdbf9e9de9ee660540167c8f51903fa3d959", "type": "github" }, "original": { @@ -3281,39 +1732,6 @@ "type": "github" } }, - "sqls-nvim": { - "flake": false, - "locked": { - "lastModified": 1684697500, - "narHash": "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s=", - "owner": "nanotee", - "repo": "sqls.nvim", - "rev": "4b1274b5b44c48ce784aac23747192f5d9d26207", - "type": "github" - }, - "original": { - "owner": "nanotee", - "repo": "sqls.nvim", - "type": "github" - } - }, - "superdirt-src": { - "flake": false, - "locked": { - "lastModified": 1611740180, - "narHash": "sha256-GtnqZeMFqFkVhgx2Exu0wY687cHa7mNnVCgjQd6fiIA=", - "owner": "musikinformatik", - "repo": "superdirt", - "rev": "7abb62e89649daa1232b9cbd6427241868abd30e", - "type": "github" - }, - "original": { - "owner": "musikinformatik", - "ref": "master", - "repo": "superdirt", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -3449,127 +1867,6 @@ "type": "github" } }, - "tabular": { - "flake": false, - "locked": { - "lastModified": 1550598128, - "narHash": "sha256-irolBA/m3YIaezl+90h5G+xUOpad+3u44uJqDs4JCUs=", - "owner": "godlygeek", - "repo": "tabular", - "rev": "339091ac4dd1f17e225fe7d57b48aff55f99b23a", - "type": "github" - }, - "original": { - "owner": "godlygeek", - "repo": "tabular", - "type": "github" - } - }, - "telescope": { - "flake": false, - "locked": { - "lastModified": 1690663693, - "narHash": "sha256-okyOr5t0e+oV3mY7Yq1ad/7f6qEEDS/ZQrqJcjktYRI=", - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "rev": "b6fccfb0f7589a87587875206786daccba62acc3", - "type": "github" - }, - "original": { - "owner": "nvim-telescope", - "repo": "telescope.nvim", - "type": "github" - } - }, - "tidal-src": { - "flake": false, - "locked": { - "lastModified": 1654350756, - "narHash": "sha256-tONM5SYYBca0orTLH1EUOilSC1FCluWrFt8AetUx+YQ=", - "owner": "tidalcycles", - "repo": "tidal", - "rev": "fda9c1ecb3722698935245e5409ef8ccdfca16c8", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "main", - "repo": "tidal", - "type": "github" - } - }, - "tidalcycles": { - "inputs": { - "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_7", - "superdirt-src": "superdirt-src", - "tidal-src": "tidal-src", - "utils": "utils_2", - "vim-tidal-src": "vim-tidal-src", - "vowel-src": "vowel-src" - }, - "locked": { - "lastModified": 1664760044, - "narHash": "sha256-e5LGk/tDnphory1mYhADgPnVtShofY2w/3xY09jEE2A=", - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "rev": "3f3a820cd43709077d15a24fa6062de7d623a6bf", - "type": "github" - }, - "original": { - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "type": "github" - } - }, - "todo-comments": { - "flake": false, - "locked": { - "lastModified": 1690569591, - "narHash": "sha256-Qm8AJ8omU5eCfjLt91DVxLS0R3QHbfW55ZTegB1JvWI=", - "owner": "folke", - "repo": "todo-comments.nvim", - "rev": "3094ead8edfa9040de2421deddec55d3762f64d1", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "todo-comments.nvim", - "type": "github" - } - }, - "toggleterm-nvim": { - "flake": false, - "locked": { - "lastModified": 1689602083, - "narHash": "sha256-/sUulN93nRHa3Je+tXr8/i1cgCrd/wtrvMPkjG5Ofzs=", - "owner": "akinsho", - "repo": "toggleterm.nvim", - "rev": "00c13dccc78c09fa5da4c5edda990a363e75035e", - "type": "github" - }, - "original": { - "owner": "akinsho", - "repo": "toggleterm.nvim", - "type": "github" - } - }, - "tokyonight": { - "flake": false, - "locked": { - "lastModified": 1689285710, - "narHash": "sha256-x26qLaZzg7sJIc1d/5Q/DJ/YvRSc3s87PwPHTPTl+Xk=", - "owner": "folke", - "repo": "tokyonight.nvim", - "rev": "1ee11019f8a81dac989ae1db1a013e3d582e2033", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "tokyonight.nvim", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -3579,11 +1876,11 @@ ] }, "locked": { - "lastModified": 1695822946, - "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", "type": "github" }, "original": { @@ -3592,29 +1889,13 @@ "type": "github" } }, - "trouble": { - "flake": false, - "locked": { - "lastModified": 1690614197, - "narHash": "sha256-Ee0AM8S/A8DU0hyOnZoKC1hkW0fvk0A+c3WGvPqmKcU=", - "owner": "folke", - "repo": "trouble.nvim", - "rev": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "trouble.nvim", - "type": "github" - } - }, "utils": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -3623,198 +1904,37 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "vim-dirtytalk": { - "flake": false, - "locked": { - "lastModified": 1690722430, - "narHash": "sha256-kjyLwkAk6mqK7u4+zAr+Yh+zbSiukNKtXwb7t39LUco=", - "owner": "psliwka", - "repo": "vim-dirtytalk", - "rev": "a49251dce1852875951d95f7013979ece5caebf0", - "type": "github" - }, - "original": { - "owner": "psliwka", - "repo": "vim-dirtytalk", - "type": "github" - } - }, - "vim-illuminate": { - "flake": false, - "locked": { - "lastModified": 1679187974, - "narHash": "sha256-8dL3cBjQ2iY4D4gTxKVVmOGhxcSSRuDBvmEwwFIbWsQ=", - "owner": "RRethy", - "repo": "vim-illuminate", - "rev": "a2907275a6899c570d16e95b9db5fd921c167502", - "type": "github" - }, - "original": { - "owner": "RRethy", - "repo": "vim-illuminate", - "type": "github" - } - }, - "vim-markdown": { - "flake": false, - "locked": { - "lastModified": 1680951012, - "narHash": "sha256-B00rad/Bbp+kJBN/fYliOaGiUe0AfBng6gs/fVBve9A=", - "owner": "preservim", - "repo": "vim-markdown", - "rev": "cc82d88e2a791f54d2b6e2b26e41f743351ac947", - "type": "github" - }, - "original": { - "owner": "preservim", - "repo": "vim-markdown", - "type": "github" - } - }, - "vim-repeat": { - "flake": false, - "locked": { - "lastModified": 1611544268, - "narHash": "sha256-8rfZa3uKXB3TRCqaDHZ6DfzNbm7WaYnLvmTNzYtnKHg=", - "owner": "tpope", - "repo": "vim-repeat", - "rev": "24afe922e6a05891756ecf331f39a1f6743d3d5a", - "type": "github" - }, - "original": { - "owner": "tpope", - "repo": "vim-repeat", - "type": "github" - } - }, - "vim-startify": { - "flake": false, - "locked": { - "lastModified": 1620487920, - "narHash": "sha256-//3bzFTe1WKqvQ3uYrDbk5Zu5BKq2hXQGeBhmhKIHvk=", - "owner": "mhinz", - "repo": "vim-startify", - "rev": "81e36c352a8deea54df5ec1e2f4348685569bed2", - "type": "github" - }, - "original": { - "owner": "mhinz", - "repo": "vim-startify", - "type": "github" - } - }, - "vim-tidal-src": { - "flake": false, - "locked": { - "lastModified": 1685703852, - "narHash": "sha256-8gyk17YLeKpLpz3LRtxiwbpsIbZka9bb63nK5/9IUoA=", - "owner": "tidalcycles", - "repo": "vim-tidal", - "rev": "e440fe5bdfe07f805e21e6872099685d38e8b761", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "master", - "repo": "vim-tidal", - "type": "github" - } - }, - "vim-vsnip": { - "flake": false, - "locked": { - "lastModified": 1678609126, - "narHash": "sha256-ehPnvGle7YrECn76YlSY/2V7Zeq56JGlmZPlwgz2FdE=", - "owner": "hrsh7th", - "repo": "vim-vsnip", - "rev": "7753ba9c10429c29d25abfd11b4c60b76718c438", - "type": "github" - }, - "original": { - "owner": "hrsh7th", - "repo": "vim-vsnip", - "type": "github" - } - }, - "vowel-src": { - "flake": false, - "locked": { - "lastModified": 1641306144, - "narHash": "sha256-zfF6cvAGDNYWYsE8dOIo38b+dIymd17Pexg0HiPFbxM=", - "owner": "supercollider-quarks", - "repo": "vowel", - "rev": "ab59caa870201ecf2604b3efdd2196e21a8b5446", - "type": "github" - }, - "original": { - "owner": "supercollider-quarks", - "ref": "master", - "repo": "vowel", - "type": "github" - } - }, - "which-key": { - "flake": false, - "locked": { - "lastModified": 1690570286, - "narHash": "sha256-B1+EHd2eH/EbD5Kip9PfhdPyyGfIkD6rsx0Z3rXvb5w=", - "owner": "folke", - "repo": "which-key.nvim", - "rev": "7ccf476ebe0445a741b64e36c78a682c1c6118b7", - "type": "github" - }, - "original": { - "owner": "folke", - "repo": "which-key.nvim", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1696410538, - "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", + "lastModified": 1700736101, + "narHash": "sha256-1Fh1xf/JX5zFbGIF9LDaffaleG6JDwwwnKby0LyiXEA=", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", + "rev": "f1762f428b0ef2989c81f57ea9e810403d34d946", "type": "gitlab" } }, "xdg-desktop-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_11", "systems": "systems_9" }, "locked": { - "lastModified": 1697281098, - "narHash": "sha256-yKrV/2lwKUZnzLUneI9x8CtiD4WTGLIJ4hNjxAmaySw=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d8daa2a84f5e9b38eb89e0631b294e7d0a83aa9b", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { @@ -3839,11 +1959,11 @@ ] }, "locked": { - "lastModified": 1694628480, - "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { @@ -3851,26 +1971,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1690718829, - "narHash": "sha256-GN19SrCqWxIJN+rnbv+pIkF/yynh6FG2y7jY6PZRiYw=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "92e485cc7887f57be4d2921ed077f467912b7d33", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 507de51a..b3cb2a8d 100644 --- a/flake.nix +++ b/flake.nix @@ -73,11 +73,6 @@ helix.url = "github:helix-editor/helix"; - neovim-flake = { - url = "github:NotAShelf/neovim-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - agenix.url = "github:ryantm/agenix"; nh = { @@ -92,5 +87,10 @@ nixpak.follows = "nixpak"; }; }; + + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/hosts/chmura/conduit.nix b/hosts/chmura/conduit.nix index 50dd27e3..d0dfccc0 100644 --- a/hosts/chmura/conduit.nix +++ b/hosts/chmura/conduit.nix @@ -1,13 +1,15 @@ { - pkgs, + config, inputs, + lib, + pkgs, ... -}: let +}: with lib; let caddyConfig = '' reverse_proxy /_matrix/* localhost:6167 header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Access-Control-Allow-Origin * - respond /.well-known/matrix/server `{"m.server": "m.jacekpoz.pl:443"}` + respond /.well-known/matrix/server `{"m.server": "m.jacekpoz.pl:8448"}` respond /.well-known/matrix/client `{"m.homeserver":{"base_url":"https://m.jacekpoz.pl"}}` ''; in { diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix index b2dab6af..35f69714 100644 --- a/hosts/chmura/configuration.nix +++ b/hosts/chmura/configuration.nix @@ -82,17 +82,6 @@ services.caddy = { enable = true; - virtualHosts."trollface.pl".extraConfig = '' - @discord { - header_regexp User-Agent (?i)(Discord) - path / - } - - rewrite @discord /trollface.png - - root * ${./trollface.pl} - file_server - ''; virtualHosts."test.jacekpoz.pl".extraConfig = '' reverse_proxy * localhost:3001 ''; @@ -108,5 +97,27 @@ networking.firewall.allowedTCPPorts = [ 80 443 22 ]; + myOptions = { + programs = { + git = { + enable = true; + userName = "jacekpoz"; + userEmail = "jacekpoz@cock.li"; + signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C"; + editor = "${pkgs.neovim-nightly}/bin/nvim"; + defaultBranch = "master"; + }; + starship.enable = true; + zsh.enable = true; + btop.enable = true; + neovim.enable = true; + helix.enable = true; + }; + services.ssh = { + agent.enable = false; + daemon.enable = true; + }; + }; + system.stateVersion = "23.11"; } diff --git a/hosts/chmura/default.nix b/hosts/chmura/default.nix index 272de922..af09490a 100644 --- a/hosts/chmura/default.nix +++ b/hosts/chmura/default.nix @@ -5,14 +5,17 @@ _: { ./conduit.nix ./configuration.nix #./discord-autodelete.nix + ./firefox-syncserver.nix ./forgejo.nix #./freshrss.nix #./grafana.nix ./hardware-configuration.nix ./home-manager.nix ./i2pd.nix + ./jacekpoz.pl.nix ./ntfy-sh.nix ./stalwart.nix + ./trollface.pl #./qbittorrent.nix ]; } diff --git a/hosts/chmura/firefox-syncserver.nix b/hosts/chmura/firefox-syncserver.nix new file mode 100644 index 00000000..a4e90118 --- /dev/null +++ b/hosts/chmura/firefox-syncserver.nix @@ -0,0 +1,33 @@ +{ + config, + pkgs, + ... +}: let + domain = "ffsync.jacekpoz.pl"; +in { + age.secrets.firefox-syncserver-secrets.file = ../../secrets/firefox-syncserver-secrets.age; + + services.firefox-syncserver = { + enable = true; + logLevel = "warn"; + singleNode = { + enable = true; + capacity = 100; + hostname = domain; + url = "https://${domain}"; + }; + settings = { + port = 6583; + }; + secrets = config.age.secrets.firefox-syncserver-secrets.path; + }; + + services.mysql.package = pkgs.mariadb; + + services.caddy = { + enable = true; + virtualHosts.${domain}.extraConfig = '' + reverse_proxy * localhost:6583 + ''; + }; +} diff --git a/hosts/chmura/forgejo.nix b/hosts/chmura/forgejo.nix index 30528218..a8898240 100644 --- a/hosts/chmura/forgejo.nix +++ b/hosts/chmura/forgejo.nix @@ -13,7 +13,6 @@ settings = { DEFAULT = { APP_NAME = "fuck it we code"; - }; server = { diff --git a/hosts/chmura/home-manager.nix b/hosts/chmura/home-manager.nix index be77e139..c354f232 100644 --- a/hosts/chmura/home-manager.nix +++ b/hosts/chmura/home-manager.nix @@ -11,14 +11,6 @@ useGlobalPkgs = true; extraSpecialArgs = {inherit inputs self config';}; users.${config'.username} = { - imports = [ - inputs.neovim-flake.homeManagerModules.default - ../../modules/cli/starship.nix - ../../modules/cli/zsh.nix - ../../modules/tui/btop.nix - ../../modules/tui/neovim - ]; - programs = { home-manager.enable = true; direnv = { diff --git a/hosts/chmura/jacekpoz.pl.nix b/hosts/chmura/jacekpoz.pl.nix new file mode 100644 index 00000000..decd02b4 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl.nix @@ -0,0 +1,16 @@ +{ + pkgs, + ... +}: { + services.caddy = { + enable = true; + virtualHosts."jacekpoz.pl".extraConfig = '' + root * ${ pkgs.callPackage ./jacekpoz.pl { } } + file_server + ''; + virtualHosts."jpoz.pl".extraConfig = '' + redir / https://jacekpoz.pl + redir /git https://jacekpoz.pl/posts/git-workflow + ''; + }; +} diff --git a/hosts/chmura/jacekpoz.pl/archetypes/default.md b/hosts/chmura/jacekpoz.pl/archetypes/default.md new file mode 100644 index 00000000..c6f3fcef --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/archetypes/default.md @@ -0,0 +1,5 @@ ++++ +title = '{{ replace .File.ContentBaseName "-" " " | title }}' +date = {{ .Date }} +draft = true ++++ diff --git a/hosts/chmura/jacekpoz.pl/content/_index.md b/hosts/chmura/jacekpoz.pl/content/_index.md new file mode 100644 index 00000000..d94cccf6 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/content/_index.md @@ -0,0 +1 @@ +piss blob diff --git a/hosts/chmura/jacekpoz.pl/content/about.md b/hosts/chmura/jacekpoz.pl/content/about.md new file mode 100644 index 00000000..c06d0e87 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/content/about.md @@ -0,0 +1,9 @@ ++++ +title = 'About' +date = 2023-11-12T23:23:47+01:00 +draft = false ++++ + +hello :-) + +I like foss and stuff diff --git a/hosts/chmura/jacekpoz.pl/content/posts/git-workflow.md b/hosts/chmura/jacekpoz.pl/content/posts/git-workflow.md new file mode 100644 index 00000000..d2f4335b --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/content/posts/git-workflow.md @@ -0,0 +1,115 @@ ++++ +title = 'My git workflow' +date = 2023-11-12T19:10:04+01:00 +draft = false ++++ + +## TL;DR (if you use nix) + +[git module](https://codeberg.org/jacekpoz/niksos/src/branch/master/modules/cli/git.nix) (uses home-manager) and [the config](https://codeberg.org/jacekpoz/niksos/src/branch/master/hosts/niks/configuration.nix#L323-L330) +[ssh module](https://codeberg.org/jacekpoz/niksos/src/branch/master/modules/services/ssh.nix) and [the config](https://codeberg.org/jacekpoz/niksos/src/branch/master/hosts/niks/configuration.nix#L434-L472) + +--- + +Over the past few months I helped a few people learn git so I decided to put this together instead of explaining my workflow each time. + +Hopefully this can serve as a simple git guide to get started quickly or as a reference to come back to if you forget something. + +I don't use any git wrappers, the cli is enough for me. If you know of a good one let me know, I might try it and add it here. + +--- + +I aliased `git` to `g` in my [zsh config](https://codeberg.org/jacekpoz/niksos/src/branch/master/modules/cli/zsh.nix#L31), which is what I use in all the examples below. + +First the basics: + +- `g init` initializes the repo in `.`; make sure you create a new one for your repo, + +- `g clone forge:username/repo` will download that repository into `./repo`, + +- `g remote add origin forge:username/repo` is how you connect the local repo to your preferred git forge (more in [remotes](#remotes)), + +- `g add .` adds all the changes you made so far (more in [adding](#adding)), + +- `g commit -m "commit message"` creates a commit with whatever you added prior (more in [commits](#commits)), + +- `g push` pushes all the commits to the forge (it ignores added but uncommited changes), + +- `g status` shows you the current status (added files, unpushed commites, etc.) and handy commands on how to change it. + +If you run all these right now you'll get an error akin to this: +``` +user@example.com: Permission denied (publickey). +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. +``` +which means you need to generate and setup an ssh key. + +## SSH key + +`ssh-keygen -t ed25519 -f ~/.ssh/` is what I usually do. Some people might recommend making a single key for all git forges, I keep them separate, you do you. + +After running the above you'll be asked to enter a passphrase or leave it empty for no passphrase. I recommend **always** setting a strong passphrase (could be generated with [KeePassXC](https://keepassxc.org)) and adding it to a password manager like the aforementioned. Copying and pasting that passphrase isn't a big deal, having your unlocked key stolen is. + +After doing that you'll have 2 files, `~/.ssh/` (the private key) and `~/.ssh/.pub` (the public key). As the name suggests, **DO NOT** share the first one with anyone, it must be kept secure. If that leaks and isn't protected by a password, or the password is cracked, whoever has the file can modify the git history as you. + +Now you want to add your public key to your preferred git forge. Here's how to do that on [github](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account), [gitlab](https://docs.gitlab.com/ee/user/ssh.html#add-an-ssh-key-to-your-gitlab-account) and [codeberg](https://docs.codeberg.org/security/ssh-key/#add-the-ssh-key-to-codeberg) (which should work for all forgejo instances). All of these instructions are pretty similar and you should be able to figure it out after the first time. + +What we need to do now is tell git which ssh key to use when connecting to our preferred forge. + +## Remotes + +On my machine I alias all the remotes in my ssh config which both makes them shorter and allows me to add the ssh key to that forge. The nix config is at the top but if you don't use nix this is what you add for each remote to either `/etc/ssh/ssh_config` or (preferably) `~/.ssh/config`: +``` +Host example + HostName git.example.com + User git + IdentityFile /path/to/private_key +``` + +For an example, this is what I'd do for codeberg: +``` +Host codeberg + HostName codeberg.org + User git + IdentityFile ~/.ssh/codeberg +``` +and change my git remote: `g remote set-url origin codeberg:nickname/repo` (if you added it already). + +Now you should finally be able to push your changes! That wasn't so bad, was it? This workflow might not be ideal to you but it's simple and convenient enough for me and I think it should be alright for new users. + +The purpose of this post isn't to be a general git guide, it's a reference I (and hopefully others) can go back to. For a general git guide that goes much more in depth than this I can't recommend the [official git book](https://git-scm.com/book/en/v2) enough. This post covers a very small part of the second chapter of that book. If you also want a (maybe not so quick) reference for various git subcommands check their manpages, e.g. `man git-add` for `g add`. + +Now, if all you want to do is push a few commits to a repo, this should be enough and you can stop reading. If you want to learn interactive adding, reverting your changes, signing your commits with a GPG key and more, read on! + +## Adding + +`g add` accepts a [glob pattern](https://en.wikipedia.org/wiki/Glob_(programming)#Unix-like) meaning that you can e.g. `g add *.c` to add all files ending with `.c` in the current directory. Passing a single file name of course also works. + +`g add -p` gives you access to the interactive mode, which displays hunks (a part of the changes) that you can add `y`, discard `n`, split `s` or manually edit `e` into smaller hunks. It also accepts a glob pattern, just like the normal `g add`. The interactive mode might offer more functionality but I found these 4 options to be enough for almost anything. + +## Commits + +`g commit` without any flags will let you edit the commit message in your editor of choice. It can be set with either `g config --global core.editor "my_editor"` or with the environment variable `GIT_EDITOR`. If you're on nix and use home-manager check my git module. + +`g log` gives you all commits in the current repo. Each commit description starts with something like `commit b155c8912bb2347e030e723a2b37f1a60cb0fe15`. That big mess of characters is the commit hash, its identifier which you will use to refer to that commit. Usually you can type the first few characters of that hash and it should also work. When in doubt use your shell's autocompletion (most likely using the tab key). `g log` has *a lot* of flags, either read its manpage or toy around with the help of autocompletion. + +If you want to see the state of your repo at a specific commit use `g checkout`. + +Now that we know how to view and refer to a specific commit, we can learn how to revert the changes made in that commit. The terminology on this one is really confusing, I have to check it almost every time I need to revert a commit: + +- `g reset --hard commit_hash` will remove that commit and **remove all the changes in that commit locally** — to get them back you have to rewrite them by hand; most of the time not necessary, + +- `g revert commit_hash` will create a revert commit — the exact opposite of the one you're reverting, bringing you back to the state before it, + +- `g reset --soft commit_hash` will remove that commit but keep its changes, allowing you to make further changes, add and commit them again; in practice this is the one I use the most. + +To ammend further changes to the last commit you can add the changes and use `g commit --ammend`. It's probably a faster equivalent to `g reset --soft`, I just happen to have learned the former first and got used to it. + +If you want to sign your commits with a GPG key, verifying that you're actually their author, you want to make git aware of your public key. To do that, run `g config --global user.signingkey my_public_gpg_key` and install a pinentry frontend. I use the qt one and can recommend it. If you have no idea what I'm talking about, skip this section. This isn't necessary and your contributions most likely won't be rejected because your commits aren't signed. + +--- + +If you got stuck on some part, find this too hard or have any suggestions for this post, feel free to contact me. All my public contact information is on the sidebar at the top of all pages, I'd be more than happy to help you out. :-) diff --git a/hosts/chmura/jacekpoz.pl/default.nix b/hosts/chmura/jacekpoz.pl/default.nix new file mode 100644 index 00000000..086d8275 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/default.nix @@ -0,0 +1,31 @@ +{ + pkgs ? import {}, + ... +}: let + risotto-src = pkgs.fetchFromGitHub { + owner = "jacekpoz"; + repo = "risotto"; + rev = "7c8cdd97cca30c49f0c13cf2e049f43b39b49d75"; + hash = "sha256-CX4aLTY1Z6E0QoRQIUOmfhG1gGCCnLqwBiLjhVMSpY8="; + }; +in pkgs.stdenv.mkDerivation { + name = "jacekpoz.pl"; + version = "0.1"; + src = ./.; + + buildInputs = with pkgs; [ + hugo + ]; + dontConfigure = true; + + buildPhase = '' + cp -r $src/* . + cp -r ${risotto-src} ./themes/risotto + ${pkgs.hugo}/bin/hugo + ''; + + installPhase = '' + mkdir -p $out + cp -r ./public/* $out/ + ''; +} diff --git a/hosts/chmura/jacekpoz.pl/hugo.toml b/hosts/chmura/jacekpoz.pl/hugo.toml new file mode 100644 index 00000000..c43e3a3d --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/hugo.toml @@ -0,0 +1,40 @@ +baseURL = "https://jacekpoz.pl/" +theme = "risotto" +languageCode = "en-us" +title = "jacekpoz" +author = "jacekpoz" +copyright = "© 2023 by jacekpoz" + +[params] + +[params.theme] +palette = "tokyo-night-dark" + +[params.about] +title = "jacekpoz" +description = "piss blob" +logo = "jacekpoz.svg" + +[[params.socialLinks]] +logo = "email.svg" +title = "Email" +url = "mailto:jacekpoz@cock.li" + +[[params.socialLinks]] +logo = "matrix.svg" +title = "Matrix" +url = "https://matrix.to/#/@jacekpoz:jacekpoz.pl" + +[menu] + +[[menu.main]] +identifier = "posts" +name = "posts" +url = "/posts/" +weight = 1 + +[[menu.main]] +identifier = "about" +name = "about" +url = "/about" +weight = 2 diff --git a/hosts/chmura/jacekpoz.pl/static/email.svg b/hosts/chmura/jacekpoz.pl/static/email.svg new file mode 100644 index 00000000..63b3c8b5 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/static/email.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/hosts/chmura/jacekpoz.pl/static/favicon.ico b/hosts/chmura/jacekpoz.pl/static/favicon.ico new file mode 100644 index 00000000..798a3e3f Binary files /dev/null and b/hosts/chmura/jacekpoz.pl/static/favicon.ico differ diff --git a/hosts/chmura/jacekpoz.pl/static/jacekpoz.svg b/hosts/chmura/jacekpoz.pl/static/jacekpoz.svg new file mode 100644 index 00000000..affcd186 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/static/jacekpoz.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/hosts/chmura/jacekpoz.pl/static/matrix.svg b/hosts/chmura/jacekpoz.pl/static/matrix.svg new file mode 100644 index 00000000..037fac42 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/static/matrix.svg @@ -0,0 +1,52 @@ + + + + + + + + diff --git a/hosts/chmura/jacekpoz.pl/themes/risotto b/hosts/chmura/jacekpoz.pl/themes/risotto new file mode 160000 index 00000000..7c8cdd97 --- /dev/null +++ b/hosts/chmura/jacekpoz.pl/themes/risotto @@ -0,0 +1 @@ +Subproject commit 7c8cdd97cca30c49f0c13cf2e049f43b39b49d75 diff --git a/hosts/chmura/stalwart.nix b/hosts/chmura/stalwart.nix index 608ee5d9..771395f4 100644 --- a/hosts/chmura/stalwart.nix +++ b/hosts/chmura/stalwart.nix @@ -1,4 +1,12 @@ _: { + users.users.stalwart = { + isSystemUser = true; + group = "stalwart"; + home = "/var/lib/stalwart"; + }; + + users.groups.stalwart = {}; + services.stalwart-mail = { enable = true; settings = { @@ -8,11 +16,21 @@ _: { user = "stalwart"; group = "stalwart"; }; - listener = { - smtp = { - bind = [ "0.0.0.0:9900" ]; - }; - }; + #listener = { + # lmtp = { + # protocol = "lmtp"; + # bind = [ "0.0.0.0:9900" ]; + # }; + # smtp = { + # protocol = "smtp"; + # bind = [ "0.0.0.0:9901" ]; + # }; + # jmap = { + # protocol = "jmap"; + # bind = [ "0.0.0.0:9902" ]; + # url = "https://mail.jacekpoz.pl/jmap"; + # }; + #}; }; global = { thread-pool = 4; @@ -27,4 +45,13 @@ _: { }; }; }; + + services.caddy = { + enable = true; + virtualHosts."mail.jacekpoz.pl".extraConfig = '' + handle_path /jmap* { + reverse_proxy * localhost:9902 + } + ''; + }; } diff --git a/hosts/chmura/trollface.pl/default.nix b/hosts/chmura/trollface.pl/default.nix new file mode 100644 index 00000000..cbe96c24 --- /dev/null +++ b/hosts/chmura/trollface.pl/default.nix @@ -0,0 +1,16 @@ +_ : { + services.caddy = { + enable = true; + virtualHosts."trollface.pl".extraConfig = '' + @discord { + header_regexp User-Agent (?i)(Discord) + path / + } + + rewrite @discord /trollface.png + + root * ${./.} + file_server + ''; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index 2c492d80..991fa9a5 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -21,21 +21,21 @@ in { inputs.agenix.nixosModules.default ]; }; - hape = lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit lib inputs self; - config' = { - hostname = "hape"; - username = "jacek"; - }; - }; - modules = [ - ./hape - ../modules - inputs.home-manager.nixosModules.home-manager - ]; - }; + #hape = lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = { + # inherit lib inputs self; + # config' = { + # hostname = "hape"; + # username = "jacek"; + # }; + # }; + # modules = [ + # ./hape + # ../modules + # inputs.home-manager.nixosModules.home-manager + # ]; + #}; chmura = lib.nixosSystem { system = "x86_86-linux"; specialArgs = { diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 42cffa80..8db07e44 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -10,7 +10,7 @@ config = { permittedInsecurePackages = [ "python-2.7.18.6" - "armcord-3.2.3" + "electron-24.8.6" ]; allowUnfree = true; }; @@ -56,10 +56,15 @@ networking = { hostName = config'.hostname; - networkmanager.enable = true; + networkmanager = { + enable = true; + dns = "systemd-resolved"; + }; firewall.checkReversePath = "loose"; }; + services.resolved.enable = true; + # don't wait for network to boot faster # https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a systemd = { @@ -189,7 +194,10 @@ CHROME_EXECUTABLE = "${pkgs.ungoogled-chromium}/bin/chromium"; - NIXOS_OZONE_WL = "1"; + #NIXOS_OZONE_WL = "1"; + + #WLR_DRM_DEVICES = "/dev/dri/card0:/dev/dri/card1"; + #DRI_PRIME = "1"; }; systemPackages = with pkgs; [ man-pages @@ -241,6 +249,12 @@ enable = true; driSupport = true; driSupport32Bit = true; + extraPackages = with pkgs; [ + amdvlk + ]; + extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; }; cpu.amd.updateMicrocode = true; }; @@ -318,6 +332,8 @@ programs.kdeconnect.enable = true; + programs.noisetorch.enable = true; + myOptions = { programs = { git = { @@ -329,7 +345,14 @@ defaultBranch = "master"; }; starship.enable = true; - zsh.enable = true; + zsh = { + enable = true; + extraAliases = { + u = "nixos-rebuild switch -L --use-remote-sudo --flake \"/home/jacek/niksos#niks\" --max-jobs 3 --cores 4"; + us = "NIX_SSHOPTS='-t' nixos-rebuild switch -L --use-remote-sudo --flake \"/home/jacek/niksos#chmura\" --target-host chmura --max-jobs 3 --cores 4"; + }; + profiling = false; + }; anyrun.enable = true; armcord.enable = true; btop.enable = true; @@ -379,16 +402,18 @@ }; }; }; - schizofox.enable = false; foot.enable = true; - gtklock.enable = false; mpv.enable = true; neovim.enable = true; swaylock.enable = true; waybar.enable = true; zathura.enable = true; - hyprland.enable = true; + hyprland = { + enable = true; + startupSound = ./mathis.m4a; + }; helix.enable = true; + newsboat.enable = true; }; themes = { cursor = { @@ -457,16 +482,30 @@ user = "aur"; identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/aur"; }; + "jacekpoz" = { + hostName = "git.jacekpoz.pl"; + user = "forgejo"; + identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/jacekpoz"; + }; "chmura" = { hostName = "192.168.15.17"; user = "chmura"; identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/chmura"; }; + "chmura2" = { + hostName = "jacekpoz.pl"; + user = "chmura"; + identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/chmura"; + }; "malina" = { hostName = "192.168.15.13"; user = "malina"; identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/malina"; }; + "outfoxxed" = { + hostName = "git.outfoxxed.me"; + identityFile = "${config.home-manager.users.${config'.username}.home.homeDirectory}/.ssh/outfoxxed"; + }; }; }; }; diff --git a/hosts/niks/home-manager.nix b/hosts/niks/home-manager.nix index 7fb3a3c3..aa273913 100644 --- a/hosts/niks/home-manager.nix +++ b/hosts/niks/home-manager.nix @@ -68,7 +68,6 @@ qbittorrent retroarchFull ventoy-full - zathura zellij nodejs unzip @@ -107,7 +106,7 @@ rage fd udisks - ffmpeg + ffmpeg_6-full ghc ghcid cabal-install @@ -182,18 +181,31 @@ logseq gamescope vitetris + gtetrinet # tp jetbrains.idea-community maven - pmd libsForQt5.umbrello - jdk - checkstyle + plantuml + umlet + graphviz linuxKernel.packages.linux_zen.cpupower usbutils libsForQt5.dolphin + kiwix + inkscape + gomuks + subversion + nushell + twitch-tui + hugo + ytfzf + mat2 + simplex-chat-desktop + libsixel + lsix ]; stateVersion = lib.mkDefault "23.11"; diff --git a/hosts/niks/mathis.m4a b/hosts/niks/mathis.m4a new file mode 100644 index 00000000..e1c31b00 Binary files /dev/null and b/hosts/niks/mathis.m4a differ diff --git a/hosts/niks/waydroid.nix b/hosts/niks/waydroid.nix index 1a494a70..5993226f 100644 --- a/hosts/niks/waydroid.nix +++ b/hosts/niks/waydroid.nix @@ -1,6 +1,6 @@ _: { virtualisation = { waydroid.enable = true; - lxc.enable = true; + #lxc.enable = true; }; } diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index ebc059ea..c51adbbd 100644 --- a/modules/cli/zsh.nix +++ b/modules/cli/zsh.nix @@ -7,7 +7,19 @@ }: with lib; let cfg = config.myOptions.programs.zsh; in { - options.myOptions.programs.zsh.enable = mkEnableOption "enable zsh"; + options.myOptions.programs.zsh = { + enable = mkEnableOption "enable zsh"; + extraAliases = mkOption { + type = types.attrs; + description = "extra shell aliases"; + default = {}; + }; + profiling = mkOption { + type = types.bool; + description = "enable zsh profiling"; + default = false; + }; + }; config = mkIf cfg.enable { home-manager.users.${config'.username} = { @@ -30,12 +42,10 @@ in { agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE"; g = "git"; woman = "man"; - wget = "wget --hsts-file=\"${config.home-manager.users.${config'.username}.xdg.dataHome}/wget-hsts\""; - }; - initExtra = '' - bindkey -e - ''; + } // cfg.extraAliases; + initExtraFirst = mkIf cfg.profiling "zmodload zsh/zprof"; + initExtra = mkIf cfg.profiling "zprof"; history = { path = "${config.home-manager.users.${config'.username}.xdg.dataHome}/zsh/zsh_history"; size = 9999999999; diff --git a/modules/gui/anyrun.nix b/modules/gui/anyrun.nix index 4029200e..c5bb0f1c 100644 --- a/modules/gui/anyrun.nix +++ b/modules/gui/anyrun.nix @@ -111,6 +111,7 @@ in { "symbols.ron".text = '' Config( prefix: ":s", + max_entries: 30, ) ''; "translate.ron".text = '' diff --git a/modules/gui/armcord.nix b/modules/gui/armcord.nix index 5f780a60..b6781e17 100644 --- a/modules/gui/armcord.nix +++ b/modules/gui/armcord.nix @@ -15,13 +15,7 @@ in { config = mkIf cfg.enable { home-manager.users.${config'.username} = { home.packages = with pkgs; [ - (armcord.overrideAttrs { - version = "3.2.3"; - src = pkgs.fetchurl { - url = "https://github.com/ArmCord/ArmCord/releases/download/v3.2.3/ArmCord_3.2.3_amd64.deb"; - sha256 = "0pdsqvdvr0ylc8pjc4d1krxngcwl99jz74m04804bihpwzsyzibp"; - }; - }) + armcord ]; #xdg.configFile = { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index c1954df2..9534111b 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -12,7 +12,7 @@ _: { ./mpv.nix ./qt.nix #./rofi.nix - ./schizofox.nix + #./schizofox.nix ./swaylock.nix ./waybar.nix ./zathura.nix diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix index 83404ba1..a8d155c1 100644 --- a/modules/gui/firefox.nix +++ b/modules/gui/firefox.nix @@ -154,7 +154,6 @@ in { }; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin - sponsorblock tridactyl violentmonkey darkreader @@ -385,6 +384,8 @@ in { "gfx.webrender.all" = true; "media.ffmpeg.vaapi.enabled" = true; + + "identity.sync.tokenserver.uri" = "https://ffsync.jacekpoz.pl/1.0/sync/1.5"; }; }; "unschizo" = { @@ -404,7 +405,6 @@ in { }; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin - sponsorblock dearrow tridactyl violentmonkey @@ -464,6 +464,8 @@ in { "gfx.webrender.all" = true; "media.ffmpeg.vaapi.enabled" = true; + + "identity.sync.tokenserver.uri" = "https://ffsync.jacekpoz.pl/1.0/sync/1.5"; }; }; }; diff --git a/modules/gui/hyprland.nix b/modules/gui/hyprland.nix index b122426e..f57041dd 100644 --- a/modules/gui/hyprland.nix +++ b/modules/gui/hyprland.nix @@ -21,6 +21,10 @@ in { options.myOptions.programs.hyprland = { enable = mkEnableOption "enable hiper ląd"; + startupSound = mkOption { + type = types.path; + description = "sound to play on hyprland startup"; + }; }; disabledModules = [ "programs/hyprland.nix" ]; @@ -37,11 +41,15 @@ in { pkgs.xdg-desktop-portal-gtk inputs.xdg-desktop-portal-hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; + # TODO look into and make use of this + config.common.default = "*"; }; home-manager.users.${config'.username} = { imports = [ inputs.hyprland.homeManagerModules.default ]; + xdg.dataFile."hypr/startup_sound".source = cfg.startupSound; + wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; @@ -51,7 +59,7 @@ in { ]; extraConfig = '' #laptop - monitor=eDP-1,2560@1440@60,0x0,1 + monitor=eDP-1,2560x1440@165,0x0,1 #second monitor monitor=HDMI-A-1,2560x1440@144,2560x0,1 @@ -79,7 +87,7 @@ in { workspace = special:btop, decorate:false workspace = special:amdgpu_top, decorate:false - workspace = special:helvum, decorate:false + workspace = special:pipewire, decorate:false workspace = special:nixos,decorate:false workspace = special:rog,decorate:false workspace = special:keepassxc,decorate:false @@ -117,6 +125,9 @@ in { #allow_tearing=true } + #env = WLR_DRM_NO_ATOMIC,1 + #windowrulev2 = immediate, title:^(osu!)$ + decoration { #rounding=0 rounding=10 @@ -175,6 +186,7 @@ in { windowrulev2 = float, class:^(Vieb)$ windowrulev2 = float, title:^(Picture-in-Picture)$ windowrulev2 = float, title:^(.*)(Choose User Profile)(.*)$ + windowrulev2 = float, title:^(blob:null/)(.*)$ windowrulev2 = float, class:^(xdg-desktop-portal-gtk)$ windowrulev2 = float, class:^(code), title: ^(Open*) @@ -183,8 +195,6 @@ in { windowrulev2 = float, class:^(org.keepassxc.KeePassXC)$ windowrulev2 = size 960 670, title:^(ROG Control Center)$ - #windowrulev2 = immediate, title:^(osu!)$ - bind = SUPER, RETURN, exec, ${foot}/bin/${if config.myOptions.programs.foot.server then "footclient" else "foot"} bind = SUPER, W, exec, ${removeSuffix " %U" config.home-manager.users.${config'.username}.xdg.desktopEntries.firefox-schizo.exec} bind = SUPERSHIFT, W, exec, ${removeSuffix " %U" config.home-manager.users.${config'.username}.xdg.desktopEntries.firefox-unschizo.exec} @@ -254,7 +264,7 @@ in { bind = SUPERSHIFT, X, exec, ${hyprland}/bin/hyprctl kill bind = SUPER, B, togglespecialworkspace, btop bind = SUPER, A, togglespecialworkspace, amdgpu_top - bind = SUPER, V, togglespecialworkspace, helvum + bind = SUPER, V, togglespecialworkspace, pipewire bind = SUPER, N, togglespecialworkspace, nixos bind = SUPER, R, togglespecialworkspace, rog bind = SUPER, X, togglespecialworkspace, keepassxc @@ -268,17 +278,21 @@ in { pass_mouse_when_bound=0 } + ${if cfg.startupSound != "" then "exec-once=${pkgs.mpv}/bin/mpv --no-video --volume=100 ~/${config.home-manager.users.${config'.username}.xdg.dataFile."hypr/startup_sound".target}" else ""} + exec-once=${pkgs.systemd}/bin/systemctl start --user waybar.service exec=${pkgs.systemd}/bin/systemctl restart --user waybar.service exec=${pkgs.procps}/bin/pkill btop exec=${pkgs.procps}/bin/pkill amdgpu_top exec=${pkgs.procps}/bin/pkill helvum + exec=${pkgs.procps}/bin/pkill pavucontrol exec=[workspace special:btop silent;tile] ${foot}/bin/foot -e ${pkgs.btop}/bin/btop exec=[workspace special:amdgpu_top silent;tile] ${pkgs.amdgpu_top}/bin/amdgpu_top --gui -i 0 exec=[workspace special:amdgpu_top silent;tile] ${pkgs.amdgpu_top}/bin/amdgpu_top --gui -i 1 - exec=[workspace special:helvum silent;tile] ${pkgs.helvum}/bin/helvum + exec=[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum + exec=[workspace special:pipewire silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol exec-once=[workspace special:nixos silent;tile] cd ~/niksos; ${foot}/bin/foot exec-once=[workspace special:rog silent;tile] ${pkgs.asusctl}/bin/rog-control-center exec-once=[workspace special:keepassxc silent;tile] ${pkgs.keepassxc}/bin/keepassxc diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix index b6874a71..8c278480 100644 --- a/modules/gui/qt.nix +++ b/modules/gui/qt.nix @@ -32,11 +32,11 @@ in { # thanks raf :3 https://github.com/NotAShelf/nyx/blob/main/homes/notashelf/themes/qt.nix qt = { enable = true; - #platformTheme = "qtct"; + platformTheme = "qtct"; style = { inherit (cfg) name; package = cfg.package.override { - flavour = cfg.variant; + flavour = [ cfg.variant ]; accents = [ cfg.accentColour ]; }; }; @@ -52,7 +52,7 @@ in { ]; sessionVariables = { - QT_STYLE_OVERRIDE = "kvantum"; + #QT_STYLE_OVERRIDE = "kvantum"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_QPA_PLATFORM = "wayland;xcb"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; diff --git a/modules/other/default.nix b/modules/other/default.nix index 5e66bff8..d65db184 100644 --- a/modules/other/default.nix +++ b/modules/other/default.nix @@ -1,5 +1,6 @@ _: { imports = [ + ./preserve-system.nix ./xdg.nix ]; } diff --git a/modules/other/preserve-system.nix b/modules/other/preserve-system.nix new file mode 100644 index 00000000..51c84f5a --- /dev/null +++ b/modules/other/preserve-system.nix @@ -0,0 +1,6 @@ +{ + self, + ... +}: { + environment.etc."current-flake".source = self; +} diff --git a/modules/services/anki-sync-server.nix b/modules/services/anki-sync-server.nix new file mode 100644 index 00000000..a6392205 --- /dev/null +++ b/modules/services/anki-sync-server.nix @@ -0,0 +1,57 @@ +{ + config, + lib, + pkgs, + ... +}: with lib; let + cfg = config.services.anki-sync-server; +in { + options.services.anki-sync-server = { + enable = mkEnableOption (lib.mdDoc "anki-sync-server"); + + package = mkOption { + type = types.package; + default = pkgs.anki-bin; + description = lib.mdDoc "The package to use for the anki sync server."; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc "anki-sync-server host"; + }; + + port = mkOption { + type = types.port; + default = 27701; + description = lib.mdDoc "anki-sync-server port"; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Whether to open the firewall for the specified port."; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.anki-sync-server = { + description = "Selfhosted Anki sync server."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ cfg.package ]; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "anki-sync-server"; + ExecStart = "${cfg.package}/bin/anki --syncserver"; + Environment = ''SYNC_BASE="/var/lib/anki-sync-server" SYNC_HOST="${cfg.host}" SYNC_PORT="${cfg.port}"''; + EnvironmentFile = config.age.secrets.anki-user-credentials.path; + Restart = "always"; + }; + }; + }; +} diff --git a/modules/services/fcitx/default.nix b/modules/services/fcitx/default.nix new file mode 100644 index 00000000..e8ef05c1 --- /dev/null +++ b/modules/services/fcitx/default.nix @@ -0,0 +1,115 @@ +{ + config, + config', + lib, + pkgs, + ... +}: with lib; let + cfg = config.myOptions.services.fcitx5; +in { + # stolen from https://git.outfoxxed.me/outfoxxed/nixnew/src/branch/master/modules/user/modules/fcitx5 + options.myOptions.services.fcitx5.enable = mkEnableOption "enable fcitx5"; + + config = mkIf cfg.enable { + i18n.inputMethod = { + enabled = "fcitx5"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + fcitx5-gtk + libsForQt5.fcitx5-qt + ]; + }; + + home-manager.users.${config'.username} = { + xdg.configFile = { + "fcitx5/config".text = '' + [Hotkey] + # Enumerate when press trigger key repeatedly + EnumerateWithTriggerKeys=False + # Enumerate Input Method Forward + EnumerateForwardKeys= + # Enumerate Input Method Backward + EnumerateBackwardKeys= + # Skip first input method while enumerating + EnumerateSkipFirst=False + # Enumerate Input Method Group Forward + EnumerateGroupForwardKeys= + # Enumerate Input Method Group Backward + EnumerateGroupBackwardKeys= + # Activate Input Method + ActivateKeys= + # Deactivate Input Method + DeactivateKeys= + # Default Previous page + PrevPage= + # Default Next page + NextPage= + # Default Previous Candidate + PrevCandidate= + # Default Next Candidate + NextCandidate= + # Toggle embedded preedit + TogglePreedit= + + [Hotkey/TriggerKeys] + 0=Control+grave + + [Hotkey/AltTriggerKeys] + 0=Shift_L + + [Behavior] + # Active By Default + ActiveByDefault=False + # Share Input State + ShareInputState=No + # Show preedit in application + PreeditEnabledByDefault=True + # Show Input Method Information when switch input method + ShowInputMethodInformation=True + # Show Input Method Information when changing focus + showInputMethodInformationWhenFocusIn=False + # Show compact input method information + CompactInputMethodInformation=True + # Show first input method information + ShowFirstInputMethodInformation=True + # Default page size + DefaultPageSize=5 + # Override Xkb Option + OverrideXkbOption=False + # Custom Xkb Option + CustomXkbOption= + # Force Enabled Addons + EnabledAddons= + # Force Disabled Addons + DisabledAddons= + # Preload input method to be used by default + PreloadInputMethod=True + ''; + "fcitx5/profile".text = '' + [Groups/0] + # Group Name + Name=Default + # Layout + Default Layout=us + # Default Input Method + DefaultIM=mozc + + [Groups/0/Items/0] + # Name + Name=keyboard-us + # Layout + Layout= + + [Groups/0/Items/1] + # Name + Name=mozc + # Layout + Layout= + + [GroupOrder] + 0=Default + ''; + }; + }; + }; +} diff --git a/modules/services/greetd.nix b/modules/services/greetd.nix index 5e41fb81..63f736af 100644 --- a/modules/services/greetd.nix +++ b/modules/services/greetd.nix @@ -13,6 +13,11 @@ force_default_wallpaper=0 } + animations { + enabled=0 + first_launch_animation=0 + } + workspace=1,default:true,gapsout:0,gapsin:0,border:false,decorate:false ${if config.myOptions.programs.waybar.enable then "exec-once=systemctl --user stop waybar.service" else ""} diff --git a/modules/tui/default.nix b/modules/tui/default.nix index 217bc613..e845d80e 100644 --- a/modules/tui/default.nix +++ b/modules/tui/default.nix @@ -3,5 +3,6 @@ _: { ./neovim ./btop.nix ./helix.nix + ./newsboat.nix ]; } diff --git a/modules/tui/neovim/default.nix b/modules/tui/neovim/default.nix index d1b2007c..abd0eae8 100644 --- a/modules/tui/neovim/default.nix +++ b/modules/tui/neovim/default.nix @@ -1,213 +1,204 @@ { - config, - config', - inputs, - lib, - pkgs, - ... -}: with lib; let - cfg = config.myOptions.programs.neovim; + config, + config', + inputs, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.myOptions.programs.neovim; in { - options.myOptions.programs.neovim.enable = mkEnableOption "enable neovim"; + options.myOptions.programs.neovim.enable = mkEnableOption "enable neovim"; - config = mkIf cfg.enable { - home-manager.users.${config'.username} = { - imports = [ inputs.neovim-flake.homeManagerModules.default ]; + config = mkIf cfg.enable { + home-manager.users.${config'.username} = { + imports = [inputs.nixvim.homeManagerModules.nixvim]; - programs.neovim-flake = { - enable = true; - settings = { - vim = { - package = pkgs.neovim-nightly; - viAlias = true; - vimAlias = true; - enableEditorconfig = true; - preventJunkFiles = true; - enableLuaLoader = true; - - scrollOffset = 7; - - useSystemClipboard = false; - - maps = { - normal = { - "gD" = { - action = "vim.lsp.buf.declaration"; - lua = true; - }; - "gd" = { - action = "vim.lsp.buf.definition"; - lua = true; - }; - "gi" = { - action = "vim.lsp.buf.implementation"; - lua = true; - }; - "gr" = { - action = "vim.lsp.buf.references"; - lua = true; - }; - "K" = { - action = "vim.lsp.buf.hover"; - lua = true; - }; - "" = { - action = "vim.lsp.buf.signature_help"; - lua = true; - }; - "wa" = { - action = "vim.lsp.buf.add_workspace_folder"; - lua = true; - }; - "wr" = { - action = "vim.lsp.buf.remove_workspace_folder"; - lua = true; - }; - "wl" = { - action = '' - function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end - ''; - lua = true; - }; - "D" = { - action = "vim.lsp.buf.type_definition"; - lua = true; - }; - "r" = { - action = "vim.lsp.buf.rename"; - lua = true; - }; - "a" = { - action = "vim.lsp.buf.code_action"; - lua = true; - }; - "e" = { - action = "vim.diagnostic.open_float"; - lua = true; - }; - "q" = { - action = "vim.diagnostic.setloclist"; - lua = true; - }; - "[d" = { - action = "vim.diagnostic.goto_prev"; - lua = true; - }; - "]d" = { - action = "vim.diagnostic.goto_next"; - lua = true; - }; - "" = { - action = '' - function() - vim.lsp.buf.format { async = true } - end - ''; - lua = true; - }; - }; - }; - - treesitter = { - enable = true; - fold = true; - grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ - lua - rust - markdown - markdown-inline - python - cmake - cpp - ]; - }; - - startPlugins = [ - (pkgs.fetchFromGitHub { - owner = "slint-ui"; - repo = "vim-slint"; - rev = "9badce3860297562bb5e80ba1666628f9e0ac632"; - hash = "sha256-RKsRGE7KzAxmiviaikoXIVydjt8XxYXS/OMx8ol8kEQ="; - }) - ]; - - lsp = { - formatOnSave = false; - }; - - languages = { - enableLSP = true; - enableFormat = true; - enableTreesitter = true; - enableExtraDiagnostics = true; - - nix.enable = true; - html.enable = true; - ts.enable = true; - rust = { - enable = true; - crates.enable = true; - }; - - clang = { - enable = true; - lsp = { - enable = true; - server = "clangd"; - }; - }; - - java = { - enable = true; - treesitter.enable = true; - lsp.enable = true; - }; - }; - - autocomplete = { - enable = true; - }; - - telescope.enable = true; - - git = { - enable = true; - gitsigns = { - enable = true; - codeActions = true; - }; - }; - #filetree.chadtree = { - # enable = true; - #}; - - filetree.nvimTree = { - enable = true; - mappings = { - toggle = "v"; - }; - disableNetrw = true; - - openOnSetup = false; - }; - - terminal.toggleterm = { - enable = true; - direction = "float"; - mappings.open = ""; - }; - - theme = { - enable = true; - name = "catppuccin"; - style = "mocha"; - transparent = true; - }; - }; - }; - }; + programs.nixvim = { + enable = true; + defaultEditor = true; + package = pkgs.neovim-nightly; + enableMan = true; + colorscheme = "catppuccin"; + colorschemes.catppuccin = { + enable = true; + flavour = "mocha"; + transparentBackground = true; }; + + options = { + number = true; + relativenumber = true; + autoread = true; + so = 7; + cmdheight = 1; + ignorecase = true; + smartcase = true; + showmatch = true; + timeoutlen = 500; + encoding = "utf8"; + smarttab = true; + shiftwidth = 4; + tabstop = 4; + expandtab = true; + linebreak = true; + smartindent = true; + updatetime = 300; + hidden = true; + background = "dark"; + mousemoveevent = true; + smoothscroll = true; + }; + + globals = { + mapleader = " "; + }; + + keymaps = [ + { + action = "vim.cmd.CHADopen"; + lua = true; + key = "v"; + } + ]; + + plugins = { + airline = { + enable = true; + powerline = true; + theme = "catppuccin"; + }; + fugitive.enable = true; + treesitter = { + enable = true; + ensureInstalled = [ + "lua" + "rust" + "markdown" + "markdown-inline" + "python" + "cmake" + "cpp" + "c" + ]; + folding = false; + indent = true; + nixvimInjections = true; + incrementalSelection.enable = true; + }; + coq-nvim = { + enable = true; + autoStart = "shut-up"; + installArtifacts = true; + recommendedKeymaps = true; + }; + chadtree = { + enable = true; + keymap.openFileFolder.tertiary = ["t" ""]; + }; + toggleterm = { + enable = true; + direction = "float"; + openMapping = ""; + shadeTerminals = true; + shadingFactor = 2; + size = 10; + }; + # TODO laytan/cloak.nvim + gitsigns = { + enable = true; + currentLineBlame = true; + numhl = true; + signcolumn = true; + wordDiff = true; + }; + lsp = { + enable = true; + servers = { + rust-analyzer = { + enable = true; + installCargo = false; + installRustc = false; + }; + lua-ls.enable = true; + clangd.enable = true; + nil_ls.enable = true; + bashls.enable = true; + }; + #onAttach = '' + # vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + # local bufopts = { noremap = true, silent = true, buffer = bufnr } + # vim.keymap.set('n', 'wl', function() + # print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + # end, bufopts) + # vim.keymap.set('n', '', function() vim.lsp.buf.format { async = true } end, bufopts) + #''; + keymaps = { + lspBuf = { + gD = "declaration"; + gd = "definition"; + K = "hover"; + gi = "implementation"; + "" = "signature_help"; + "wa" = "add_workspace_folder"; + "wr" = "remove_workspace_folder"; + "wl" = "list_workspace_folders"; + "D" = "type_definition"; + "r" = "rename"; + "a" = "code_action"; + gr = "references"; + "" = "format"; + }; + diagnostic = { + "e" = "open_float"; + "j" = "goto_prev"; + "k" = "goto_next"; + "q" = "setloclist"; + }; + # TODO maybe change + silent = false; + }; + }; + rust-tools = { + enable = true; + crateGraph = { + enabledGraphvizBackends = ["png" "svg"]; + backend = "x11"; + }; + inlayHints = { + auto = true; + onlyCurrentLine = true; + showParameterHints = true; + }; + }; + leap.enable = true; + fidget.enable = true; + telescope = { + enable = true; + keymaps = { + "ff" = "find_files"; + "fg" = "live_grep"; + "fb" = "buffers"; + "fh" = "help_tags"; + }; + # TODO maybe change + keymapsSilent = false; + }; + comment-nvim.enable = true; + crates-nvim.enable = true; + harpoon = { + enable = true; + enableTelescope = true; + keymapsSilent = false; + }; + }; + + extraPlugins = with pkgs.vimPlugins; [ + zen-mode-nvim + ]; + }; }; + }; } diff --git a/modules/tui/newsboat.nix b/modules/tui/newsboat.nix new file mode 100644 index 00000000..125c851a --- /dev/null +++ b/modules/tui/newsboat.nix @@ -0,0 +1,73 @@ +{ + config, + config', + lib, + ... +}: with lib; let + cfg = config.myOptions.programs.newsboat; +in { + options.myOptions.programs.newsboat.enable = mkEnableOption "enable newsboat"; + + config = mkIf cfg.enable { + home-manager.users.${config'.username} = { + programs.newsboat = { + enable = true; + autoReload = true; + extraConfig = '' + download-full-page yes + download-retries 3 + error-log /dev/null + cookie-cache ~/.cache/newsboat/cookies.txt + bind-key j down + bind-key k up + bind-key G end + bind-key g home + bind-key d pagedown + bind-key u pageup + bind-key a toggle-article-read + + color listnormal color15 default + color listnormal_unread color2 default + color listfocus_unread color2 color0 + color listfocus default color0 + color background default default + color article default default + color end-of-text-marker color8 default + color info color4 color8 + color hint-separator default color8 + color hint-description default color8 + color title color14 color8 + + highlight article "^(Feed|Title|Author|Link|Date): .+" color4 default bold + highlight article "^(Feed|Title|Author|Link|Date):" color14 default bold + highlight article "\\((link|image|video)\\)" color8 default + highlight article "https?://[^ ]+" color4 default + highlight article "\[[0-9]+\]" color6 default bold + user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36" + ''; + urls = [ + { + title = "NixOS Weekly"; + url = "https://weekly.nixos.org/feeds/all.rss.xml"; + } + { + title = "Hacker News"; + url = "https://hnrss.org/newest"; + } + { + title = "Phoronix"; + url = "https://www.phoronix.com/rss.php"; + } + { + title = "LWN"; + url = "https://lwn.net/headlines/rss"; + } + { + title = "Hyprland Commit Feed"; + url = "https://github.com/hyprwm/Hyprland/commits/main.atom"; + } + ]; + }; + }; + }; +} diff --git a/secrets/eturnal-turn-secret.age b/secrets/eturnal-turn-secret.age new file mode 100644 index 00000000..c40bf62c Binary files /dev/null and b/secrets/eturnal-turn-secret.age differ diff --git a/secrets/firefox-syncserver-secrets.age b/secrets/firefox-syncserver-secrets.age new file mode 100644 index 00000000..69a6f769 --- /dev/null +++ b/secrets/firefox-syncserver-secrets.age @@ -0,0 +1,13 @@ +age-encryption.org/v1 +-> ssh-ed25519 05IAmg Q5Q02J6CGyf4zY8QaVGwGdVGnDFdbR9X6Yyl9qOSLSE +f0+qlioiZAVhwlCU4852Jrlj1RXz5N3M6lAEmne94Ns +-> ssh-ed25519 HC8P8A ChB/hMIOC4kuF3qr3hoihzHUew+OQ/4+8HqeqCFX3zM +LOdqk/SnJqlbSlo1Kd77ZOCFlLaDLMv5bRwgFzHwk3A +-> ssh-ed25519 sItgaw wjhyB82a6wu7TTBY8qnMwPoTTMkvQErPorPb+vh/XDQ +KF+eHQkRIZzZtFEuavTLzwUkTOXohA0RaCRgCmULS4U +-> ssh-ed25519 YQNd1g 9+4Dk+RioFhqD1EDdSDaA6abrv1nFtXdtzyOWI+ZbwQ +uJCBoQEmlPbiHqmejVB/kVP9899z89U756nHdCzsKTA +-> 6V]-grease YJ} M/%3t4Q +Wtz31Eqy2mUNJQ +--- 9bAuZp6n+rkfsnx4NAbnMGLrhTghunPvFCTc1hC/7v8 +?)ōgqz Ui7qׂJ[GʪcJ# o &ɫ0Qf ٌ݇2Q~zY{dǤ͋$Qg{u>.ľ~K+6l9O8 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b0ad4253..920b02ea 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,4 +10,6 @@ let in { "anki-user-credentials.age".publicKeys = niks ++ chmura; "discord-autodelete-config.age".publicKeys = niks ++ chmura; + "eturnal-turn-secret.age".publicKeys = niks ++ chmura; + "firefox-syncserver-secrets.age".publicKeys = niks ++ chmura; }