Merge pull request 'chore(flake): update flake file' (#60) from feature/updates into main

Reviewed-on: #60

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "lastModified": 1782949081,
+        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777647296,
-        "narHash": "sha256-B2dllLZyocJ9fN4io22eadYPWynvAdRq/zC2NSjw52k=",
+        "lastModified": 1783358420,
+        "narHash": "sha256-UEyBpf+XmQe8laXfDzIlo11Er7E0rKrLS8jeMnMj0Ds=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d181e6ac2ad01e50c914220d7478fed50b1dbf68",
+        "rev": "0d33882bd46c1f9ef62276700f5e5f2bd6ff6604",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1777236345,
-        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
+        "lastModified": 1783349931,
+        "narHash": "sha256-aYE76ATiGBg7/cQ2dHASRq97WvNum4OOIPgZ8xIK0QI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
+        "rev": "4fd45857deecb90d2732c87e0315daa48505515e",
         "type": "github"
       },
       "original": {
@@ -83,15 +83,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "noctalia-qs": "noctalia-qs"
+        ]
       },
       "locked": {
-        "lastModified": 1777427472,
-        "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=",
+        "lastModified": 1783357432,
+        "narHash": "sha256-fdRJMFj7yAwST3ZEK6JtuqimYPHnt7I18oOfeyC8f0I=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186",
+        "rev": "7a30ffa420b46a02ceab71aee948648c2c87c7c6",
         "type": "github"
       },
       "original": {
@@ -100,29 +99,6 @@
         "type": "github"
       }
     },
-    "noctalia-qs": {
-      "inputs": {
-        "nixpkgs": [
-          "noctalia",
-          "nixpkgs"
-        ],
-        "systems": "systems_2",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1777380063,
-        "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=",
-        "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
-        "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "noctalia-dev",
-        "repo": "noctalia-qs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -133,55 +109,19 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1774449309,
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
+        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "noctalia",
-          "noctalia-qs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

hosts/argon/configuration.nix

@@ -2,14 +2,15 @@
 
 {
   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 -> build error
+    ../../modules/nixos/gnuradio.nix
     ../../modules/nixos/graphics.nix
     ../../modules/nixos/greetd.nix
     ../../modules/nixos/locales.nix
@@ -22,6 +23,7 @@
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.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
@@ -13,6 +15,7 @@
     ../../modules/nixos/noctalia.nix
     ../../modules/nixos/openssh.nix
     ../../modules/nixos/packages.nix
+    ../../modules/nixos/protonvpn.nix
     ../../modules/nixos/sddm.nix
     ../../modules/nixos/services.nix
     ../../modules/nixos/settings.nix

modules/home-manager/nixvim.nix

@@ -4,6 +4,12 @@
   programs.nixvim = {
     enable = true;
 
+    # We keep `inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"` in flake.nix so
+    # the whole config shares a single nixpkgs. Setting `source` explicitly to
+    # that same nixpkgs acknowledges the override and silences nixvim's warning
+    # about its pinned nixpkgs being bypassed.
+    nixpkgs.source = inputs.nixpkgs;
+
     # set aliases
     viAlias = true;
     vimAlias = true;

modules/home-manager/noctalia.nix

@@ -0,0 +1,123 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  # Noctalia v5 shell, managed via its upstream home-manager module.
+  # See https://docs.noctalia.dev/v5/getting-started/nixos/
+  imports = [ inputs.noctalia.homeModules.default ];
+
+  programs.noctalia = {
+    enable = true;
+
+    # The module's `package` option has no default, so it must be set explicitly.
+    package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
+
+    # settings is rendered to ~/.config/noctalia/config.toml 
+    settings = {
+      # theme / colors
+      theme = {
+        source = "builtin";
+        builtin = "Nord";
+        mode = "dark";
+        templates.builtin_ids = [ "ghostty" ];
+      };
+
+      # general
+      shell = {
+        font_family = "0xProto Nerd Font Mono";
+        ui_scale = 1.2;
+        avatar_path = "/home/aaron/syncthing/pictures/Logo-Aaron-Totenkopf-rund-schwarz.png";
+        telemetry_enabled = false;
+        clipboard_enabled = true;
+        password_style = "random";
+
+        panel = {
+          launcher_compact = true;
+          open_near_click_control_center = true;
+          open_near_click_session = true;
+          open_near_click_wallpaper = true;
+          transparency_mode = "glass";
+        };
+
+        screen_corners = {
+          enabled = true;
+          size = 10;
+        };
+      };
+
+      # location / weather
+      location.address = "Bern";
+
+      weather = {
+        enabled = true;
+        unit = "metric";
+      };
+
+      # wallpaper
+      wallpaper = {
+        enabled = true;
+        directory = "/home/aaron/Pictures/Wallpapers";
+        fill_mode = "crop";
+        default.path = "/home/aaron/Pictures/Wallpapers/nord-theme-tower.png";
+      };
+
+      # bar layout
+      bar = {
+        order = [ "default" ];
+        default = {
+          position = "top";
+          background_opacity = 0.93;
+          font_weight = 400;
+          margin_edge = 0;
+          margin_ends = 0;
+          radius = 0;
+          scale = 1.2;
+          widget_spacing = 20;
+          start = [ "control-center" "cpu" "ram" "temp" "active_window" ];
+          center = [ "workspaces" ];
+          end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ];
+        };
+      };
+
+      # per-widget styling
+      widget = {
+        bluetooth.capsule = true;
+        control-center = {
+          capsule_radius = 8;
+          custom_image = "/home/aaron/Pictures/nix_flake_logo.png";
+          scale = 1.4;
+        };
+        cpu.capsule = true;
+        network = {
+          capsule = true;
+          show_label = false;
+        };
+        notifications.capsule = true;
+        ram.capsule = true;
+        temp.capsule = true;
+        volume = {
+          capsule = true;
+          show_label = false;
+        };
+      };
+
+      # idle behavior
+      idle = {
+        behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
+        behavior = {
+          "screen-off" = {
+            enabled = true;
+            timeout = 600;
+          };
+          "lock" = {
+            enabled = true;
+            timeout = 660;
+          };
+          "lock-and-suspend" = {
+            enabled = true;
+            timeout = 1800;
+          };
+        };
+      };
+    };
+  };
+}

modules/home-manager/shell.nix

@@ -8,12 +8,14 @@
     syntaxHighlighting.enable = true;
     oh-my-zsh = {
       enable = true;
-      # theme will be set below
-      theme = "";
+      # add git and agents as plugins
       plugins = [ "git" "ssh-agent" "gpg-agent" ];
-    };
+      # everything here lands before `source $ZSH/oh-my-zsh.sh`
+      extraConfig = ''
+        # make omz faster on large repositories
+        DISABLE_UNTRACKED_FILES_DIRTY=true
+
         # only display a fancy theme when glyphs are rendered
-    initContent = lib.mkOrder 550 ''
         if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
           ZSH_THEME="gentoo"
         else
@@ -21,6 +23,7 @@
         fi
       '';
     };
+  };
 
   # set important env vars
   home.sessionVariables = {

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/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/settings.nix

@@ -32,6 +32,9 @@
     };
   };
   
+  # add trusted users (able to modify the nix store)
+  nix.settings.trusted-users = [ "root" "@wheel" ];
+
   # allow unfree packages (steam, protonvpn, discord, etc.)
   nixpkgs.config.allowUnfree = true;
 

modules/nixos/thunar.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # Enable Thunar
+  programs.thunar.enable = true;
+
+  # Install Tumbler thumbnailer service
+  environment.systemPackages = with pkgs; [
+    tumbler
+  ];
+
+  # Ensure Thunar can locate the thumbnailer extensions
+  environment.pathsToLink = [ "share/thumbnailers" ];
+}

users/aaron/home.nix

@@ -6,6 +6,7 @@
     ../../modules/home-manager/git.nix
     ../../modules/home-manager/ghostty.nix
     ../../modules/home-manager/nixvim.nix
+    ../../modules/home-manager/noctalia.nix
     ../../modules/home-manager/programs.nix
     ../../modules/home-manager/shell.nix
     ../../modules/home-manager/styling.nix