upgraded to 25.05

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

configuration.nix

@@ -11,31 +11,30 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }: {
-
+  imports = [ 
-## LaTeX...
+    # Include the results of the hardware scan.
-#let tex = pkg.texlive.combine {
+    ./hardware-configuration.nix
-#  inherit (pkgs.texlive) scheme-basic
+  ];
-#  kvoptions calc xargs ifthen iftex pgffor xint xinttools listofitems xkeyval
-#  etoolbox changepage pdfcomment eso-pic environ numprint trimclip xcolor
-#  pagecolor colorspace graphicx adjustbox textpos fancyvrb flowfram rotating
-#  fancyhdr pdfpages geometry;
-#  #(setq org-latex-compiler "lualatex")
-#  #(setq org-preview-latex-default-process 'dvisvgm)
-#};
-#in
 
+  config = lib.mkMerge [
+    # Base configuration...
+    #
+    # The configuration is split into two parts to allow for two stage updates to conserve space
+    # on storage-limited systems.
+    #
+    # To run a two stage update do:
+    #   $ sudo NIX_LIGHTWEIGHT=1 nixos-rebbuild switch
+    #   $ reboot
+    #   $ sudo nix-collect-garbage --delete-old
+    #   $ sudo nixos-rebbuild switch
+    #
     {
       nix.settings.experimental-features = [ 
         "nix-command" 
         "flakes"
       ];
 
-  imports = [ 
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
-
       # Allow unfree packages
       nixpkgs.config.allowUnfree = true;
 
@@ -190,13 +189,15 @@
         pkgs.gnome-tour 
       ];
 
+      security.rtkit.enable = true;
+
       # Enable CUPS to print documents.
       services.printing.enable = true;
 
       # Enable sound with pipewire.
       #sound.enable = true;
-  hardware.pulseaudio.enable = false;
+      #hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
+      services.pulseaudio.enable = false;
       services.pipewire = {
         enable = true;
         alsa.enable = true;
@@ -322,7 +323,8 @@
       environment.systemPackages = with pkgs; [
         usbutils udiskie udisks
         exfat exfatprogs
-    scrounge-ntfs
+        # XXX 20250614: does not build on 25.05
+        #scrounge-ntfs
 
         vim-full
         #micro
@@ -359,31 +361,7 @@
         tldr
         bat
 
-    # LaTeX
-    (texlive.combine {
-      inherit (texlive) scheme-medium
-      # missing:
-      #   calc graphicx ifthen pgffor rotating trimclip xinttools 
-      kvoptions xargs ifthenx iftex xint listofitems xkeyval
-      etoolbox changepage pdfcomment eso-pic environ numprint xcolor
-      pagecolor colorspace graphics adjustbox textpos fancyvrb flowfram
-      fancyhdr pdfpages geometry 
-      anyfontsize cprotect ccicons 
-      # XXX this seems to be missing...
-      #suffix 
-      lipsum 
-      hardwrap catchfile 
-      # photobook...
-      photobook
-      # doc...
-      titlesec hypdoc doctools needspace xstring listings imakeidx  
-      latexmk;
-      #(setq org-latex-compiler "lualatex")
-      #(setq org-preview-latex-default-process 'dvisvgm)
-    })
-
         # fonts...
-    nerdfonts
         terminus_font 
 
         # GUI
@@ -443,10 +421,6 @@
         ffmpeg #ffmpegthumbnailer
         httrack
 
-    #blender
-    #krita
-
-    #texlive.combined.scheme-full 
       ];
 
       programs.geary.enable = false;
@@ -502,3 +476,54 @@
       # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
       system.stateVersion = "23.05"; # Did you read the comment?
     }
+
+
+    # Full config...
+    (lib.mkIf (builtins.getEnv "NIX_LIGHTWEIGHT" == "") {
+      environment.systemPackages = with pkgs; [
+
+        # LaTeX
+        #texlive.combined.scheme-full 
+        (texlive.combine {
+          inherit (texlive) scheme-medium
+          # missing:
+          #   calc graphicx ifthen pgffor rotating trimclip xinttools 
+          kvoptions xargs ifthenx iftex xint listofitems xkeyval
+          etoolbox changepage pdfcomment eso-pic environ numprint xcolor
+          pagecolor colorspace graphics adjustbox textpos fancyvrb flowfram
+          fancyhdr pdfpages geometry 
+          anyfontsize cprotect ccicons 
+          # XXX this seems to be missing...
+          #suffix 
+          lipsum 
+          hardwrap catchfile 
+          # photobook...
+          photobook
+          # doc...
+          titlesec hypdoc doctools needspace xstring listings imakeidx  
+          latexmk;
+          #(setq org-latex-compiler "lualatex")
+          #(setq org-preview-latex-default-process 'dvisvgm)
+        })
+
+        # fonts...
+        #nerdfonts
+
+        #blender
+        #krita
+        #gimp3
+        gimp3-with-plugins
+
+      ];
+
+      # Nerd Fonts...
+      fonts.packages = [
+        pkgs.nerd-fonts.droid-sans-mono
+      ];
+      #fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+      # all nerd fonts (~8G)...
+      #fonts.packages = builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+
+    }) 
+  ];
+}