From d6ae3a5d1bc7119cfcf8eeb297ed09930dab8ddc Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Sun, 9 Aug 2026 00:21:31 +0100 Subject: [PATCH] checkpoint: pre completion-latency fixes --- config/hosts/aspects/doloro-desktop/home.nix | 2 +- config/inputs.nix | 2 + config/modules/fish.nix | 4 + config/modules/nixvim/default.nix | 31 +- config/modules/services/rtmp-to-whip.nix | 2 +- flake.lock | 363 +++++++++++-------- flake.nix | 1 + 7 files changed, 249 insertions(+), 156 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index a0a1dbc..d776c5c 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -102,7 +102,7 @@ # pear-desktop prismlauncher # deadlock-mod-manager - inputs.nik-pkgs.packages.x86_64-linux.grimoire + inputs.grimoire.packages.x86_64-linux.grimoire # gamescope android-studio blender diff --git a/config/inputs.nix b/config/inputs.nix index f99526b..e9eba45 100644 --- a/config/inputs.nix +++ b/config/inputs.nix @@ -7,5 +7,7 @@ }; den.url = "github:vic/den?ref=8101ec865c0bf4027d40b9fd8951e3e435a86d64"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; + # Builds from its own locked nixpkgs (electron lib paths pinned to that rev). + grimoire.url = "github:Slush97/grimoire"; }; } diff --git a/config/modules/fish.nix b/config/modules/fish.nix index 1674841..d4bb6bb 100644 --- a/config/modules/fish.nix +++ b/config/modules/fish.nix @@ -10,6 +10,8 @@ modules.fish = { nixos = { programs.fish.enable = true; + # imports = [ inputs.direnv-instant.nixosModules.direnv-instant ]; + # programs.direnv-instant.enable = true; }; homeManager = { pkgs, ... }: @@ -19,6 +21,8 @@ pkgs.nix-output-monitor # pkgs.devenv ]; + imports = [ inputs.direnv-instant.homeModules.direnv-instant ]; + programs.direnv-instant.enable = true; programs = { fish = { enable = true; diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index f6e3d93..c20a16e 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -50,6 +50,7 @@ # enable = true; # autoLoad = false; # }; + dependencies.rust-analyzer.enable = false; extraPackages = with pkgs; [ # formatters nixfmt-rs @@ -58,9 +59,9 @@ ripgrep nixd tree-sitter - rust-analyzer - rustc - cargo + # rust-analyzer + # rustc + # cargo ]; performance.byteCompileLua = { enable = true; @@ -106,6 +107,20 @@ # }; # }; # }; + rustaceanvim = { + enable = true; + settings = { + server = { + default_settings = { + rust-analyzer = { + cargo.targetDir = true; + files.watcher = "server"; + diagnostics.refresh_update = true; + }; + }; + }; + }; + }; lsp = { enable = true; servers = { @@ -115,11 +130,11 @@ # cmd = "-E"; # }; # }; - rust_analyzer = { - enable = true; - installCargo = false; - installRustc = false; - }; + # rust_analyzer = { + # enable = true; + # installCargo = false; + # installRustc = false; + # }; nixd = { enable = true; settings = { diff --git a/config/modules/services/rtmp-to-whip.nix b/config/modules/services/rtmp-to-whip.nix index c03e2a1..dfd0562 100644 --- a/config/modules/services/rtmp-to-whip.nix +++ b/config/modules/services/rtmp-to-whip.nix @@ -50,7 +50,7 @@ PUBLIC_DOMAIN = "stream.h.doloro.co.uk"; RTC_PORT = "6969"; SIGNUP_CODE = "mreowmreow-pawsatyou"; - RUST_LOG = "info,warn"; + RUST_LOG = "info"; }; volumes = [ "/data/rtmp-to-whip/db:/db" diff --git a/flake.lock b/flake.lock index fdb4d2d..3035b8b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1784368054, - "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=", + "lastModified": 1785877886, + "narHash": "sha256-H2CrAlJD9FsUbSEIhPVK3IyVjnK0vSxPruBef17GcBs=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0", + "rev": "1a10fe26a9f7d989c359e6a9ea61aa2e44d06c36", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1785395241, - "narHash": "sha256-33LyV3D5zCpFXeh6L7QBe+Syb2zWPfeEFgaJb9E8ucU=", + "lastModified": 1786000099, + "narHash": "sha256-T3tirJdmYgW5MKwbqfO7qlDInSq4Ilrjw/DwJemFIME=", "owner": "Mic92", "repo": "direnv-instant", - "rev": "c4231a4244dde9b85fa6ee39535f28f525596cd3", + "rev": "5656a76b19fef6d1cd14b392ff508f15fa7fb086", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1782007937, - "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", + "lastModified": 1783570805, + "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "981bd332015397fb1ca033fa982bd61635160c78", + "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", "type": "github" }, "original": { @@ -273,11 +273,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -437,6 +437,42 @@ "type": "gitlab" } }, + "grimoire": { + "inputs": { + "grimoire-social": "grimoire-social", + "nixpkgs": "nixpkgs_4", + "vpkmerge": "vpkmerge" + }, + "locked": { + "lastModified": 1786154070, + "narHash": "sha256-RAqllsG9P6auQzXsdokVMTWeIDDcoP2XCPlmCfmPhZQ=", + "owner": "Slush97", + "repo": "grimoire", + "rev": "0ceab21c1925d9ce16cce79380dee67077348c8d", + "type": "github" + }, + "original": { + "owner": "Slush97", + "repo": "grimoire", + "type": "github" + } + }, + "grimoire-social": { + "flake": false, + "locked": { + "lastModified": 1779261108, + "narHash": "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=", + "owner": "Slush97", + "repo": "grimoire-social", + "rev": "efffe0b92a49d6cc8d82406d6fc163c2fd3662a5", + "type": "github" + }, + "original": { + "owner": "Slush97", + "repo": "grimoire-social", + "type": "github" + } + }, "heliumFlake": { "inputs": { "nixpkgs": [ @@ -446,11 +482,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1785004096, - "narHash": "sha256-8stbyRwnEwPMmni/U6iHGGBbi3uebfq60qlKXPgYwWI=", + "lastModified": 1786018481, + "narHash": "sha256-EXAFX1ynjvC6LaWysOXDTg5UqotJ+OW84poGe4mKrKw=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "b356d11eff33ec730a51f9c88d258fdd72efe587", + "rev": "abd8c2de2a67db7371388edfc5f6c080012d6adf", "type": "github" }, "original": { @@ -466,11 +502,11 @@ ] }, "locked": { - "lastModified": 1785496534, - "narHash": "sha256-EASdusMYLuPhOCrE3LmsAGOvGhX3vnKBLxFvj9lI8tU=", + "lastModified": 1786031233, + "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8827fbbb12015a8dd9f66285aec79d655bcb9f6", + "rev": "7834e82588860aaf780cec1366524456a70898d7", "type": "github" }, "original": { @@ -524,11 +560,11 @@ ] }, "locked": { - "lastModified": 1782566056, - "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", + "lastModified": 1785855875, + "narHash": "sha256-dpW3UKG2NTboxxYGzOX4nZiH8YI++CpgosHmVaquOEI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", + "rev": "8699c38f0e4a1ca3bfc84f84ba020509ced1f133", "type": "github" }, "original": { @@ -548,17 +584,17 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1785434837, - "narHash": "sha256-5xgKSbsFzLC9XvMH3iRhYuVBn4w0eo6LzuxY21uRIVw=", + "lastModified": 1786137477, + "narHash": "sha256-H2BW655hSVJUVB1TpkQb+Is77heIg9Vjh/64sEqRzds=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8668a5392179f99fb9ab3699ede233484bee0b51", + "rev": "65be579e9c4486d1b2a96914ece96ac1f669c892", "type": "github" }, "original": { @@ -600,11 +636,11 @@ ] }, "locked": { - "lastModified": 1784196523, - "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=", + "lastModified": 1784533903, + "narHash": "sha256-Ee78BRFi+MrmgHmmW+2dZUEI1R3cssEzza0ar3fsNX8=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0", + "rev": "a16ad89ed5fb4192c966018a80c652de8d96f748", "type": "github" }, "original": { @@ -731,11 +767,11 @@ ] }, "locked": { - "lastModified": 1784323413, - "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=", + "lastModified": 1785843795, + "narHash": "sha256-DFc543bQN94Kt+RsD3Hiu7qCA1uKdqaFJKPMjzANKGU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5f03477ab3a005ff27c527486f551883535aea2f", + "rev": "5a7b8cf221914ce4714407950e4ffbdddcd8b66f", "type": "github" }, "original": { @@ -785,11 +821,11 @@ ] }, "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", + "lastModified": 1784465130, + "narHash": "sha256-ak5fWEmWZyax8trkV4aphdvjrbUiSyl6qS+y5GwBS7Y=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", + "rev": "7d935bb54674aa0fbd327d2a6888bd0630079ed0", "type": "github" }, "original": { @@ -800,7 +836,7 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1785342502, @@ -899,11 +935,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1785494453, - "narHash": "sha256-nK6DCmFpPgaHweU2Y8BMxutfTihwXJ2XkxaoMZPBpMQ=", + "lastModified": 1785857305, + "narHash": "sha256-25q05zpF1sqOCxPPUG9DPPGd+EDW7SiAOWCzBWRS7r0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "68414146fbe13d8fce7748cf2f4e9e46e4834e2e", + "rev": "9ee3e13b60643448228353097880521658b2fe0e", "type": "github" }, "original": { @@ -932,11 +968,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1784570726, - "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=", + "lastModified": 1785701241, + "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=", "owner": "YaLTeR", "repo": "niri", - "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc", + "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6", "type": "github" }, "original": { @@ -949,14 +985,14 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1785437982, - "narHash": "sha256-m0mLVZc4RmzlBMjPOFh+rnALT92jMXJqQtLBMP9jo90=", + "lastModified": 1785870829, + "narHash": "sha256-l+RTmz09TxwWJRLQuc+cKi3yY0K4PSz8tRPTbBUvaVo=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8dfc5b3a553819ba50f601d804a3df64360bd5d8", + "rev": "879f45ee15a3b06fdbbf9b6dc825c5fbca137fcd", "type": "github" }, "original": { @@ -984,7 +1020,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1785232496, @@ -1032,14 +1068,14 @@ "argononed": "argononed", "flake-compat": "flake-compat_3", "nixos-images": "nixos-images", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1783459375, - "narHash": "sha256-S2pb+Mtv0qTeRr+6J5ESgelNjG2YKl4WqKjdPrJx5rM=", + "lastModified": 1785596452, + "narHash": "sha256-KT/OleUMpSKsWgi0eTuqS/0GD4ucPQcvLgmvlw8ZuCM=", "owner": "nvmd", "repo": "nixos-raspberrypi", - "rev": "c845922f260b306d4529a4535bbb6e7f8cfe2887", + "rev": "7e39508bcf9c1da82cf11c1e22f74f9d9fd0fe10", "type": "github" }, "original": { @@ -1052,7 +1088,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1784642409, @@ -1070,11 +1106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785318670, - "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", + "lastModified": 1785828668, + "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", + "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", "type": "github" }, "original": { @@ -1086,11 +1122,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1784834831, - "narHash": "sha256-yj0LPLnsmYoLmA3FGANjeTEwej0/DHjZBXWnDQDUuIs=", + "lastModified": 1785067121, + "narHash": "sha256-rdJdWxAcg5fnntU4DjPivPdVEN4F+VJavw+UWpEMeUI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51fe96f9107566e6b8eeb7fc4ba696c01e548b04", + "rev": "329c3d2af6d1b618705150ea39f72c15eb4e613e", "type": "github" }, "original": { @@ -1102,11 +1138,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -1117,11 +1153,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1785500885, - "narHash": "sha256-iNwmTIXImHMnlXNG4EuTZOuvwt9qZAUM6GnRakZ5fc0=", + "lastModified": 1786178086, + "narHash": "sha256-/qg82qBl7I7SVb8tmu8JZyasakhasEBH2GSiBY/zev8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24692924db907f18d3b4cf3ef52e7909b02ce40c", + "rev": "fd9d47a04c10e84befb7fb5d9cf9808ca3c7ef9d", "type": "github" }, "original": { @@ -1149,11 +1185,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -1164,6 +1200,22 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1785967620, + "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1784555310, "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", @@ -1179,7 +1231,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -1195,7 +1247,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -1211,13 +1263,13 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1784796856, - "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", - "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "lastModified": 1785571196, + "narHash": "sha256-xwSqxTsama0YTtS78+4YyCm6jJg09v78QWfP1cAyoVA=", + "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1045728.148bab9c1c3c/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1255,11 +1307,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "lastModified": 1785454630, + "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "type": "github" }, "original": { @@ -1270,6 +1322,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1785828668, + "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1785090369, "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", @@ -1285,13 +1353,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1785382966, - "narHash": "sha256-TzNPxZZV/qnV8U5fEtrvcMF/GppHnlWm16RDHddPOyE=", + "lastModified": 1785859399, + "narHash": "sha256-pY4X50au95QrTpAbEm08pURmeU3/Ud2oa0s2XzpDdz8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba889d5db7c07eaf5cb8f37835d447d935c51b21", + "rev": "85f62611fa3f3eacbcfe3bc7a6d6518b443ca442", "type": "github" }, "original": { @@ -1301,7 +1369,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -1314,34 +1382,18 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1782847189, - "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1784856561, + "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "597283ad8aa0b331c788e97c4c262d58877074ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -1349,15 +1401,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "systems": "systems_4" }, "locked": { - "lastModified": 1785364321, - "narHash": "sha256-BLuHl+nZKb+FDq3GAM6L+UBEiyVepXANA31fT1F56pw=", + "lastModified": 1785763201, + "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=", "owner": "nix-community", "repo": "nixvim", - "rev": "acd69cc15d57004e8cb4495034320263a3d362ea", + "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a", "type": "github" }, "original": { @@ -1378,11 +1430,11 @@ ] }, "locked": { - "lastModified": 1783439237, - "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", + "lastModified": 1785549842, + "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", "owner": "nix-community", "repo": "NUR", - "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", + "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", "type": "github" }, "original": { @@ -1393,14 +1445,14 @@ }, "omp-nix": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1785431079, - "narHash": "sha256-qeUK5296t82+fZR9cWWNLK/u1+ZEuBYmhJFWDtWzzc0=", + "lastModified": 1786143836, + "narHash": "sha256-YIj1rNf9ubzbhEpJbaCarFLrK4wxy0oYV0ttkIOvcuM=", "ref": "main", - "rev": "fef8579df5738a03eeac3b7ee0ac76a248903d7e", - "revCount": 331, + "rev": "530a0e8c78cf7bf20e4b58f859274218d8aabdc9", + "revCount": 361, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1436,7 +1488,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -1465,6 +1517,7 @@ "flake-file": "flake-file", "flake-parts": "flake-parts_2", "font-patcher": "font-patcher", + "grimoire": "grimoire", "heliumFlake": "heliumFlake", "home-manager": "home-manager", "hyprland": "hyprland", @@ -1477,7 +1530,7 @@ "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "omp-nix": "omp-nix", @@ -1596,15 +1649,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "systems": "systems_5" }, "locked": { - "lastModified": 1785048222, - "narHash": "sha256-LjFVfwxensz76SjnvofF1Jsw+xTLd8Qp31W0J6nh2XI=", + "lastModified": 1785652745, + "narHash": "sha256-pD0VE/XwjQ3tLyxTzXKdm6JuIEWr/Jaote6xpXGZrXk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "17e524f330c282d31c32dfe076222d4a12277886", + "rev": "802040514e09bb8539237f52f68cf053b987c65e", "type": "github" }, "original": { @@ -1633,11 +1686,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1784676123, - "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=", + "lastModified": 1786144742, + "narHash": "sha256-ROqWcNC1qYU2p0EY1d9BHnZbcl0ZDaCmXtojENSqL18=", "owner": "nix-community", "repo": "stylix", - "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31", + "rev": "d18ba6834c7f1141429b6d4cf148fff6c8c41139", "type": "github" }, "original": { @@ -1724,15 +1777,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", "type": "github" }, "original": { "owner": "nix-systems", + "ref": "future-26.11", "repo": "default", "type": "github" } @@ -1756,11 +1810,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1781968807, - "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", + "lastModified": 1785153830, + "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", + "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", "type": "github" }, "original": { @@ -1772,11 +1826,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1782012462, - "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", + "lastModified": 1785031658, + "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", + "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", "type": "github" }, "original": { @@ -1788,11 +1842,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1782009766, - "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", + "lastModified": 1785030526, + "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", + "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", "type": "github" }, "original": { @@ -1840,6 +1894,23 @@ "type": "github" } }, + "vpkmerge": { + "flake": false, + "locked": { + "lastModified": 1783195121, + "narHash": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=", + "owner": "Slush97", + "repo": "vpkmerge", + "rev": "f716f7a95aa64cb8534b18c6edc81f29a849db9a", + "type": "github" + }, + "original": { + "owner": "Slush97", + "ref": "v0.19.0", + "repo": "vpkmerge", + "type": "github" + } + }, "x1e-kernel": { "locked": { "lastModified": 1782927159, @@ -1883,11 +1954,11 @@ ] }, "locked": { - "lastModified": 1784371182, - "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=", + "lastModified": 1785846792, + "narHash": "sha256-sNIGmqZJiOM/lCWUuslV53zuk/p5sGCRcS3kHKfxQvA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "08d99f727944dd15e4740090305e31c5fb92a50a", + "rev": "b653ab53a435e92cc00f34771e6823bc59f2f740", "type": "github" }, "original": { @@ -1936,11 +2007,11 @@ ] }, "locked": { - "lastModified": 1785480078, - "narHash": "sha256-wWRW/Teo+58EMeTpVVEAqYid1qLzpB/PViQJCv7Xxvc=", + "lastModified": 1786164819, + "narHash": "sha256-tvBlGAYyzHYdLwn035bRCrB1mcMjvNNavcNZ293AIIA=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "b7d4cc2778143a228675cd8bb7efdfa111638ac8", + "rev": "f9af5f7017cea1c159e17922288fb38ff94d28cd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b0e3b9..a0fcd2f 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; font-patcher.url = "github:Doloro1978/nix-nerd-fonts-patcher"; + grimoire.url = "github:Slush97/grimoire"; heliumFlake = { url = "github:vikingnope/helium-browser-nix-flake"; inputs.nixpkgs.follows = "nixpkgs";