flake update

This commit is contained in:
Xory 2026-01-04 00:26:00 +02:00
parent e209e98b4b
commit 37d83dd90f
6 changed files with 38 additions and 12 deletions

View file

@ -84,8 +84,10 @@ cmp.setup({
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
vim.lsp.enable("rust_analyzer") local lspconfig = require('lspconfig')
vim.lsp.enable("pylsp") local servers = { "rust_analyzer", "pylsp", "biome", "eslint", "ccls" }
vim.lsp.enable("biome") for _, lsp in ipairs(servers) do
vim.lsp.enable("eslint") lspconfig[lsp].setup({
vim.lsp.enable("ccls") capabilities = capabilities,
})
end

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, lib, inputs, ... }: { config, pkgs, pkgs-stable, lib, inputs, ... }:
{ {
@ -92,7 +92,7 @@
enable = true; enable = true;
wrappedBinaries = { wrappedBinaries = {
vesktop = { vesktop = {
executable = "${pkgs.vesktop}/bin/vesktop"; executable = "${pkgs-stable.vesktop}/bin/vesktop";
profile = "${pkgs.firejail}/etc/firejail/vesktop.profile"; profile = "${pkgs.firejail}/etc/firejail/vesktop.profile";
extraArgs = [ extraArgs = [
"--ignore=dbus-system" "--ignore=dbus-system"

19
flake.lock generated
View file

@ -86,13 +86,30 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1767325753,
"narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
} }
} }
}, },

View file

@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/"; nixos-hardware.url = "github:NixOS/nixos-hardware/";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
@ -16,7 +17,7 @@
}; };
outputs = outputs =
{ self, nixpkgs, home-manager, impermanence, disko, ... } @ inputs: { self, nixpkgs, nixpkgs-stable, home-manager, impermanence, disko, ... } @ inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
username = "xory"; username = "xory";
@ -26,7 +27,13 @@
mkNixosHost = hostName: mkNixosHost = hostName:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs; }; specialArgs = {
inherit inputs;
pkgs-stable = import nixpkgs-stable {
system = "x86_64-linux";
config.allowUnfree = true;
};
};
modules = [ modules = [
{ nixpkgs.overlays = [ opentrack-overlay ]; } { nixpkgs.overlays = [ opentrack-overlay ]; }

View file

@ -22,7 +22,7 @@
rocmPackages.clr.icd rocmPackages.clr.icd
]; ];
services.ollama.acceleration = "rocm"; services.ollama.package = pkgs.ollama-rocm;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
framework-tool framework-tool

View file

@ -24,5 +24,5 @@
}; };
boot.blacklistedKernelModules = [ "nouveau" ]; boot.blacklistedKernelModules = [ "nouveau" ];
services.ollama.acceleration = "cuda"; services.ollama.package = pkgs.ollama-cuda;
} }