From 1f10696b64bf4cdf9b28240023700c098164eaef Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 28 Jan 2025 18:24:50 +0100 Subject: [PATCH] minor fixes and flake lock --- flake.lock | 256 ++++++++++++---------- modules/nixos/services/locate/default.nix | 1 - nix/substituters/default.nix | 2 - 3 files changed, 137 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 7899cce7..d33739f1 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1737811239, - "narHash": "sha256-X0C4HEcw3AdSgEH6YDHwC6w8xBxK0pVKyUYMoXU2f1w=", + "lastModified": 1737973837, + "narHash": "sha256-LrM+QVWUZhPKbjm2I5EkypupivGHjr/AM4rCaNbCFfE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "be39fe2f8f4e922fc5f2402377531191f96f6b02", + "rev": "f19af140dacd0e211a25cf907be46356347e190f", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1737873155, - "narHash": "sha256-6g9lSb6Vq/NnXdqKSSzQ09Wd2kK/mWIvv3ZrVhLYUOg=", + "lastModified": 1738045985, + "narHash": "sha256-5ZrKifAabO9qwoA6dzZzoQUsDQ6JEo5XA0fCEeBftv4=", "owner": "nix-community", "repo": "fenix", - "rev": "11391594600c119f02b3ee864decca1d6767f1b6", + "rev": "4745897c4574c0c92c58e7517b92e3a946555223", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1737779447, - "narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=", + "lastModified": 1738076396, + "narHash": "sha256-EHGwh2do2JEcYHxaXBq1H7z/S2FkbHEpnNWhvgAmpJ8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "71e62f96fa4d286eda835048428d5be96e9f87c1", + "rev": "603639ad44e82afbcd8cdb01d7050abf7c538e9b", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737868873, - "narHash": "sha256-kZe1ME1ZI4tDw4+mFxlet8dxGdp5GN67Y167fqSqcbs=", + "lastModified": 1738073973, + "narHash": "sha256-+Bjgq2LuCrFQ8RA/25dWSAguFLH53TxoQZWuX7fb4gc=", "owner": "helix-editor", "repo": "helix", - "rev": "aac0ce5fd13df7f275b6523da58dec1ec054a8c8", + "rev": "6049f2035be3e218da327b51d8e4bfd36242dd43", "type": "github" }, "original": { @@ -569,11 +569,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -669,11 +669,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1737985436, + "narHash": "sha256-zx8FdI4zr2GhNyD1YGAqa2ymodAObTSAdwuWwVucewo=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "23783b96036f5506fdaf8b2250a1ef849d57f0d3", "type": "github" }, "original": { @@ -713,6 +713,7 @@ }, "hypridle": { "inputs": { + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -721,6 +722,7 @@ "hyprland", "hyprutils" ], + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "hyprland", "nixpkgs" @@ -731,11 +733,11 @@ ] }, "locked": { - "lastModified": 1737635556, - "narHash": "sha256-Ahb+xhd80dlzgRSICthPktiDcvi+DqDtHP+YX0TrSdE=", + "lastModified": 1737984253, + "narHash": "sha256-h4KWLijrHK7rugD2oV8JfVgloD+xPW1jCVT2B7K+bjQ=", "owner": "hyprwm", "repo": "hypridle", - "rev": "33ac8cae64226d3a0b63ebf77a22455807895455", + "rev": "15ca902b2cb845a8a5378ec022c11a4a77155b83", "type": "github" }, "original": { @@ -749,22 +751,22 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": "hyprland-protocols_2", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1737842278, - "narHash": "sha256-5N0ExKra/jw3HI/0EEIzmeJKHN9RIBV7ceR/sxQR11s=", + "lastModified": 1738059592, + "narHash": "sha256-xyGGTu6JazGtrI30RSNJrs+tNn2Xc5a2Oh3eQKtBodQ=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8b1d6e3009c540457068e23e6c2bc201d20ce4d1", + "rev": "1d3904c3e7a8b74ea83669f73ee408bd38390b11", "type": "github" }, "original": { @@ -795,6 +797,31 @@ } }, "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -821,7 +848,11 @@ }, "hyprland-qt-support": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], "nixpkgs": [ "hyprland", "hyprland-qtutils", @@ -850,8 +881,14 @@ "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -864,11 +901,11 @@ ] }, "locked": { - "lastModified": 1737811848, - "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", + "lastModified": 1737981711, + "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", + "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", "type": "github" }, "original": { @@ -878,36 +915,6 @@ } }, "hyprlang": { - "inputs": { - "hyprutils": "hyprutils", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -947,7 +954,7 @@ "hyprland", "hyprutils" ], - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "hyprland", "nixpkgs" @@ -985,7 +992,7 @@ "hyprland", "hyprutils" ], - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwayland-scanner": "hyprwayland-scanner_4", "nixpkgs": [ "hyprland", "nixpkgs" @@ -1010,37 +1017,6 @@ } }, "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -1052,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1737725508, - "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", + "lastModified": 1737978343, + "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", + "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", "type": "github" }, "original": { @@ -1068,11 +1044,11 @@ "hyprwayland-scanner": { "inputs": { "nixpkgs": [ - "hyprland", + "hypridle", "nixpkgs" ], "systems": [ - "hyprland", + "hypridle", "systems" ] }, @@ -1091,6 +1067,31 @@ } }, "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -1115,7 +1116,7 @@ "type": "github" } }, - "hyprwayland-scanner_3": { + "hyprwayland-scanner_4": { "inputs": { "nixpkgs": [ "hyprpaper", @@ -1402,16 +1403,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", - "owner": "NixOS", + "lastModified": 1737929020, + "narHash": "sha256-UC9ARAC8mRxQozZ6eO+KofV2Dd7KShl6X8XZz/ecNHg=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "b200ab4d4c4bc99681909139b900f10ad70bc02b", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "PedroHLC", + "ref": "revert-376078", "repo": "nixpkgs", "type": "github" } @@ -1434,11 +1435,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -1481,11 +1482,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -1700,14 +1701,15 @@ "plugin-vim-repeat": "plugin-vim-repeat", "plugin-vim-startify": "plugin-vim-startify", "plugin-which-key": "plugin-which-key", + "plugin-yanky-nvim": "plugin-yanky-nvim", "systems": "systems_7" }, "locked": { - "lastModified": 1737815146, - "narHash": "sha256-UptKVzFBLGhN25BHsyT9V78FpmWjfXM982YHz8O16T4=", + "lastModified": 1737955438, + "narHash": "sha256-mmggS3U1rT+N18YIAuNSBtfW+n6hQvIZ7nQ1sDFNW+g=", "owner": "notashelf", "repo": "nvf", - "rev": "4242640c9801d6bcd9e72ae942eb92928093b0a5", + "rev": "da48a862a383026b1c7c9b0a09424af657550602", "type": "github" }, "original": { @@ -4358,6 +4360,22 @@ "type": "github" } }, + "plugin-yanky-nvim": { + "flake": false, + "locked": { + "lastModified": 1737126873, + "narHash": "sha256-Gt8kb6sZoNIM2SDWUPyAF5Tw99qMZl+ltUCfyMXgJsU=", + "owner": "gbprod", + "repo": "yanky.nvim", + "rev": "d2696b30e389dced94d5acab728f524a25f308d2", + "type": "github" + }, + "original": { + "owner": "gbprod", + "repo": "yanky.nvim", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -4455,11 +4473,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1737831834, - "narHash": "sha256-Nd8Qd8kWrJSAaPD/VGVm98ntCIJ4d9ZkfDSySWM0bbU=", + "lastModified": 1738009017, + "narHash": "sha256-3GK8jd6SwRrvcvJAK4PftvQavh8bv6hXl/iLovPTuio=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "90bf50c0112db1494233401b6c0f895fb3210ddd", + "rev": "a995319633b82a69fcde588652d12da209862570", "type": "github" }, "original": { diff --git a/modules/nixos/services/locate/default.nix b/modules/nixos/services/locate/default.nix index f0e146e4..aeb8b647 100644 --- a/modules/nixos/services/locate/default.nix +++ b/modules/nixos/services/locate/default.nix @@ -14,7 +14,6 @@ in { services.locate = { enable = true; package = pkgs.plocate; - localuser = null; }; }; } diff --git a/nix/substituters/default.nix b/nix/substituters/default.nix index 79c95a40..06abce41 100644 --- a/nix/substituters/default.nix +++ b/nix/substituters/default.nix @@ -9,7 +9,6 @@ "https://nix-gaming.cachix.org" "https://yazi.cachix.org" "https://chaotic-nyx.cachix.org" - "https://cache.garnix.io" ]; trusted-public-keys = [ @@ -21,7 +20,6 @@ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; }