Corrected rustnet.nix call, moved it to userapps/utils.nix

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769018530,
+        "lastModified": 1769170682,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {

hosts/puter/default.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{  
   imports = [
     ./hardware-configuration.nix
     ./syncthing.nix

hosts/puter/packages.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   nixpkgs.config.permittedInsecurePackages = [
     "qtwebengine-5.15.19"
     "electron-36.9.5"

modules/common/rustnet.nix

@@ -0,0 +1,28 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.stdenv.mkDerivation rec {
+  pname = "rustnet";
+  version = "0.18.0";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/domcyrus/rustnet/releases/download/v${version}/rustnet-v${version}-x86_64-unknown-linux-musl.tar.gz";
+    hash = "sha256-yAjemn3Qi0GjTG5u7UEXHBJFTCd6ctVacV5UoAX7bWA=";
+  };
+
+  sourceRoot = "rustnet-v${version}-x86_64-unknown-linux-musl";
+
+  installPhase = ''
+    runHook preInstall
+    # 1. Install the binary
+    install -m755 -D rustnet $out/bin/rustnet
+    runHook postInstall
+  '';
+
+  meta = with pkgs.lib; {
+    description = "A cross-platform network monitoring terminal UI tool built with Rust.";
+    #maintainers = lib.maintainers.0x545a;
+    #license = lib.licenses.asl20;
+    homepage = "https://github.com/domcyrus/rustnet";
+    platforms = [ "x86_64-linux" ];
+  };
+}

modules/de/multiple-dms.nix

@@ -9,42 +9,5 @@
     xkb.variant = "intl";
   };
 
-  services.displayManager.ly = {
+  services.displayManager.gdm.enable = true;
-    enable = true;
-    settings = {
-      path = "/run/current-system/sw/bin";
-      restart_cmd = "/run/current-system/systemd/bin/systemctl reboot";
-      service_name = "ly";
-      setup_cmd = "/nix/store/vksm36a608j7szhxn0bcnv5rna9xhxk5-xsession-wrapper";
-      shutdown_cmd = "/run/current-system/systemd/bin/systemctl poweroff";
-      term_reset_cmd = "/nix/store/yijhn548p2589pkybgvbhll09bqsxy0q-ncurses-6.5/bin/tput reset";
-      term_restore_cursor_cmd = "/nix/store/yijhn548p2589pkybgvbhll09bqsxy0q-ncurses-6.5/bin/tput cnorm";
-      # tty = "1";
-      waylandsessions = "/nix/store/1dp80bvcnaq30mh6728lc34xhbjp15zx-desktops/share/wayland-sessions";
-      x_cmd = "/nix/store/a1v7dyv80s5xd19in89h9i3wnll02ns5-xserver-wrapper";
-      xauth_cmd = "/nix/store/s7c6j1cp1xmx8l4ggwx90f51zn9ih0wz-xauth-1.1.4/bin/xauth";
-      xsessions = "/nix/store/1dp80bvcnaq30mh6728lc34xhbjp15zx-desktops/share/xsessions";
-      bigclock = "en";
-      bigclock_seconds = "true";
-      box_title = "Puter";
-      brightness_down_cmd = "bindsym XF86MonBrightnessDown exec light - U 5";
-      brightness_up_cmd = "bindsym XF86MonBrightnessUp exec light - A 5";
-      animation = "colormix";
-      battery_id = "BAT0";
-      bg = "0x00000000";
-      # Error background color id
-      error_bg = "0x00000000";
-      # Default is red and bold
-      error_fg = "0x01FF0000";
-      # Color mixing animation first color id
-      colormix_col1 = "0x66537B";
-      # Color mixing animation second color id
-      colormix_col2 = "0x292134";
-      # Color mixing animation third color id
-      colormix_col3 = "0x110D13";
-      # Foreground color id
-      fg = "0xB4BEFE";
-    };
-  };
-  # services.displayManager.gdm.enable = true;
 }

modules/userapps/utils.nix

@@ -2,7 +2,11 @@
   config,
   pkgs,
   ...
-}: {
+}:
+let
+  rustnet = pkgs.callPackage ../../modules/common/rustnet.nix {};
+in
+{
   programs.neovim = {defaultEditor = true;};
   environment.systemPackages = with pkgs; [
     parallel-disk-usage
@@ -27,5 +31,6 @@
     just
     nh
     tty-clock
+    rustnet
   ];
 }