This commit is contained in:
2026-08-10 19:21:14 +01:00
parent b77bcf67d0
commit 2782572111
5 changed files with 137 additions and 77 deletions
@@ -20,6 +20,7 @@
modules.nikpkgs modules.nikpkgs
modules.fonts modules.fonts
modules.unity modules.unity
modules.printing
<modules/hyprland/doloro-settings> <modules/hyprland/doloro-settings>
(modules.obs { (modules.obs {
audio = true; audio = true;
+24 -7
View File
@@ -31,6 +31,17 @@
}; };
nvimSkipModules = [ "tiny-code-action.previewers.snacks" ]; nvimSkipModules = [ "tiny-code-action.previewers.snacks" ];
}; };
cmp-lsp-rs = pkgs.vimUtils.buildVimPlugin {
name = "nvim-cmp-lsp-rs";
src = pkgs.fetchFromGitHub {
owner = "zjp-CN";
repo = "nvim-cmp-lsp-rs";
rev = "329075b806deb719d3ce4f55a7e443541ce5289d";
hash = "sha256-rBABhsShCrx7Gofm1mC6DQAL0KeNtQidW9eMr9kfwGI=";
};
# nvim-cmp on rtp during the require check (cmp_lsp_rs requires cmp.types.lsp at load time)
dependencies = [ pkgs.vimPlugins.nvim-cmp ];
};
in in
{ {
imports = [ imports = [
@@ -222,7 +233,6 @@
":" = { ":" = {
mapping.__raw = "cmp.mapping.preset.cmdline()"; mapping.__raw = "cmp.mapping.preset.cmdline()";
sources = [ sources = [
{ name = "path"; }
{ name = "cmdline"; } { name = "cmdline"; }
]; ];
}; };
@@ -239,6 +249,7 @@
{ {
name = "nvim_lsp"; name = "nvim_lsp";
priority = 100; priority = 100;
entry_filter = "require('cmp_lsp_rs').filter_out.rust_entry_filter";
} }
{ {
name = "luasnip"; name = "luasnip";
@@ -248,10 +259,6 @@
name = "buffer"; name = "buffer";
priority = 50; priority = 50;
} }
{
name = "path";
priority = 40;
}
]; ];
mapping = { mapping = {
"<C-Space>" = "cmp.mapping.complete()"; "<C-Space>" = "cmp.mapping.complete()";
@@ -263,6 +270,14 @@
"cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif require('luasnip').jumpable(-1) then require('luasnip').jump(-1) else fallback() end end, {'i', 's'})"; "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() elseif require('luasnip').jumpable(-1) then require('luasnip').jump(-1) else fallback() end end, {'i', 's'})";
"<Tab>" = "<Tab>" =
"cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif require('luasnip').expand_or_jumpable() then require('luasnip').expand_or_jump() else fallback() end end, {'i', 's'})"; "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif require('luasnip').expand_or_jumpable() then require('luasnip').expand_or_jump() else fallback() end end, {'i', 's'})";
};
sorting = {
comparators = [
"require('cmp.config.compare').exact"
"require('cmp.config.compare').score"
"require('cmp_lsp_rs').comparators.inscope_inherent_import"
"require('cmp_lsp_rs').comparators.sort_by_label_but_underscore_last"
];
}; };
window = { window = {
completion = { completion = {
@@ -312,6 +327,7 @@
}; };
extraPlugins = with pkgs; [ extraPlugins = with pkgs; [
tiny-code-action tiny-code-action
cmp-lsp-rs
]; ];
opts = { opts = {
number = true; number = true;
@@ -325,8 +341,9 @@
mapleader = " "; mapleader = " ";
}; };
extraConfigLua = '' extraConfigLua = ''
-- LSP client writes server stderr + errors to disk on the main loop; nixd spams info logs -> 5MB+ logs. Kill it. -- LSP client writes server stderr + errors to disk on the main loop; nixd spams info logs -> 5MB+ logs.
vim.lsp.set_log_level("off") -- warn level: captures server stderr (incl. rust-analyzer slow-request timing) without nixd's info spam.
vim.lsp.set_log_level("warn")
-- tree-sitter-nix uses (#is-not? local) which the new nvim-treesitter main branch no longer registers -- 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 }) vim.treesitter.query.add_predicate("is-not?", function() return true end, { force = true })
+27
View File
@@ -0,0 +1,27 @@
{ modules, ... }:
{
modules.printing = {
nixos =
{ pkgs, ... }:
{
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
services.printing = {
enable = true;
drivers = with pkgs; [
cups-filters
cups-browsed
];
};
};
homeManager =
{ ... }:
{
};
};
}
+15
View File
@@ -4,6 +4,13 @@
homeManager = homeManager =
{ pkgs, ... }: { pkgs, ... }:
{ {
# nixpkgs builds wivrn with NVENC off (WIVRN_USE_NVENC follows cudaSupport);
# without it "nvenc" in config.json fails with "Failed to find a suitable video encoder"
nixpkgs.overlays = [
(final: prev: {
wivrn = prev.wivrn.override { cudaSupport = true; };
})
];
home.packages = with pkgs; [ home.packages = with pkgs; [
wivrn wivrn
wayvr wayvr
@@ -13,6 +20,14 @@
nixos = nixos =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
# nixpkgs only enables the NVENC encoder (WIVRN_USE_NVENC) when cudaSupport is set;
# without it "nvenc" in config.json fails with "Failed to find a suitable video encoder"
nixpkgs.overlays = [
(final: prev: {
wivrn = prev.wivrn.override { cudaSupport = true; };
})
];
services.wivrn = { services.wivrn = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
Generated
+41 -41
View File
@@ -482,11 +482,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1786018481, "lastModified": 1786241105,
"narHash": "sha256-EXAFX1ynjvC6LaWysOXDTg5UqotJ+OW84poGe4mKrKw=", "narHash": "sha256-q/iBiqM4g029hhjsQcNyObWBsPrwAxtQo21bkXjeu0E=",
"owner": "vikingnope", "owner": "vikingnope",
"repo": "helium-browser-nix-flake", "repo": "helium-browser-nix-flake",
"rev": "abd8c2de2a67db7371388edfc5f6c080012d6adf", "rev": "88eb5c7ee75ef26ebaec8987274102063f34745b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1786031233, "lastModified": 1786356609,
"narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=", "narHash": "sha256-ou8fYz5w9yhXC8YbvvExybFIa19MyW5G/8dEPqa90hM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7834e82588860aaf780cec1366524456a70898d7", "rev": "c30c7955cec30d664a9baced6bc0112e263d4647",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -590,11 +590,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1786137477, "lastModified": 1786298417,
"narHash": "sha256-H2BW655hSVJUVB1TpkQb+Is77heIg9Vjh/64sEqRzds=", "narHash": "sha256-nJZCCA1YXQqnLQSNVrtY+IxK0pnVLV5qJSw79axtpCo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "65be579e9c4486d1b2a96914ece96ac1f669c892", "rev": "f7daeb7f79d48745a2894367e9e73229ac162abe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -839,11 +839,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1785342502, "lastModified": 1786205183,
"narHash": "sha256-qu4abwEmOHOzpdBUigpLfmHObkRgJp5sRjbnnyEKzSo=", "narHash": "sha256-+mhhWk6V7jmLW7kXkFRYQ3yDNVxQzuiAwkD6Nwb9LnE=",
"owner": "JPyke3", "owner": "JPyke3",
"repo": "hytale-launcher-nix", "repo": "hytale-launcher-nix",
"rev": "2bc2d0dd6fcd4c4a61d9ab33b2149b21286e79d1", "rev": "34131e0812cde0b9335f1acafbedfa17431325e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1153,11 +1153,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1786178086, "lastModified": 1786363475,
"narHash": "sha256-/qg82qBl7I7SVb8tmu8JZyasakhasEBH2GSiBY/zev8=", "narHash": "sha256-YU0FKw3bKh/t8bx9Sb/vNG7hVaLzK5Wqy4QcZGm6624=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd9d47a04c10e84befb7fb5d9cf9808ca3c7ef9d", "rev": "6f90103c0e9f8c317e1c85d54467c1bd1a636190",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1201,11 +1201,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1785967620, "lastModified": 1786106723,
"narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1265,11 +1265,11 @@
}, },
"nixpkgs_15": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1785571196, "lastModified": 1786106723,
"narHash": "sha256-xwSqxTsama0YTtS78+4YyCm6jJg09v78QWfP1cAyoVA=", "narHash": "sha256-CgKDSHL6rqAAQkkvg1xaZDQXb77+4XW73iGcUMJ+2w0=",
"rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1045728.148bab9c1c3c/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1049422.f13ff45afd1b/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -1323,11 +1323,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1785828668, "lastModified": 1786106723,
"narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1339,11 +1339,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1785090369, "lastModified": 1785967620,
"narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "624af665418d3c65d544145b4d34ad696439570e", "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1448,11 +1448,11 @@
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_13"
}, },
"locked": { "locked": {
"lastModified": 1786143836, "lastModified": 1786241080,
"narHash": "sha256-YIj1rNf9ubzbhEpJbaCarFLrK4wxy0oYV0ttkIOvcuM=", "narHash": "sha256-Ho4UwswLVt7caOnLcwmWLgBeqAsp5Vyd/YOZlZQiKVM=",
"ref": "main", "ref": "main",
"rev": "530a0e8c78cf7bf20e4b58f859274218d8aabdc9", "rev": "c1af41588796514252420f67c5f994df7dad155d",
"revCount": 361, "revCount": 364,
"type": "git", "type": "git",
"url": "https://git.molez.org/mandlm/omp-nix" "url": "https://git.molez.org/mandlm/omp-nix"
}, },
@@ -1653,11 +1653,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1785652745, "lastModified": 1786252193,
"narHash": "sha256-pD0VE/XwjQ3tLyxTzXKdm6JuIEWr/Jaote6xpXGZrXk=", "narHash": "sha256-a9SbkJWloPso00G4zIUkerd9n2qRyDYoDPeUc4O3ME8=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "802040514e09bb8539237f52f68cf053b987c65e", "rev": "a87616995724d27079b495ca07318512af799449",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1686,11 +1686,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1786144742, "lastModified": 1786216702,
"narHash": "sha256-ROqWcNC1qYU2p0EY1d9BHnZbcl0ZDaCmXtojENSqL18=", "narHash": "sha256-fOOmw9tUYeqWVnK2w2NiuMTmGIbluj8xiBFTTFDCcEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "d18ba6834c7f1141429b6d4cf148fff6c8c41139", "rev": "b67debfd2db1eb1f0fd8740b950f598bbaf74b8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1954,11 +1954,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785846792, "lastModified": 1786032767,
"narHash": "sha256-sNIGmqZJiOM/lCWUuslV53zuk/p5sGCRcS3kHKfxQvA=", "narHash": "sha256-C5K27sF/jaQe1BgB1/575r01oTAvw6mrDWPS1qUl6X0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "b653ab53a435e92cc00f34771e6823bc59f2f740", "rev": "688feb3d88404598f12440a668136e74044391de",
"type": "github" "type": "github"
}, },
"original": { "original": {