lukas/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.lukas.services:2222/lukas/nixos

Browse Source
This commit is contained in:
Lukas
2026-05-12 11:59:53 +02:00
parent 1841fe3a41 99f4614227
commit 19ab808148
4 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777851538, "lastModified": 1778401693,
"narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "narHash": "sha256-OVHdCqXXUF5UdGkH+FF2ZL06OLZjj2kvP2dIUmzVWoo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "rev": "389b83002efc26f1145e89a6a8e6edc5a6435948",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -78,11 +78,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1778124196, "lastModified": 1778458615,
"narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=", "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68a8af93ff4297686cb68880845e61e5e2e41d92", "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/lukas/laptop/packages.nix
View File

@@ -10,6 +10,7 @@
pkgs.telegram-desktop pkgs.telegram-desktop
pkgs.element-desktop pkgs.element-desktop
pkgs.tidal-hifi pkgs.tidal-hifi
pkgs.signal-desktop
pkgs.tree pkgs.tree
pkgs.htop pkgs.htop

3
home/lukas/tower/packages.nix
View File

@@ -10,6 +10,7 @@
pkgs.telegram-desktop pkgs.telegram-desktop
pkgs.element-desktop pkgs.element-desktop
pkgs.tidal-hifi pkgs.tidal-hifi
pkgs.signal-desktop
pkgs.solaar pkgs.solaar
@@ -19,8 +20,6 @@
pkgs.wget pkgs.wget
pkgs.unzip pkgs.unzip
pkgs.librechat
pkgs.feather pkgs.feather
pkgs.firefox pkgs.firefox

26
modules/system/nvidia.nix
View File

@@ -1,4 +1,3 @@
{ config, pkgs, ... }:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -25,31 +24,6 @@
open = false; open = false;
nvidiaSettings = true; nvidiaSettings = true;
package =
let
base = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "590.48.01";
sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44=";
settingsSha256 = "sha256-4SfCWp3swUp+x+4cuIZ7SA5H7/NoizqgPJ6S9fm90fA=";
persistencedSha256 = "";
};
cachyos-nvidia-patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/CachyOS/CachyOS-PKGBUILDS/master/nvidia/nvidia-utils/kernel-6.19.patch";
sha256 = "sha256-YuJjSUXE6jYSuZySYGnWSNG5sfVei7vvxDcHx3K+IN4=";
};
# Patch the appropriate driver based on config.hardware.nvidia.open
driverAttr = if config.hardware.nvidia.open then "open" else "bin";
in
base
// {
${driverAttr} = base.${driverAttr}.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [ cachyos-nvidia-patch ];
});
};
# package = config.boot.kernelPackages.nvidiaPackages.unstable;
}; };
} }