authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-06-01 13:24:10-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-06-01 13:24:10-07:00
log22b95c27ea3096a269304bc205430e89293007d3
tree318d9a9cfab6f2ea304bcf8da38d91472140dec4
parentf737e63585ac52ed3757d4622c98e01a3a85b941

update kernel and nvidia drivers

4 files changed, 87 insertions(+), 6 deletions(-)

modules/nixos/boot.nix+1-1
...@@ -1,7 +1,7 @@...@@ -1,7 +1,7 @@
1{ pkgs, ... }:1{ pkgs, ... }:
2{2{
3 boot = {3 boot = {
4 kernelPackages = pkgs.linuxPackages_6_18; # _zen, _hardened, _rt, _rt_latest, etc.4 kernelPackages = pkgs.linuxPackages_7_0; # _zen, _hardened, _rt, _rt_latest, etc.
5 loader = {5 loader = {
6 efi = {6 efi = {
7 canTouchEfiVariables = true;7 canTouchEfiVariables = true;
modules/nixos/nvidia.nix+8-4
...@@ -4,7 +4,7 @@...@@ -4,7 +4,7 @@
4 ...4 ...
5}:5}:
6let6let
7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.stable;7 nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.production;
8in8in
9{9{
10 services.xserver.videoDrivers = [10 services.xserver.videoDrivers = [
...@@ -15,6 +15,7 @@ in...@@ -15,6 +15,7 @@ in
15 nixpkgs.config = {15 nixpkgs.config = {
16 nvidia.acceptLicense = true;16 nvidia.acceptLicense = true;
17 allowUnfree = true;17 allowUnfree = true;
18 cudaSupport = true;
18 };19 };
19 # Kernel parameters for better Wayland and Hyprland integration20 # Kernel parameters for better Wayland and Hyprland integration
20 boot.kernelParams = [21 boot.kernelParams = [
...@@ -76,7 +77,7 @@ in...@@ -76,7 +77,7 @@ in
76 # #Fixes a glitch77 # #Fixes a glitch
77 # nvidiaPersistenced = true;78 # nvidiaPersistenced = true;
78 };79 };
79 nvidia-container-toolkit.enable = false;80 nvidia-container-toolkit.enable = true;
8081
81 graphics = {82 graphics = {
82 enable = true;83 enable = true;
...@@ -96,9 +97,12 @@ in...@@ -96,9 +97,12 @@ in
96 };97 };
9798
98 nix.settings = {99 nix.settings = {
99 substituters = [ "https://cuda-maintainers.cachix.org" ];100 substituters = [
101 "https://cache.nixos-cuda.org"
102
103 ];
100 trusted-public-keys = [104 trusted-public-keys = [
101 "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="105 "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
102 ];106 ];
103 };107 };
104108
modules/nixos/services.nix+5-1
...@@ -54,7 +54,11 @@...@@ -54,7 +54,11 @@
54 # Enable CUPS to print documents.54 # Enable CUPS to print documents.
55 printing = {55 printing = {
56 enable = true;56 enable = true;
57 drivers = [ pkgs.brlaser ]; # Brother printer driver57 drivers = [
58 pkgs.brlaser # Brother printer driver
59 pkgs.cups-filters
60 pkgs.cups-browsed
61 ];
58 };62 };
5963
60 pipewire = {64 pipewire = {
packages/17lands/default.nix created+73
...@@ -0,0 +1,73 @@
1{
2 lib,
3 python312,
4 fetchFromGitHub,
5 tk,
6}:
7
8let
9 python = python312;
10 pythonPackages = python.pkgs;
11in
12pythonPackages.buildPythonApplication {
13 pname = "mtga-draft-17lands";
14 version = "0.4.15";
15
16 src = fetchFromGitHub {
17 owner = "unrealities";
18 repo = "MTGA_Draft_17Lands";
19 rev = "6f37b0208fcbf14b6b470084cb54ebaec272af55";
20 hash = lib.fakeHash;
21 };
22
23 buildInputs = [ tk ];
24
25 propagatedBuildInputs = with pythonPackages; [
26 numpy
27 pillow
28 pydantic
29 pynput
30 requests
31 ttkbootstrap
32 ];
33
34 format = "other";
35
36 installPhase = ''
37 runHook preInstall
38
39 dst=$out/lib/${python.libPrefix}/site-packages/mtga_draft_17lands
40 mkdir -p $dst
41 cp -r . $dst/
42
43 mkdir -p $out/bin
44 cat > $out/bin/mtga-draft-17lands <<EOF
45 #!${python.interpreter}
46 import sys, os
47
48 data_dir = os.path.join(
49 os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share")),
50 "mtga-draft-17lands",
51 )
52 os.makedirs(data_dir, exist_ok=True)
53 os.chdir(data_dir)
54
55 sys.path.insert(0, "$dst")
56 import runpy
57 runpy.run_path("$dst/main.py", run_name="__main__")
58 EOF
59 chmod +x $out/bin/mtga-draft-17lands
60
61 runHook postInstall
62 '';
63
64 doCheck = false;
65
66 meta = with lib; {
67 description = "Magic: The Gathering Arena draft tool that uses 17Lands data";
68 homepage = "https://github.com/unrealities/MTGA_Draft_17Lands";
69 license = licenses.mit;
70 mainProgram = "mtga-draft-17lands";
71 platforms = platforms.linux;
72 };
73}