From 8a1ff0202f9f12de8bf5dad67ca75df6f00b850f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Mon, 13 Jan 2025 17:23:41 +0100
Subject: [PATCH] update stuff

---
 flake.nix                                     |  1 +
 hosts/MONSTER/default.nix                     |  9 +++++
 modules/home-manager/packages/default.nix     |  1 +
 .../nixvim/presets/languages/python.nix       |  2 +-
 modules/nixos/usecases/3d-printing.nix        | 18 +--------
 overlays/rastertokpsl-re/default.nix          | 38 +++++++++++++++++++
 6 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 overlays/rastertokpsl-re/default.nix

diff --git a/flake.nix b/flake.nix
index 8480441..a68bdc5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,7 @@
               gbmonctl = prev.callPackage ./overlays/gbmonctl { };
               lpc21isp = prev.callPackage ./overlays/lpc21isp { };
               rquickshare = prev.callPackage ./overlays/rquickshare { };
+              rastertokpsl-re = prev.callPackage ./overlays/rastertokpsl-re { };
             })
           ];
         }
diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix
index db605c3..2581b44 100644
--- a/hosts/MONSTER/default.nix
+++ b/hosts/MONSTER/default.nix
@@ -62,6 +62,13 @@
     acceleration = "rocm";
   };
 
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      rastertokpsl-re
+    ];
+  };
+
   services.xserver.xkb.variant = "altgr-intl";
   services.xserver.xkb.layout = "us";
   hardware = {
@@ -129,6 +136,8 @@
     graphicsmagick
     ffmpeg
     nfs-utils
+    opensc
+    openssl
     # Essential command line apps
     neovim
     mc
diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix
index 3947489..e9251f8 100644
--- a/modules/home-manager/packages/default.nix
+++ b/modules/home-manager/packages/default.nix
@@ -54,6 +54,7 @@
     ranger
     neofetch
     filezilla
+    yubikey-manager
     # rquickshare
   ];
 }
diff --git a/modules/home-manager/programs/nixvim/presets/languages/python.nix b/modules/home-manager/programs/nixvim/presets/languages/python.nix
index 5c01584..2408ca2 100644
--- a/modules/home-manager/programs/nixvim/presets/languages/python.nix
+++ b/modules/home-manager/programs/nixvim/presets/languages/python.nix
@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
     plugins = {
       conform-nvim.settings.formatters_by_ft.python = [ "black" ];
-      lsp.servers.pylsp.enable = true;
+      lsp.servers.pyright.enable = true;
     };
     extraPackages = [ pkgs.black ];
   };
diff --git a/modules/nixos/usecases/3d-printing.nix b/modules/nixos/usecases/3d-printing.nix
index 0c2debc..209afcf 100644
--- a/modules/nixos/usecases/3d-printing.nix
+++ b/modules/nixos/usecases/3d-printing.nix
@@ -21,22 +21,8 @@ in
       dfu-util
       openscad
       bambu-studio
-      (orca-slicer.overrideAttrs (
-        final: prev: {
-          version = "2.2.0";
-          src = fetchFromGitHub {
-            owner = "SoftFever";
-            repo = "OrcaSlicer";
-            rev = "v${final.version}";
-            hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI=";
-          };
-          patches = builtins.filter (
-            p:
-            (builtins.baseNameOf p) != "0002-fix-build-for-gcc-13.diff"
-            && (builtins.baseNameOf p) != "meshboolean-const.patch"
-          ) prev.patches;
-        }
-      ))
+      prusa-slicer # gcode viewer!
+      orca-slicer
       freecad
     ];
   };
diff --git a/overlays/rastertokpsl-re/default.nix b/overlays/rastertokpsl-re/default.nix
new file mode 100644
index 0000000..a908de3
--- /dev/null
+++ b/overlays/rastertokpsl-re/default.nix
@@ -0,0 +1,38 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  cups,
+  patchPpdFilesHook,
+  lib,
+}:
+stdenv.mkDerivation {
+  name = "rastertokpsl-re";
+  src = fetchFromGitHub {
+    owner = "eLtMosen";
+    repo = "rastertokpsl-re";
+    rev = "84dcb2bc0d9a6797eedcd56f2e603dde2fbbf290";
+    hash = "sha256-qPBZ0qKnY14rTaNa6vjyVB8c0aaXDSewia4n1a6xoyg=";
+  };
+  buildInputs = [
+    cmake
+    cups
+  ];
+  nativeBuildInputs = [ patchPpdFilesHook ];
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 /build/source/bin/rastertokpsl-re $out/lib/cups/filter/rastertokpsl
+    mkdir -p $out/share/cups/model/Kyocera
+    install -D /build/source/*.ppd $out/share/cups/model/Kyocera
+
+    runHook postInstall
+  '';
+  ppdFileCommands = [ "rastertokpsl" ];
+  meta = with lib; {
+    description = "Reverse engineered Kyocera rastertokpsl filter for CUPS";
+    homepage = "https://github.com/eLtMosen/rastertokpsl-re";
+    license = licenses.asl20;
+    maintainers = [ maintainers.theaninova ];
+  };
+}