From ea13f39c9f10bd3a0d9d9a63bc702f0e53f8ddf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Tue, 10 Oct 2023 11:53:30 +0200 Subject: [PATCH] build: bump inputs --- flake.lock | 198 ++++++++++++++++++++++++---------------- overlays/packages.nix | 5 + overlays/vimPlugins.nix | 10 +- 3 files changed, 128 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index 4d8dc1b..fdbf8a5 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1695299795, - "narHash": "sha256-rl6WSgyXTbSLXL3ItpbfToSPAS4+rftojSzFWxNuHU4=", + "lastModified": 1696674829, + "narHash": "sha256-t+BQGAghYqDaTE2UdU2t8/oYmebBJ2DRi2GAva5agFw=", "owner": "arkenfox", "repo": "user.js", - "rev": "56f51203bf4fea8aa778b792269205d275a62665", + "rev": "f54d632da585a08185c6164017d79315c331181f", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1695195896, - "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", + "lastModified": 1695973661, + "narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=", "owner": "numtide", "repo": "devshell", - "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", + "rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31", "type": "github" }, "original": { @@ -117,11 +117,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1695380190, - "narHash": "sha256-v1TwBU/mKroZZPWYXujAfOHfIaQw44swa50Jgdkr7OE=", + "lastModified": 1696814493, + "narHash": "sha256-1qArVsJGG2RHbV2iKFpAmM5os3myvwpXMOdFy5nh54M=", "owner": "nix-community", "repo": "disko", - "rev": "98a6ab9b52f8b06db9c3116b1761bbeaf9484408", + "rev": "32ce057c183506cecb0b84950e4eaf39f37e8c75", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1689397210, - "narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=", + "lastModified": 1695684520, + "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce", + "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1695550077, - "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", + "lastModified": 1696737557, + "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", + "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1695455081, - "narHash": "sha256-AtAMze2J5Maol28OLQoCFgppRWEy06Mn9RhduXNmhiI=", + "lastModified": 1696339530, + "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=", "owner": "hyprwm", "repo": "contrib", - "rev": "33663f663e07b4ca52c9165f74e3d793f08b15e7", + "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1695558936, - "narHash": "sha256-KcSkwSDlrt3Xwtit+NTu2aToiRm5Aho9joj2r6nb19w=", + "lastModified": 1696891919, + "narHash": "sha256-h7/lmKV5zfJz/4m/oLib7iTqQ7fpfB599AzW2QRoGtg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "352ceb1117b79cd0bc3fa86ebe435b6909512ddb", + "rev": "8abb6e1cee3e967ff414af0d6a1a31ebced95f5b", "type": "github" }, "original": { @@ -517,11 +517,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1694600309, - "narHash": "sha256-d9LcB+D0bfMu+8UhnUVJ/DX5OVTX6o5dIntdVqEeQDA=", + "lastModified": 1696724955, + "narHash": "sha256-7CczVKotC1RJuSyJMxgzUP11Y1txku9JAga5eFxpA+4=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "e5a18a171d5d6e7c6b9ffdfb9e86fb09055964a1", + "rev": "72735ae6352085ef842f6ed496889115afd76ce4", "type": "github" }, "original": { @@ -563,11 +563,11 @@ }, "master": { "locked": { - "lastModified": 1695566498, - "narHash": "sha256-pitC2KSFFQr0VVWTWrhOYM3JkHMTGJ+n2f3swZNRjq8=", + "lastModified": 1696923230, + "narHash": "sha256-Evn8vdETCSxQH6txfwYIN7N69RKSfZLkN7dSqfnRYRw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46338210c41bbb92502517cccbb2223973a17a62", + "rev": "906535b6191830a247e004f53d74359a60883ba4", "type": "github" }, "original": { @@ -608,11 +608,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1695509205, - "narHash": "sha256-nV3opNLzLMfzL0yI+xnIeNIOnvOI467CiABxHTQUrwY=", + "lastModified": 1696892794, + "narHash": "sha256-KQ1X1CLjabnnLItHb2zlrSZzj4lQNkdZMx84QWcU9qA=", "owner": "neovim", "repo": "neovim", - "rev": "bc0bf9d030bbcb01db69c44cf88b95ca41dd3065", + "rev": "43f22853fecf312713deed983b9cde1a6bda6ebd", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1695513850, - "narHash": "sha256-tzhm05TH22eI+ePzuPHrMgq2sjLkEW1q1E515+VRVuw=", + "lastModified": 1696896059, + "narHash": "sha256-GLJJRb2PSI9Hq1J4D0YVMV6lxHPP2QilEAWeIrEQSEI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "07c3b00574cb6645d92786c5a5531cb20426785d", + "rev": "4ea129658fe3e7ecaebe574093ed3fe9673b5f6c", "type": "github" }, "original": { @@ -644,6 +644,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696736548, + "narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-lazy-nvim": { "locked": { "lastModified": 1694868321, @@ -669,16 +689,17 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1695405275, - "narHash": "sha256-R4TX73TAzrW03Rdsa4HNz5ASKx5S1AKa/3SAntUHglg=", + "lastModified": 1685886360, + "narHash": "sha256-mQ6Eryo7CFkt8KHVJcbg0HfXMGFrjMq04XnL9b9TsX0=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "cae2c834f2a19db35cd46d233f5b59086b24a6f1", + "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851", "type": "github" }, "original": { "owner": "privatevoid-net", "repo": "nix-super", + "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851", "type": "github" } }, @@ -701,11 +722,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -784,11 +805,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1696725822, + "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", "type": "github" }, "original": { @@ -864,11 +885,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1696757521, + "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "2646b294a146df2781b1ca49092450e8a32814e1", "type": "github" }, "original": { @@ -880,11 +901,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1696757521, + "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "2646b294a146df2781b1ca49092450e8a32814e1", "type": "github" }, "original": { @@ -910,14 +931,29 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1696923989, + "narHash": "sha256-cANE1rSfOb3yxQ+bH7CTXZbj34AnQyzu0g22JDbLUpE=", + "owner": "nix-community", + "repo": "NUR", + "rev": "0268065df586f8cae6b648432ebbda3b5ac96503", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1695699913, - "narHash": "sha256-9uH3ZpZ7zk/84agbagNxUZL49h+P5j7gew+2h04psvg=", + "lastModified": 1696572942, + "narHash": "sha256-i3lDsFwoMddpN1I4t3Fj+Dthyxq7twCgpYuNtlvfI5Y=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4", + "rev": "2b361e043810d5587d9af0787f8ce40da92ec5e9", "type": "github" }, "original": { @@ -929,11 +965,11 @@ "nvim-puppeteer": { "flake": false, "locked": { - "lastModified": 1695758417, - "narHash": "sha256-rkaQUOXxNfkib0kPv+z8ncZiwgSP26+jwNtN9ydcvLQ=", + "lastModified": 1696887151, + "narHash": "sha256-voQru65IC5OM5JVwa1v62O7tmsIdGZJ6BS75lHt0Pxo=", "owner": "chrisgrieser", "repo": "nvim-puppeteer", - "rev": "9cd2d2e2630db6377538f5f0dccdea3517db2ce1", + "rev": "4a2c68b93366eca5bca9e6b71e6cc8d643cfdca5", "type": "github" }, "original": { @@ -968,11 +1004,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1694364351, - "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=", + "lastModified": 1696846637, + "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7", + "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", "type": "github" }, "original": { @@ -984,11 +1020,11 @@ "rofi-wayland": { "flake": false, "locked": { - "lastModified": 1695513431, + "lastModified": 1695649959, "narHash": "sha256-WG1EyBYTbDsK4RsPgp8K/PlscvRSNthQSyN3cqxuXcc=", "owner": "lbonn", "repo": "rofi", - "rev": "b8dedc8836b552a0bba5f4702be63dd8521c6fbb", + "rev": "9d11a2b4a9095b3f0a092155f749900f7eb8e047", "type": "github" }, "original": { @@ -1016,9 +1052,11 @@ "impermanence": "impermanence", "master": "master", "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-index-database": "nix-index-database", "nix-lazy-nvim": "nix-lazy-nvim", "nix-super": "nix-super", "nixpkgs": "nixpkgs_8", + "nur": "nur", "nvim-lspconfig": "nvim-lspconfig", "nvim-puppeteer": "nvim-puppeteer", "nvim-treesitter": "nvim-treesitter", @@ -1049,11 +1087,11 @@ }, "stable": { "locked": { - "lastModified": 1695416179, - "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "lastModified": 1696697597, + "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", "type": "github" }, "original": { @@ -1172,11 +1210,11 @@ "telescope-nvim": { "flake": false, "locked": { - "lastModified": 1695500955, - "narHash": "sha256-Sy4cDVL9HdIj8/UkCnusxACuzA6PKQiuf5Otwtlf8HA=", + "lastModified": 1696709104, + "narHash": "sha256-v68sId4cWHneUaaYp2neVtBobNZo8lsxKoBhRF4yZrI=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8", + "rev": "5a747a9587e4bfc4ae086a38cc679fe54f983b69", "type": "github" }, "original": { @@ -1227,18 +1265,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1695277534, - "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=", + "lastModified": 1696410538, + "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", "owner": "wlroots", "repo": "wlroots", - "rev": "98a745d926d8048bc30aef11b421df207a01c279", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "98a745d926d8048bc30aef11b421df207a01c279", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" } }, diff --git a/overlays/packages.nix b/overlays/packages.nix index be4efad..df04332 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -26,4 +26,9 @@ final: prev: echo "$selected" ''; }; + xorg = prev.xorg // { + lndir = prev.xorg.lndir.overrideAttrs (_: { + meta.mainProgram = "lndir"; + }); + }; } diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index 9794b9a..b7b6b8e 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -4,25 +4,25 @@ _: prev: with lib.my; { vimPlugins = prev.vimPlugins // { - smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + smartcolumn-nvim = prev.vimUtils.buildVimPlugin { pname = "smartcolumn-nvim"; version = mkVersionInput inputs.smartcolumn-nvim; src = inputs.smartcolumn-nvim; }; - telekasten-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + telekasten-nvim = prev.vimUtils.buildVimPlugin { pname = "telekasten-nvim"; version = mkVersionInput inputs.telekasten-nvim; src = inputs.telekasten-nvim; }; - hmts-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + hmts-nvim = prev.vimUtils.buildVimPlugin { pname = "hmts-nvim"; version = mkVersionInput inputs.hmts-nvim; src = inputs.hmts-nvim; }; - actions-preview-nvim = prev.vimUtils.buildVimPluginFrom2Nix { + actions-preview-nvim = prev.vimUtils.buildVimPlugin { pname = "actions-preview-nvim"; version = mkVersionInput inputs.actions-preview-nvim; src = inputs.actions-preview-nvim; @@ -44,7 +44,7 @@ with lib.my; src = inputs.nvim-lspconfig; }); - nvim-puppeteer = prev.vimUtils.buildVimPluginFrom2Nix { + nvim-puppeteer = prev.vimUtils.buildVimPlugin { pname = "nvim-puppeteer"; version = mkVersionInput inputs.nvim-puppeteer; src = inputs.nvim-puppeteer;