updates

modules/default.nix

@@ -18,6 +18,7 @@
     ./npm.nix
     ./tailscale.nix
     ./udiskie.nix
+    ./ffmpeg.nix
     # ./ollama.nix
   ];
 

modules/env.nix

@@ -4,8 +4,11 @@
   ...
 }: {
   environment.shellInit = ''
-    if [ -d $HOME/.cargo/bin ]; then
-      export PATH=$PATH:$HOME/.cargo/bin
+    if [ -d "$HOME/.cargo/bin" ]; then
+      export PATH="$PATH:$HOME/.cargo/bin"
+    fi
+    if [ -d "$HOME/.npm-global/bin" ]; then
+      export PATH="$PATH:$HOME/.npm-global/bin"
     fi
   '';
 
@@ -14,11 +17,38 @@
     VISUAL = "nvim";
     TERM = "ghostty";
     CC = "${pkgs.gcc}/bin/gcc";
+    LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;${pkgs.luajit}/share/lua/5.1/?/init.lua;;";
+    LUA_CPATH = "${pkgs.luajit}/lib/lua/5.1/?.so;;";
     PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [
+      pkgs.mesa.drivers
       pkgs.openssl.dev
       pkgs.libxml2.dev
       pkgs.zlib.dev
+      pkgs.ffmpeg
+      pkgs.portaudio
+      pkgs.alsa-lib
+      pkgs.stdenv.cc.cc
+      pkgs.xorg.libX11.dev
+      pkgs.xorg.libXtst
+      pkgs.xorg.libXi.dev
     ];
+    LD_LIBRARY_PATH = lib.makeLibraryPath [
+      pkgs.libglvnd
+      pkgs.mesa.drivers
+      pkgs.gcc-unwrapped.lib
+      pkgs.linuxPackages.nvidia_x11
+      pkgs.cudatoolkit
+      pkgs.mangohud
+      pkgs.portaudio
+      pkgs.alsa-lib
+      pkgs.ffmpeg
+      pkgs.stdenv.cc.cc.lib
+      pkgs.xorg.libX11
+      pkgs.xorg.libXtst
+      pkgs.xorg.libXi
+      pkgs.glib
+    ];
+    NPM_CONFIG_PREFIX = "$HOME/.npm-global";
   };
 
   environment.pathsToLink = [

modules/ffmpeg.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    ffmpeg_7-full
+  ];
+}

modules/net.nix

@@ -19,6 +19,8 @@
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   networking.firewall.enable = false;
-  # Enable the OpenSSH daemon.
   services.openssh.enable = true;
+
+  # Disable NetworkManager-wait-online to fix boot hang
+  systemd.services."NetworkManager-wait-online".enable = false;
 }

modules/npm.nix

@@ -21,7 +21,6 @@ in {
       electron
     ];
     environment.variables = {
-      NPM_CONFIG_PREFIX = npmGlobalDir;
       PATH = [
         "${pkgs.nodejs_22}/bin"
         "${npmGlobalDir}/bin"

modules/python.nix

@@ -18,7 +18,8 @@
   gccLibPath = "${pkgs.gcc-unwrapped.lib}/lib";
   nvidiaLibPath = "${pkgs.linuxPackages.nvidia_x11}/lib";
   cudaLibPath = "${pkgs.cudatoolkit}/lib";
-  ldLibraryPath = "${gccLibPath}:${nvidiaLibPath}:${cudaLibPath}";
+  glvndLibPath = "${pkgs.libglvnd}/lib";
+  ldLibraryPath = "${gccLibPath}:${nvidiaLibPath}:${cudaLibPath}:${glvndLibPath}";
 
   pythonEnv = pkgs.python311.buildEnv.override {
     extraLibs = with py; [
@@ -36,6 +37,7 @@
       jedi
       libcst
       wheel
+      jupyterlab
     ];
     extraOutputsToInstall = ["out"];
     postBuild = ''
@@ -69,7 +71,6 @@ in {
     ];
     environment.variables = {
       PIP_CONFIG_FILE = "${pipConf}";
-      LD_LIBRARY_PATH = lib.mkForce "${ldLibraryPath}";
     };
   };
 }

modules/steam.nix

@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
@@ -35,14 +30,6 @@
     alsa-lib
     ffmpeg
     stdenv.cc.cc.lib
+    libglvnd
   ];
-  environment.sessionVariables = {
-    LD_LIBRARY_PATH = lib.makeLibraryPath [
-      pkgs.mangohud
-      pkgs.portaudio
-      pkgs.alsa-lib
-      pkgs.ffmpeg
-      pkgs.stdenv.cc.cc.lib
-    ];
-  };
 }

modules/user.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   fish-rust = pkgs.callPackage ../pkgs/fish-rust {};
 in {
   # Define a user account. Don't forget to set a password with 'passwd'.
@@ -10,10 +7,6 @@ in {
     description = "Mon Aie";
     extraGroups = ["networkmanager" "wheel" "docker" "video"];
     shell = fish-rust;
-    packages = with pkgs; [
-      # User-specific packages can be defined here
-      # or through home-manager
-    ];
   };
 
   security.sudo = {