.gitignore

@@ -1,2 +1 @@
 /target
-result

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "servicepoint-cli"
 description = "A command line interface for the ServicePoint display."
-version = "0.4.2"
+version = "0.4.0"
 edition = "2021"
 rust-version = "1.80.0"
 publish = true
@@ -17,11 +17,14 @@ clap = { version = "4.5", features = ["derive"] }
 env_logger = "0.11"
 log = "0.4"
 scap = "0.0.8"
-image = "0.25"
+image = "0.25.5"
-fast_image_resize = { version = "6", features = ["image"] }
+fast_image_resize = { version = "5.1", features = ["image"] }
-tungstenite = "0.28"
+tungstenite = "0.26"
-ffmpeg-next = "8"
+ffmpeg-next = "7.1.0"
-servicepoint = "0.15.1"
+
+[dependencies.servicepoint]
+package = "servicepoint"
+version = "0.14.1"
 
 [profile.release]
 lto = true          # Enable link-time optimization

README.md

@@ -21,9 +21,14 @@ If you have set your PATH to include the ~/.cargo/bin, you can now run `servicep
 ## Running with nix
 
 ```shell
+# from CCCB Forgejo
 nix run git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git -- <args>
+
+# from GitHub mirror
+nix run github:kaesaecracker/servicepoint-cli -- <args>
 ```
 
+
 ## Running a debug build
 
 ```shell

flake.lock

@@ -1,62 +1,62 @@
 {
   "nodes": {
-    "crane": {
+    "naersk": {
-      "locked": {
-        "lastModified": 1785520756,
-        "narHash": "sha256-eGUJ3OJ+P4R6x9bN2xx/VTwhrhBt3U0CKtcY/B5xp50=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "fe4c37e1c9e4d5135a89c7f6a734da02e778c34b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1785386831,
-        "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "crane": "crane",
-        "nixpkgs": "nixpkgs",
-        "treefmt-nix": "treefmt-nix"
-      }
-    },
-    "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1785360170,
+        "lastModified": 1745925850,
-        "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=",
+        "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1731533336,
+        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
         "owner": "numtide",
-        "repo": "treefmt-nix",
+        "repo": "nix-filter",
-        "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0",
+        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
-        "repo": "treefmt-nix",
+        "repo": "nix-filter",
         "type": "github"
       }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1746183838,
+        "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "bf3287dac860542719fe7554e21e686108716879",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "naersk": "naersk",
+        "nix-filter": "nix-filter",
+        "nixpkgs": "nixpkgs"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,31 +2,23 @@
   description = "Flake for command line interface of the ServicePoint display.";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    crane.url = "github:ipetkov/crane";
+    nix-filter.url = "github:numtide/nix-filter";
-    treefmt-nix = {
+    naersk = {
-      url = "github:numtide/treefmt-nix";
+      url = "github:nix-community/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
   outputs =
-    {
+    inputs@{
       self,
       nixpkgs,
-      crane,
+      naersk,
-      treefmt-nix,
+      nix-filter,
     }:
     let
       lib = nixpkgs.lib;
-      treefmt-config = {
-        projectRootFile = "flake.nix";
-        programs = {
-          nixfmt.enable = true;
-          keep-sorted.enable = true;
-          rustfmt.enable = true;
-        };
-      };
       supported-systems = [
         "x86_64-linux"
         "aarch64-linux"
@@ -39,7 +31,6 @@
           system:
           f rec {
             pkgs = nixpkgs.legacyPackages.${system};
-            treefmt-eval = treefmt-nix.lib.evalModule pkgs treefmt-config;
             inherit system;
           }
         );
@@ -48,20 +39,31 @@
       packages = forAllSystems (
         { pkgs, ... }:
         let
-          craneLib = crane.mkLib pkgs;
+          naersk' = pkgs.callPackage naersk { };
-          commonArgs = {
+        in
-            src = craneLib.cleanCargoSource ./.;
+        rec {
-            strictDeps = true;
+          servicepoint-cli = naersk'.buildPackage rec {
+            src = nix-filter.lib.filter {
+              root = ./.;
+              include = [
+                ./Cargo.toml
+                ./Cargo.lock
+                ./src
+                ./README.md
+                ./LICENSE
+              ];
+            };
             nativeBuildInputs = with pkgs; [
               pkg-config
               rustPlatform.bindgenHook
             ];
+            strictDeps = true;
             buildInputs =
               with pkgs;
               [
                 xe
                 xz
-                ffmpeg-headless.dev
+                ffmpeg-headless
               ]
               ++ lib.optionals pkgs.stdenv.isLinux (
                 with pkgs;
@@ -71,14 +73,6 @@
                 ]
               );
           };
-        in
-        rec {
-          servicepoint-cli = craneLib.buildPackage (
-            commonArgs
-            // {
-              cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-            }
-          );
 
           default = servicepoint-cli;
         }
@@ -86,19 +80,10 @@
 
       legacyPackages = packages;
 
-      nixosModules.default = {
-        nixpkgs.overlays = [ self.overlays.default ];
-      };
-
-      overlays.default = final: prev: {
-        servicepoint-cli = self.legacyPackages."${prev.stdenv.hostPlatform.system}".servicepoint-cli;
-      };
-
       devShells = forAllSystems (
         {
           pkgs,
           system,
-          ...
         }:
         {
           default = pkgs.mkShell rec {
@@ -121,12 +106,10 @@
             ];
             LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (builtins.concatMap (d: d.buildInputs) inputsFrom)}";
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
-            RUST_LOG = "all";
-            RUST_BACKTRACE = "1";
           };
         }
       );
 
-      formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper);
+      formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
     };
 }

src/image_processing.rs

@@ -164,7 +164,9 @@ impl ImageProcessingPipeline {
         let result = (width, height);
         trace!(
             "scaling {:?} to {:?} to fit {:?}",
-            source, result, self.render_size
+            source,
+            result,
+            self.render_size
         );
         result
     }

src/pixels.rs

@@ -92,8 +92,7 @@ fn pixels_video(
 ) {
     ffmpeg::init().unwrap();
 
-    let mut ictx =
+    let mut ictx = ffmpeg::format::input(&options.file_name).expect("failed to open video input file");
-        ffmpeg::format::input(&options.file_name).expect("failed to open video input file");
 
     let input = ictx
         .streams()
@@ -104,9 +103,7 @@ fn pixels_video(
 
     let context_decoder = ffmpeg::codec::context::Context::from_parameters(input.parameters())
         .expect("could not extract video context from parameters");
-    let mut decoder = context_decoder
+    let mut decoder = context_decoder.decoder().video()
-        .decoder()
-        .video()
         .expect("failed to create decoder for video stream");
 
     let src_width = decoder.width();
@@ -120,8 +117,7 @@ fn pixels_video(
         src_width,
         src_height,
         ffmpeg::software::scaling::Flags::BILINEAR,
-    )
+    ).expect("failed to create scaling context");
-    .expect("failed to create scaling context");
 
     let mut frame_index = 0;
 
@@ -132,16 +128,14 @@ fn pixels_video(
             let mut decoded = ffmpeg::util::frame::video::Video::empty();
             let mut rgb_frame = ffmpeg::util::frame::video::Video::empty();
             while decoder.receive_frame(&mut decoded).is_ok() {
-                scaler
+                scaler.run(&decoded, &mut rgb_frame)
-                    .run(&decoded, &mut rgb_frame)
                     .expect("failed to scale frame");
 
                 let image = RgbImage::from_raw(src_width, src_height, rgb_frame.data(0).to_owned())
                     .expect("could not read rgb data to image");
                 let image = DynamicImage::from(image);
                 let bitmap= processing_pipeline.process(image);
-                connection
+                connection.send_command(BitmapCommand::from(bitmap))
-                    .send_command(BitmapCommand::from(bitmap))
                     .expect("failed to send image command");
 
                 frame_index += 1;
@@ -151,13 +145,13 @@ fn pixels_video(
 
     for (stream, packet) in ictx.packets() {
         if stream.index() == video_stream_index {
-            decoder
+            decoder.send_packet(&packet)
-                .send_packet(&packet)
                 .expect("failed to send video packet");
             receive_and_process_decoded_frames(&mut decoder)
                 .expect("failed to process video packet");
         }
     }
     decoder.send_eof().expect("failed to send eof");
-    receive_and_process_decoded_frames(&mut decoder).expect("failed to eof packet");
+    receive_and_process_decoded_frames(&mut decoder)
+        .expect("failed to eof packet");
 }

src/stream_stdin.rs

@@ -4,9 +4,7 @@ use servicepoint::*;
 use std::thread::sleep;
 
 pub(crate) fn stream_stdin(connection: &Transport, slow: bool) {
-    warn!(
+    warn!("This mode will break when using multi-byte characters and does not support ANSI escape sequences yet.");
-        "This mode will break when using multi-byte characters and does not support ANSI escape sequences yet."
-    );
     let mut app = App {
         connection,
         mirror: CharGrid::new(TILE_WIDTH, TILE_HEIGHT),

src/stream_window.rs

@@ -7,10 +7,10 @@ use image::{DynamicImage, ImageBuffer, Rgb, Rgba};
 use log::{debug, error, info, trace, warn};
 use scap::{
     capturer::{Capturer, Options},
-    frame::Frame,
     frame::convert_bgra_to_rgb,
+    frame::Frame,
 };
-use servicepoint::{BitmapCommand, CompressionCode, FRAME_PACING, Origin};
+use servicepoint::{BitmapCommand, CompressionCode, Origin, FRAME_PACING};
 use std::time::{Duration, Instant};
 
 pub fn stream_window(