diff --git a/modules/nixos/boot.nix b/modules/nixos/boot.nix
index ef79eb73e127d7c7a0442f093ec271dcbcc10d40..9b06b9d91f16e201fbc817b51d28c10b64c32d05 100644
--- a/modules/nixos/boot.nix
+++ b/modules/nixos/boot.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_18; # _zen, _hardened, _rt, _rt_latest, etc.
+    kernelPackages = pkgs.linuxPackages_7_0; # _zen, _hardened, _rt, _rt_latest, etc.
     loader = {
       efi = {
         canTouchEfiVariables = true;
diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix
index 94b28809f6429dddccb19a9d0a347875f9dac027..535592c6ce4a9e4bde8b21a72007800d306defb5 100644
--- a/modules/nixos/nvidia.nix
+++ b/modules/nixos/nvidia.nix
@@ -4,7 +4,7 @@
   ...
 }:
 let
-  nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.stable;
+  nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.production;
 in
 {
   services.xserver.videoDrivers = [
@@ -15,6 +15,7 @@ in
   nixpkgs.config = {
     nvidia.acceptLicense = true;
     allowUnfree = true;
+    cudaSupport = true;
   };
   # Kernel parameters for better Wayland and Hyprland integration
   boot.kernelParams = [
@@ -76,7 +77,7 @@ in
       # #Fixes a glitch
       # nvidiaPersistenced = true;
     };
-    nvidia-container-toolkit.enable = false;
+    nvidia-container-toolkit.enable = true;
 
     graphics = {
       enable = true;
@@ -96,9 +97,12 @@ in
   };
 
   nix.settings = {
-    substituters = [ "https://cuda-maintainers.cachix.org" ];
+    substituters = [
+      "https://cache.nixos-cuda.org"
+
+    ];
     trusted-public-keys = [
-      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+      "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
     ];
   };
 
diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix
index e88aa09662be4162c73b93fc07141ce8920c086a..745394a38728843bf790a783b2a4d50bb36cb102 100644
--- a/modules/nixos/services.nix
+++ b/modules/nixos/services.nix
@@ -54,7 +54,11 @@
     # Enable CUPS to print documents.
     printing = {
       enable = true;
-      drivers = [ pkgs.brlaser ]; # Brother printer driver
+      drivers = [
+        pkgs.brlaser # Brother printer driver
+        pkgs.cups-filters
+        pkgs.cups-browsed
+      ];
     };
 
     pipewire = {
diff --git a/packages/17lands/default.nix b/packages/17lands/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..62eef58d64455a19fb126b01cdb7f78bc49f6392
--- /dev/null
+++ b/packages/17lands/default.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  python312,
+  fetchFromGitHub,
+  tk,
+}:
+
+let
+  python = python312;
+  pythonPackages = python.pkgs;
+in
+pythonPackages.buildPythonApplication {
+  pname = "mtga-draft-17lands";
+  version = "0.4.15";
+
+  src = fetchFromGitHub {
+    owner = "unrealities";
+    repo = "MTGA_Draft_17Lands";
+    rev = "6f37b0208fcbf14b6b470084cb54ebaec272af55";
+    hash = lib.fakeHash;
+  };
+
+  buildInputs = [ tk ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    numpy
+    pillow
+    pydantic
+    pynput
+    requests
+    ttkbootstrap
+  ];
+
+  format = "other";
+
+  installPhase = ''
+        runHook preInstall
+
+        dst=$out/lib/${python.libPrefix}/site-packages/mtga_draft_17lands
+        mkdir -p $dst
+        cp -r . $dst/
+
+        mkdir -p $out/bin
+        cat > $out/bin/mtga-draft-17lands <<EOF
+    #!${python.interpreter}
+    import sys, os
+
+    data_dir = os.path.join(
+        os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share")),
+        "mtga-draft-17lands",
+    )
+    os.makedirs(data_dir, exist_ok=True)
+    os.chdir(data_dir)
+
+    sys.path.insert(0, "$dst")
+    import runpy
+    runpy.run_path("$dst/main.py", run_name="__main__")
+    EOF
+        chmod +x $out/bin/mtga-draft-17lands
+
+        runHook postInstall
+  '';
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Magic: The Gathering Arena draft tool that uses 17Lands data";
+    homepage = "https://github.com/unrealities/MTGA_Draft_17Lands";
+    license = licenses.mit;
+    mainProgram = "mtga-draft-17lands";
+    platforms = platforms.linux;
+  };
+}