From 6de7c0ca67837732b4b762fc944cad892e357dbf Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Fri, 29 May 2026 15:20:51 +0100 Subject: [PATCH] fixed nik-pkgs & added deadlock mod manager --- config/hosts/aspects/doloro-desktop/home.nix | 11 +- config/modules/nikpkgs.nix | 8 +- config/modules/nixvim/default.nix | 3 + flake.lock | 106 +++++++++---------- 4 files changed, 70 insertions(+), 58 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 8929515..94849aa 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -14,6 +14,7 @@ modules.fish modules.tuigreet modules.kitty + modules.nikpkgs modules.fonts (modules.obs { @@ -78,7 +79,15 @@ obsidian # pear-desktop prismlauncher - deadlock-mod-manager + # deadlock-mod-manager + (inputs.nik-pkgs.packages.x86_64-linux.grimorie.overrideAttrs (final: prev: { + pnpmDeps = pnpm.fetchDeps { + pname = "grimoire"; + inherit (prev) version src; + fetcherVersion = 3; + hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4="; + }; + })) gamescope android-studio blender diff --git a/config/modules/nikpkgs.nix b/config/modules/nikpkgs.nix index ba7b27f..ccb7e62 100644 --- a/config/modules/nikpkgs.nix +++ b/config/modules/nikpkgs.nix @@ -3,17 +3,17 @@ modules, inputs, ... -}: -{ +}: { flake-file.inputs = { nik-pkgs = { url = "git+https://git.scug.io/nikkuss/pkgs.git"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; }; modules.nikpkgs = { nixos = { - nixpkgs.overlays = [ inputs.nik-pkgs.overlays.default ]; + nixpkgs.overlays = [inputs.nik-pkgs.overlays.default]; }; + # debug = inputs.nik-pkgs; }; } diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 61f9751..0d52eb9 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -296,6 +296,9 @@ mapleader = " "; }; extraConfigLua = '' + -- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers + vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true }) + local cmp = require('cmp') cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), diff --git a/flake.lock b/flake.lock index 94abec1..d39ffa0 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1779553635, - "narHash": "sha256-ar7KGDmSmGQlKWH4aHC61K+VFxu1wxA/HcgIBDxHwOQ=", + "lastModified": 1779959490, + "narHash": "sha256-FS/SbuYuRt5biCp1ja0Se12V2q3Y3p+O+rAdFQvuJT4=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "f2c7d18505bc35a89a8d5fcab25671168684e7dd", + "rev": "1d38a1c83db0cddff4963516eb3f6838981cb6ae", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1779618819, - "narHash": "sha256-/cGZZCyJZS1QATHi+/2Q32NkjrYN2N2PpgFP8Ak4FJc=", + "lastModified": 1779996637, + "narHash": "sha256-DcA59mHfCUfbr7EtH9YJUb3t62TcyXwC/I0QMyUs1bo=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "668b466fb461409329425b50c4a9d8d2c022a739", + "rev": "b87558b7c865628c48c1d6ff5c827b9df40e9281", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1779699611, - "narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", + "lastModified": 1780048612, + "narHash": "sha256-Md/eOK5OjmvvHc2H52pLZe4zpP4XyfiS5vHqfRCz2HU=", "owner": "nix-community", "repo": "disko", - "rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", + "rev": "caa775cf67bfdc47f940edd96c975b5016df9059", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1779508010, - "narHash": "sha256-7Wcp38Saw8cnyfc1OyjsxiF0btKBaL5KcHV+q9ljsns=", + "lastModified": 1780027711, + "narHash": "sha256-i74IUAuKPSQJUl8CN4XZZEyCs8g0lg0oJCrW7QFYOTQ=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "4e6b8bdd6692db7f2357e4dd86444914e53ec095", + "rev": "c6364929cb9a7fe155195a75bcb6fa2433af6f75", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1779726696, - "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", + "lastModified": 1779969295, + "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", + "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1779801868, - "narHash": "sha256-7GDsi9fASmWneM49wS6+IbttIxmZdrDWM14tKjgai68=", + "lastModified": 1780058324, + "narHash": "sha256-+t97F7PpZWjMcXFOH9oPGNsG424azqCDTcBRL1gMkoE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "864dc89c9595095b5368a890fb39afbc75f590ca", + "rev": "cbcddf2848fcdd9d2490df786c92003bcd763fac", "type": "github" }, "original": { @@ -865,11 +865,11 @@ ] }, "locked": { - "lastModified": 1779050451, - "narHash": "sha256-tnytppL6f/7YJ4hKceNmkKpmwwZOKuqBFKmIEKUmy6c=", + "lastModified": 1780062170, + "narHash": "sha256-HXqwHtHtUjVoUEkdTbkj8bwsyHOMezKkRPd6pZFgnN4=", "ref": "refs/heads/main", - "rev": "6c53c5847556d335f7a5ef97820d8bfae79fd280", - "revCount": 66, + "rev": "bc24d47b6c7ced9d4a2237dd8e2e195574751282", + "revCount": 70, "type": "git", "url": "https://git.scug.io/nikkuss/pkgs.git" }, @@ -890,11 +890,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1779748545, - "narHash": "sha256-AbRQrrpcNTBUoIf7Kc1qsdhsRLtZ0DDw+udm+8NWlJk=", + "lastModified": 1780062130, + "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3754a033e05c750ef46fe4f078d79b826c4f9287", + "rev": "3cb351d73c357a4e413f59c4551d219118791c14", "type": "github" }, "original": { @@ -923,11 +923,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1779374863, - "narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", + "lastModified": 1780056110, + "narHash": "sha256-t7lKVshV/srD0G06j4r5P5qj9zaDeZ9JYFCxHDGROZU=", "owner": "YaLTeR", "repo": "niri", - "rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", + "rev": "f9f43d826ab4014a7c302be28d7da33e12f5be37", "type": "github" }, "original": { @@ -945,11 +945,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1779648267, - "narHash": "sha256-nAZ40ZbLLjTPNZwaxpq5p+VsKLY3pW3uogBQVjtP7yU=", + "lastModified": 1779998180, + "narHash": "sha256-FyRyX3/NGuGhmChC9CD8BFwL8vEilm8pFS4Kv54cPO0=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "bba6e2370bc269b59c0ae42c6d295ca71e770b2f", + "rev": "caa7f446d7b4ccf461616b9adedf384cca84afaa", "type": "github" }, "original": { @@ -1044,11 +1044,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778036283, - "narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=", + "lastModified": 1779877693, + "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "github" }, "original": { @@ -1075,11 +1075,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1779630130, - "narHash": "sha256-RWn/gMXEy+p6yL5lKh51Z/w6RHC+5Px18Tarkuva99Y=", + "lastModified": 1779955849, + "narHash": "sha256-31mhzm2HpzRr/rupWAFfWBmt9SUjzwr5+giv5Nmb/rA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68ac0b94b449482d8a90f3e3791d61a8ee186f07", + "rev": "a2c6938835fca96e4a10c8561d461efd2f91d04f", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1779259093, - "narHash": "sha256-7DKWmH23hL2eYdkxCKeqj2i+yljTKuU+3Nk1UPHOnxc=", + "lastModified": 1779877693, + "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d99b013d5d1931ad77fe3912ed218170dec5d9a4", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "github" }, "original": { @@ -1250,11 +1250,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1779816597, - "narHash": "sha256-Kgod3gZlhSp6WozZ2pFaclXbWpjs6kQLAtldoxb85Lc=", + "lastModified": 1780056171, + "narHash": "sha256-CXpH7axUH7AzI5izVHfOYawY350beplaAKFLDaQY128=", "owner": "nix-community", "repo": "nixvim", - "rev": "297f9341476ba7f821a42d7a2805e206ef8c6ef8", + "rev": "d7800d4b1c420e0c2dcaaddd58038c8b662e72a8", "type": "github" }, "original": { @@ -1293,11 +1293,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1779876223, - "narHash": "sha256-n7kC2IF9jUSnomS+gwwD2tuwBwRiBVNEmVlTUBVqZzs=", + "lastModified": 1780034513, + "narHash": "sha256-dt3PXBPOBJllcgz5YgRtvtX8mP5vWptjTVRFW2SOt48=", "ref": "main", - "rev": "f0ebca7595fa8211d1b8eae0cf5850ff45a62d29", - "revCount": 83, + "rev": "316d64f4bbb974e74961029631398ad58a6caa6b", + "revCount": 89, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1808,11 +1808,11 @@ ] }, "locked": { - "lastModified": 1779773014, - "narHash": "sha256-4bQ5dL7zbP2vKu5kfsEJICxGG3ATsOW7sP2QvaXGkHM=", + "lastModified": 1779946062, + "narHash": "sha256-M/2bCPYjiBTkDNV29J/00z10RM3yYnL9X74RqAHDme0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "3ff570b75cf068b0f25d0c2b3a77a0e546a4067b", + "rev": "2e2c38ba20a3d614d0196e0aa44851547306e861", "type": "github" }, "original": {