From 5ae4d237e28bf0cd1605228916ec51774d7f432c Mon Sep 17 00:00:00 2001 From: Tomas Rivera Date: Sat, 9 May 2026 19:22:21 +0200 Subject: [PATCH 1/2] miscellanious stuff --- hosts/laptop/configuration.nix | 2 +- modules/home-manager/sbb-tui.nix | 2 +- modules/packages/labplot.nix | 128 +++++++++++++++++++++++++++++++ modules/packages/sbb-tui.nix | 6 +- modules/packages/z13ctl.nix | 32 ++++++++ 5 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 modules/packages/labplot.nix create mode 100644 modules/packages/z13ctl.nix diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index faee357..e5cd095 100755 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -271,7 +271,7 @@ #vivify # for NoteWrapper # this is more up to date (callPackage ../../modules/packages/vivify.nix {}) - #(callPackage ../../modules/packages/sbb-tui.nix {}) + (callPackage ../../modules/packages/sbb-tui.nix {}) pkgs-unstable.nixpkgs-review pkgs-unstable.nixfmt-tree pkgs-unstable.treefmt diff --git a/modules/home-manager/sbb-tui.nix b/modules/home-manager/sbb-tui.nix index af0698b..48ea119 100644 --- a/modules/home-manager/sbb-tui.nix +++ b/modules/home-manager/sbb-tui.nix @@ -3,7 +3,7 @@ ... }: { home.packages = [ - pkgs-unstable.sbb-tui + #pkgs-unstable.sbb-tui ]; home.file.".config/sbb-tui/config.yaml" = { enable = true; diff --git a/modules/packages/labplot.nix b/modules/packages/labplot.nix new file mode 100644 index 0000000..5c2331a --- /dev/null +++ b/modules/packages/labplot.nix @@ -0,0 +1,128 @@ +{ + lib, + stdenv, + fetchpatch, + fetchurl, + cmake, + extra-cmake-modules, + shared-mime-info, + wrapQtAppsHook, + + qtbase, + + karchive, + kcompletion, + kconfig, + kcoreaddons, + kcrash, + kdoctools, + ki18n, + kiconthemes, + kio, + knewstuff, + kparts, + ktextwidgets, + kxmlgui, + syntax-highlighting, + + gsl, + + poppler, + fftw, + hdf5, + netcdf, + cfitsio, + libcerf, + # cantor, + zlib, + lz4, + readstat, + matio, + qtserialport, + discount, +}: + +stdenv.mkDerivation rec { + pname = "labplot"; + version = "2.10.1"; + + src = fetchurl { + url = "mirror://kde/stable/labplot/labplot-${version}.tar.xz"; + sha256 = "sha256-K24YFRfPtuDf/3uJXz6yDHzjWeZzLThUXgdXya6i2u8="; + }; + + cmakeFlags = [ + # Disable Vector BLF since it depends on DBC parser which fails to be detected + "-DENABLE_VECTOR_BLF=OFF" + ]; + + patches = [ + (fetchpatch { + name = "matio-fix-compilation-for-latest-version-1.5.27.patch"; + url = "https://github.com/KDE/labplot/commit/d6142308ffa492d9f7cea00fad3b4cd1babfd00c.patch"; + hash = "sha256-qD5jj6GxBKbQezKJb1Z8HnwFO84WJBGQDawS/6o/wHE="; + }) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + shared-mime-info + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + ktextwidgets + kxmlgui + + syntax-highlighting + gsl + + poppler + fftw + hdf5 + netcdf + cfitsio + libcerf + # cantor + zlib + lz4 + readstat + matio + qtserialport + discount + ]; + + meta = { + description = "Free, open source and cross-platform data visualization and analysis software accessible to everyone"; + homepage = "https://labplot.kde.org"; + license = with lib.licenses; [ + asl20 + bsd3 + cc-by-30 + cc0 + gpl2Only + gpl2Plus + gpl3Only + gpl3Plus + lgpl3Plus + mit + ]; + maintainers = [ "tomasriveral" ]; + mainProgram = "labplot2"; + platforms = lib.platforms.unix; + }; +} diff --git a/modules/packages/sbb-tui.nix b/modules/packages/sbb-tui.nix index 3fccbbd..815def8 100644 --- a/modules/packages/sbb-tui.nix +++ b/modules/packages/sbb-tui.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "sbb-tui"; - version = "1.13.4"; + version = "1.14.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Necrom4"; repo = "sbb-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLjAhs5UbqgNYqpA3cDucrAS6ell+0JiDJNf7G33Nhs="; + hash = "sha256-nXkzy5PDR3MRrA0Hsh6/icjAbYyBR2q7oBn74ir1O3E="; }; vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w="; @@ -24,6 +24,8 @@ buildGoModule (finalAttrs: { "-w" "-X main.version=${finalAttrs.version}" ]; + + allowGoReference = true; doCheck = true; diff --git a/modules/packages/z13ctl.nix b/modules/packages/z13ctl.nix new file mode 100644 index 0000000..212f7cf --- /dev/null +++ b/modules/packages/z13ctl.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule { + pname = "z13ctl"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "dahui"; + repo = "z13ctl"; + rev = "v1.1.6"; + hash = "sha256-21mdAzbw8JISDLG7iSEI4VCephDTtbioN0/RRxvCLR8="; + }; + + vendorHash = "sha256-ftkcianIR36PNAoMOVuk4lUr7goWUcHhjyNseUraJU0="; + + subPackages = [ "." ]; + + __structuredAttrs = true; + + meta = with lib; { + description = "Utility for ASUS ROG Flow Z13 (2025)"; + homepage = "https://github.com/dahui/z13ctl"; + license = licenses.asl20; + platforms = platforms.linux; + mainProgram = "z13ctl"; + maintainers = with maintainers; [ badheuristic ]; + }; +} From 36267186564df8a3325cfef791af2ff68bbba3f7 Mon Sep 17 00:00:00 2001 From: Tomas Rivera Date: Sat, 9 May 2026 19:24:13 +0200 Subject: [PATCH 2/2] Librewolf: add bookmark https://en.wikipedia.org/wiki/Wikipedia:Signs_of_AI_writing --- modules/home-manager/librewolf.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/home-manager/librewolf.nix b/modules/home-manager/librewolf.nix index 08f13c8..ce224f6 100644 --- a/modules/home-manager/librewolf.nix +++ b/modules/home-manager/librewolf.nix @@ -308,6 +308,12 @@ keyword = "apertus"; url = "https://chat.publicai.co/"; } + { + name = "Signs of AI writing"; + tags = [ "ai" "write"]; + keyword = "AI writing"; + url = "https://en.wikipedia.org/wiki/Wikipedia:Signs_of_AI_writing"; + } ]; }; search = {