flake update
This commit is contained in:
parent
e209e98b4b
commit
37d83dd90f
6 changed files with 38 additions and 12 deletions
|
|
@ -84,8 +84,10 @@ cmp.setup({
|
|||
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
|
||||
vim.lsp.enable("rust_analyzer")
|
||||
vim.lsp.enable("pylsp")
|
||||
vim.lsp.enable("biome")
|
||||
vim.lsp.enable("eslint")
|
||||
vim.lsp.enable("ccls")
|
||||
local lspconfig = require('lspconfig')
|
||||
local servers = { "rust_analyzer", "pylsp", "biome", "eslint", "ccls" }
|
||||
for _, lsp in ipairs(servers) do
|
||||
lspconfig[lsp].setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# 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;
|
||||
wrappedBinaries = {
|
||||
vesktop = {
|
||||
executable = "${pkgs.vesktop}/bin/vesktop";
|
||||
executable = "${pkgs-stable.vesktop}/bin/vesktop";
|
||||
profile = "${pkgs.firejail}/etc/firejail/vesktop.profile";
|
||||
extraArgs = [
|
||||
"--ignore=dbus-system"
|
||||
|
|
|
|||
19
flake.lock
generated
19
flake.lock
generated
|
|
@ -86,13 +86,30 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"disko": "disko",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/";
|
||||
|
||||
disko.url = "github:nix-community/disko";
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs, home-manager, impermanence, disko, ... } @ inputs:
|
||||
{ self, nixpkgs, nixpkgs-stable, home-manager, impermanence, disko, ... } @ inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
username = "xory";
|
||||
|
|
@ -26,7 +27,13 @@
|
|||
mkNixosHost = hostName:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs; };
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
pkgs-stable = import nixpkgs-stable {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
modules = [
|
||||
{ nixpkgs.overlays = [ opentrack-overlay ]; }
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
rocmPackages.clr.icd
|
||||
];
|
||||
|
||||
services.ollama.acceleration = "rocm";
|
||||
services.ollama.package = pkgs.ollama-rocm;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
framework-tool
|
||||
|
|
|
|||
|
|
@ -24,5 +24,5 @@
|
|||
};
|
||||
boot.blacklistedKernelModules = [ "nouveau" ];
|
||||
|
||||
services.ollama.acceleration = "cuda";
|
||||
services.ollama.package = pkgs.ollama-cuda;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue