doloro/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed nik-pkgs & added deadlock mod manager

Browse Source
This commit is contained in:
Doloro1978
2026-05-29 15:20:51 +01:00
parent acb6fb1677
commit 6de7c0ca67
4 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/hosts/aspects/doloro-desktop/home.nix
+10 -1
View File
@@ -14,6 +14,7 @@
modules.fish modules.fish
modules.tuigreet modules.tuigreet
modules.kitty modules.kitty
modules.nikpkgs
modules.fonts modules.fonts
<modules/hyprland/doloro-settings> <modules/hyprland/doloro-settings>
(modules.obs { (modules.obs {
@@ -78,7 +79,15 @@
obsidian obsidian
# pear-desktop # pear-desktop
prismlauncher 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 gamescope
android-studio android-studio
blender blender
config/modules/nikpkgs.nix
+3 -3
View File
@@ -3,17 +3,17 @@
modules, modules,
inputs, inputs,
... ...
}: }: {
{
flake-file.inputs = { flake-file.inputs = {
nik-pkgs = { nik-pkgs = {
url = "git+https://git.scug.io/nikkuss/pkgs.git"; url = "git+https://git.scug.io/nikkuss/pkgs.git";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
modules.nikpkgs = { modules.nikpkgs = {
nixos = { nixos = {
nixpkgs.overlays = [inputs.nik-pkgs.overlays.default]; nixpkgs.overlays = [inputs.nik-pkgs.overlays.default];
}; };
# debug = inputs.nik-pkgs;
}; };
} }
config/modules/nixvim/default.nix
+3
View File
@@ -296,6 +296,9 @@
mapleader = " "; mapleader = " ";
}; };
extraConfigLua = '' 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') local cmp = require('cmp')
cmp.setup.cmdline(':', { cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
flake.lock
Generated
+53 -53
View File
@@ -120,11 +120,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779553635, "lastModified": 1779959490,
"narHash": "sha256-ar7KGDmSmGQlKWH4aHC61K+VFxu1wxA/HcgIBDxHwOQ=", "narHash": "sha256-FS/SbuYuRt5biCp1ja0Se12V2q3Y3p+O+rAdFQvuJT4=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "f2c7d18505bc35a89a8d5fcab25671168684e7dd", "rev": "1d38a1c83db0cddff4963516eb3f6838981cb6ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -136,11 +136,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779618819, "lastModified": 1779996637,
"narHash": "sha256-/cGZZCyJZS1QATHi+/2Q32NkjrYN2N2PpgFP8Ak4FJc=", "narHash": "sha256-DcA59mHfCUfbr7EtH9YJUb3t62TcyXwC/I0QMyUs1bo=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "668b466fb461409329425b50c4a9d8d2c022a739", "rev": "b87558b7c865628c48c1d6ff5c827b9df40e9281",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -170,11 +170,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1779699611, "lastModified": 1780048612,
"narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", "narHash": "sha256-Md/eOK5OjmvvHc2H52pLZe4zpP4XyfiS5vHqfRCz2HU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", "rev": "caa775cf67bfdc47f940edd96c975b5016df9059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -456,11 +456,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1779508010, "lastModified": 1780027711,
"narHash": "sha256-7Wcp38Saw8cnyfc1OyjsxiF0btKBaL5KcHV+q9ljsns=", "narHash": "sha256-i74IUAuKPSQJUl8CN4XZZEyCs8g0lg0oJCrW7QFYOTQ=",
"owner": "vikingnope", "owner": "vikingnope",
"repo": "helium-browser-nix-flake", "repo": "helium-browser-nix-flake",
"rev": "4e6b8bdd6692db7f2357e4dd86444914e53ec095", "rev": "c6364929cb9a7fe155195a75bcb6fa2433af6f75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -476,11 +476,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779726696, "lastModified": 1779969295,
"narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -564,11 +564,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1779801868, "lastModified": 1780058324,
"narHash": "sha256-7GDsi9fASmWneM49wS6+IbttIxmZdrDWM14tKjgai68=", "narHash": "sha256-+t97F7PpZWjMcXFOH9oPGNsG424azqCDTcBRL1gMkoE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "864dc89c9595095b5368a890fb39afbc75f590ca", "rev": "cbcddf2848fcdd9d2490df786c92003bcd763fac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -865,11 +865,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779050451, "lastModified": 1780062170,
"narHash": "sha256-tnytppL6f/7YJ4hKceNmkKpmwwZOKuqBFKmIEKUmy6c=", "narHash": "sha256-HXqwHtHtUjVoUEkdTbkj8bwsyHOMezKkRPd6pZFgnN4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "6c53c5847556d335f7a5ef97820d8bfae79fd280", "rev": "bc24d47b6c7ced9d4a2237dd8e2e195574751282",
"revCount": 66, "revCount": 70,
"type": "git", "type": "git",
"url": "https://git.scug.io/nikkuss/pkgs.git" "url": "https://git.scug.io/nikkuss/pkgs.git"
}, },
@@ -890,11 +890,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1779748545, "lastModified": 1780062130,
"narHash": "sha256-AbRQrrpcNTBUoIf7Kc1qsdhsRLtZ0DDw+udm+8NWlJk=", "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "3754a033e05c750ef46fe4f078d79b826c4f9287", "rev": "3cb351d73c357a4e413f59c4551d219118791c14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -923,11 +923,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1779374863, "lastModified": 1780056110,
"narHash": "sha256-qKWgJ2MUODpg+b8tOwWMdMKREvs8TdGBz63SHaQZCeA=", "narHash": "sha256-t7lKVshV/srD0G06j4r5P5qj9zaDeZ9JYFCxHDGROZU=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "4294948cf1c70c50e938383c2c865d7ca455ac7e", "rev": "f9f43d826ab4014a7c302be28d7da33e12f5be37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -945,11 +945,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1779648267, "lastModified": 1779998180,
"narHash": "sha256-nAZ40ZbLLjTPNZwaxpq5p+VsKLY3pW3uogBQVjtP7yU=", "narHash": "sha256-FyRyX3/NGuGhmChC9CD8BFwL8vEilm8pFS4Kv54cPO0=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "bba6e2370bc269b59c0ae42c6d295ca71e770b2f", "rev": "caa7f446d7b4ccf461616b9adedf384cca84afaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1044,11 +1044,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1778036283, "lastModified": 1779877693,
"narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=", "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f", "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1075,11 +1075,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1779467186, "lastModified": 1779796641,
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "rev": "25f538306313eae3927264466c70d7001dcea1df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1149,11 +1149,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1779630130, "lastModified": 1779955849,
"narHash": "sha256-RWn/gMXEy+p6yL5lKh51Z/w6RHC+5Px18Tarkuva99Y=", "narHash": "sha256-31mhzm2HpzRr/rupWAFfWBmt9SUjzwr5+giv5Nmb/rA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68ac0b94b449482d8a90f3e3791d61a8ee186f07", "rev": "a2c6938835fca96e4a10c8561d461efd2f91d04f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1213,11 +1213,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1779259093, "lastModified": 1779877693,
"narHash": "sha256-7DKWmH23hL2eYdkxCKeqj2i+yljTKuU+3Nk1UPHOnxc=", "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d99b013d5d1931ad77fe3912ed218170dec5d9a4", "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1250,11 +1250,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1779816597, "lastModified": 1780056171,
"narHash": "sha256-Kgod3gZlhSp6WozZ2pFaclXbWpjs6kQLAtldoxb85Lc=", "narHash": "sha256-CXpH7axUH7AzI5izVHfOYawY350beplaAKFLDaQY128=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "297f9341476ba7f821a42d7a2805e206ef8c6ef8", "rev": "d7800d4b1c420e0c2dcaaddd58038c8b662e72a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1293,11 +1293,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1779876223, "lastModified": 1780034513,
"narHash": "sha256-n7kC2IF9jUSnomS+gwwD2tuwBwRiBVNEmVlTUBVqZzs=", "narHash": "sha256-dt3PXBPOBJllcgz5YgRtvtX8mP5vWptjTVRFW2SOt48=",
"ref": "main", "ref": "main",
"rev": "f0ebca7595fa8211d1b8eae0cf5850ff45a62d29", "rev": "316d64f4bbb974e74961029631398ad58a6caa6b",
"revCount": 83, "revCount": 89,
"type": "git", "type": "git",
"url": "https://git.molez.org/mandlm/omp-nix" "url": "https://git.molez.org/mandlm/omp-nix"
}, },
@@ -1808,11 +1808,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779773014, "lastModified": 1779946062,
"narHash": "sha256-4bQ5dL7zbP2vKu5kfsEJICxGG3ATsOW7sP2QvaXGkHM=", "narHash": "sha256-M/2bCPYjiBTkDNV29J/00z10RM3yYnL9X74RqAHDme0=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "3ff570b75cf068b0f25d0c2b3a77a0e546a4067b", "rev": "2e2c38ba20a3d614d0196e0aa44851547306e861",
"type": "github" "type": "github"
}, },
"original": { "original": {