Merge pull request 'fix(sleep): revert s2sleep as it introduces crashes after the wake-up of the system' (#64) from fix/sleep into main

Reviewed-on: #64

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "lastModified": 1782949081,
+        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
+        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781365335,
-        "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
+        "lastModified": 1784546264,
+        "narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
+        "rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
+        "lastModified": 1784497964,
+        "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
+        "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1781388258,
-        "narHash": "sha256-Kx1zxra9sZ215H3OiWUfkulu8N2v3iu19wqlzpD/Ac0=",
+        "lastModified": 1784057377,
+        "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e3c908fdf6dff268b04ffb6758bcfc7c018489b9",
+        "rev": "07180a087e4a00720dc0731cbcd8dec796974381",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781443008,
-        "narHash": "sha256-ZycdrXdxhHYtw9FV10T6A+Tj1Hkq3WKtWnxQ317uXC8=",
+        "lastModified": 1784556533,
+        "narHash": "sha256-tlcP2x7d+ldS3BypTcInqrsOhi6BPuSSTeubfBMmm8Y=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "2b82e4a2719b8bb0cd2da9716ed30302e9299ed6",
+        "rev": "815635cf7dc810616c9e6ecf4b9b4f4c54e69905",
         "type": "github"
       },
       "original": {

hosts/argon/configuration.nix

@@ -2,11 +2,12 @@
 
 {
   imports = [
+    ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/calibre.nix
-    ../../modules/nixos/claudecode.nix
     ../../modules/nixos/certificates.nix
+    ../../modules/nixos/claudecode.nix
     ../../modules/nixos/drives.nix
     ../../modules/nixos/gnupg.nix
     ../../modules/nixos/gnuradio.nix
@@ -21,9 +22,8 @@
     ../../modules/nixos/protonvpn.nix
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix
-    ../../modules/nixos/stellarium.nix
-    ../../modules/nixos/thunar.nix
     ../../modules/nixos/steam.nix
+    ../../modules/nixos/thunar.nix
     ../../modules/nixos/users.nix
   ];
 

hosts/neon/configuration.nix

@@ -2,9 +2,11 @@
 
 {
   imports = [
+    ../../modules/nixos/astro.nix
     ../../modules/nixos/audio.nix
     ../../modules/nixos/bootloader.nix
     ../../modules/nixos/certificates.nix
+    ../../modules/nixos/claudecode.nix
     ../../modules/nixos/docker.nix
     ../../modules/nixos/gnupg.nix
     ../../modules/nixos/locales.nix
@@ -17,7 +19,6 @@
     ../../modules/nixos/sddm.nix
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix
-    ../../modules/nixos/stellarium.nix
     ../../modules/nixos/steam.nix
     ../../modules/nixos/users.nix
   ];

modules/nixos/astro.nix

@@ -0,0 +1,78 @@
+{ config, lib, pkgs, ... }:
+
+let
+  # Siril's Python plugins (sirilpy) run in a venv that pip-installs foreign
+  # manylinux wheels (numpy, GraXpert deps, ...). Those .so files need
+  # libstdc++ at runtime. nix-ld does NOT cover this: it only handles the
+  # initial exec of a foreign binary, but here a *native* nixpkgs python
+  # dlopen()s the foreign wheel. So we put the libs on LD_LIBRARY_PATH, which
+  # the python subprocess inherits from the Siril process.
+  sirilWithPlugins = pkgs.symlinkJoin {
+    name = "siril-with-plugins";
+    paths = [ pkgs.siril ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    # Siril bootstraps its sirilpy venv at first run by locating a `python3`
+    # on PATH. nixpkgs only *propagates* python3 from the siril derivation (it
+    # isn't on the runtime PATH), so without the --prefix PATH below the GUI
+    # fails with "Python not found in system PATH" and never creates
+    # ~/.local/share/siril/venv. We add the same interpreter siril references.
+    #
+    # The VeraLux PyQt6 wheel ships only the built-in Windows/Fusion styles, so
+    # the global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is
+    # rejected ("invalid style override") and windows fall back to a light
+    # theme. We expose nixpkgs adwaita-qt6's style plugin on QT_PLUGIN_PATH so
+    # the override resolves. This works because nixpkgs qt6 and the bundled Qt
+    # share a major.minor (6.11); if they ever drift the plugin is simply
+    # ignored again (harmless warning + Fusion fallback, no loss of function).
+    postBuild = ''
+      wrapProgram $out/bin/siril \
+        --prefix PATH : ${lib.makeBinPath [ pkgs.python3 ]} \
+        --prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [
+          stdenv.cc.cc.lib   # libstdc++ / libgcc_s / libgomp  (numpy etc.)
+          zlib
+          zstd               # libzstd.so.1                     (PyQt6)
+          libGL              # libGL.so.1                       (PyQt6)
+          # PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
+          # on Wayland; libxkbcommon is the keymap lib used by Wayland too.
+          glib
+          fontconfig
+          freetype
+          dbus
+          libxkbcommon
+          # Qt platform plugins: the wayland plugin (libqwayland.so) needs the
+          # wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
+          wayland            # libwayland-client/cursor/egl       (wayland plugin)
+          libxcb-cursor      # libxcb-cursor.so.0                 (xcb plugin)
+          libx11
+          libxcb
+          libxcb-util
+          libxcb-wm
+          libxcb-image
+          libxcb-keysyms
+          libxcb-render-util
+        ])}
+    '';
+  };
+in
+{
+  # install stellarium for target finding and siril for stacking
+  environment.systemPackages = with pkgs; [
+    stellarium
+    sirilWithPlugins
+  ];
+
+  # StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build
+  # (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
+  # and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
+  #   Preferences -> Miscellaneous -> StarNet executable
+  # to the extracted ./starnet2 binary.
+  #
+  # The binary is a generic dynamically-linked ELF, so NixOS needs nix-ld to
+  # run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = with pkgs; [
+    stdenv.cc.cc.lib   # libstdc++ / libgcc_s
+    zlib
+  ];
+}

modules/nixos/bootloader.nix

@@ -17,7 +17,7 @@
   };
 
   # kernel options
-  boot.kernelParams = [ "quiet" "acpi.debug_level=0"];
+  boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.consoleLogLevel = 2;
 

modules/nixos/noctalia.nix

@@ -7,6 +7,7 @@
     adwaita-qt
     adwaita-qt6
     brightnessctl
+    ddcutil
     playerctl
   ];
 }

modules/nixos/packages.nix

@@ -4,6 +4,7 @@
   # system packages
   environment.systemPackages = with pkgs; [
     btop
+    cifs-utils
     cowsay
     dnsutils
     ethtool
@@ -20,6 +21,7 @@
     ltrace
     mtr
     neovim
+    nfs-utils
     nh
     nix-output-monitor
     nmap
@@ -34,9 +36,9 @@
     unzip
     usbutils
     vim
-    wl-clipboard
     wget
     which
+    wl-clipboard
     xz
     zip
     zstd

modules/nixos/stellarium.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  # install stellarium for stargazing and sky simulation
-  environment.systemPackages = with pkgs; [
-    stellarium
-  ];
-}