Compare commits

..

No commits in common. "9cbe85e4097d06b0c4ea6b3bfa7bd109cb378320" and "e6e98ad1ad1c22e4fa1ebf3fd172557fd1950340" have entirely different histories.

View File

@ -11,30 +11,31 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, lib, ... }: { { config, pkgs, ... }:
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
config = lib.mkMerge [ ## LaTeX...
# Base configuration... #let tex = pkg.texlive.combine {
# # inherit (pkgs.texlive) scheme-basic
# The configuration is split into two parts to allow for two stage updates to conserve space # kvoptions calc xargs ifthen iftex pgffor xint xinttools listofitems xkeyval
# on storage-limited systems. # etoolbox changepage pdfcomment eso-pic environ numprint trimclip xcolor
# # pagecolor colorspace graphicx adjustbox textpos fancyvrb flowfram rotating
# To run a two stage update do: # fancyhdr pdfpages geometry;
# $ sudo NIX_LIGHTWEIGHT=1 nixos-rebbuild switch # #(setq org-latex-compiler "lualatex")
# $ reboot # #(setq org-preview-latex-default-process 'dvisvgm)
# $ sudo nix-collect-garbage --delete-old #};
# $ sudo nixos-rebbuild switch #in
#
{ {
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -189,15 +190,13 @@
pkgs.gnome-tour pkgs.gnome-tour
]; ];
security.rtkit.enable = true;
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
#sound.enable = true; #sound.enable = true;
#hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
services.pulseaudio.enable = false; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -323,8 +322,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
usbutils udiskie udisks usbutils udiskie udisks
exfat exfatprogs exfat exfatprogs
# XXX 20250614: does not build on 25.05 scrounge-ntfs
#scrounge-ntfs
vim-full vim-full
#micro #micro
@ -361,7 +359,31 @@
tldr tldr
bat 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... # fonts...
nerdfonts
terminus_font terminus_font
# GUI # GUI
@ -421,6 +443,10 @@
ffmpeg #ffmpegthumbnailer ffmpeg #ffmpegthumbnailer
httrack httrack
#blender
#krita
#texlive.combined.scheme-full
]; ];
programs.geary.enable = false; programs.geary.enable = false;
@ -475,55 +501,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment? 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);
})
];
} }