treewide: nixfmt

nixfmt 1.0 has breaking formatting changes
This commit is contained in:
Trolli Schmittlauch 2025-07-30 21:22:01 +02:00
parent 511462d617
commit ce54be9aac
4 changed files with 172 additions and 178 deletions

View file

@ -43,5 +43,6 @@ in
koma-script
;
})
] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
]
++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
}

View file

@ -12,88 +12,85 @@ let
unstable = inputs.nixos-unstable.legacyPackages.${system};
nur = inputs.nur.legacyPackages.${system};
graphicsApps =
[
inkscape
darktable
exiftool
]
++ (with gimp3Plugins; [
#fourier # broken
#lqrPlugin # broken
])
++ lib.optionals pkgs.stdenv.isLinux [
gimp3
hugin
#luminanceHDR # FIXME, build failure
xournalpp
]
++ lib.optionals pkgs.stdenv.isDarwin [
gimp
];
graphicsApps = [
inkscape
darktable
exiftool
]
++ (with gimp3Plugins; [
#fourier # broken
#lqrPlugin # broken
])
++ lib.optionals pkgs.stdenv.isLinux [
gimp3
hugin
#luminanceHDR # FIXME, build failure
xournalpp
]
++ lib.optionals pkgs.stdenv.isDarwin [
gimp
];
multimediaApps =
[
mpv
yt-dlp
]
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
++ lib.optionals pkgs.stdenv.isLinux [
vlc
amarok
clementine
kdePackages.elisa
musescore
tenacity
soundkonverter
#nur.repos.fooker.studio-link
];
multimediaApps = [
mpv
yt-dlp
]
++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ]
++ lib.optionals pkgs.stdenv.isLinux [
vlc
amarok
clementine
kdePackages.elisa
musescore
tenacity
soundkonverter
#nur.repos.fooker.studio-link
];
cliApps =
[
coreutils
myVim
htop
tmux
httpie
rsync
ponysay
gti
tree
lsof
mosh
openssh
sshfs-fuse
sshuttle
cryfs
thefuck
gnupg
unar
lzop
p7zip
pwgen
pandoc
pdfgrep
# zig dependency breaks occasionally, stay on C version for now
ncdu_1
dos2unix
unzip
fswatch
jq
age
lnav
spacer
cliApps = [
coreutils
myVim
htop
tmux
httpie
rsync
ponysay
gti
tree
lsof
mosh
openssh
sshfs-fuse
sshuttle
cryfs
thefuck
gnupg
unar
lzop
p7zip
pwgen
pandoc
pdfgrep
# zig dependency breaks occasionally, stay on C version for now
ncdu_1
dos2unix
unzip
fswatch
jq
age
lnav
spacer
nix-output-monitor # putting this here as a plain `nix` alternative
]
++ lib.optionals pkgs.stdenv.isLinux [
xclip
smbnetfs # for FUSE smb mounting
psmisc # for killall
torsocks
agrep
reptyr # re-bind running program to other tty
];
nix-output-monitor # putting this here as a plain `nix` alternative
]
++ lib.optionals pkgs.stdenv.isLinux [
xclip
smbnetfs # for FUSE smb mounting
psmisc # for killall
torsocks
agrep
reptyr # re-bind running program to other tty
];
nixHelpers = [
nixpkgs-review
@ -101,30 +98,29 @@ let
nix-top
statix
];
devTools =
[
curl
httpie
gcc
shellcheck
mtr
ripgrep
fd
gitui
pre-commit
scriv
devTools = [
curl
httpie
gcc
shellcheck
mtr
ripgrep
fd
gitui
pre-commit
scriv
# Haskell
ghc
cabal2nix
]
++ lib.optionals pkgs.stdenv.isLinux [
gdb
strace
ltrace
valgrind
zeal
];
# Haskell
ghc
cabal2nix
]
++ lib.optionals pkgs.stdenv.isLinux [
gdb
strace
ltrace
valgrind
zeal
];
pythonTools = with python3Packages; [
python # to shadow old macOS python
@ -196,33 +192,32 @@ let
chromedriver
];
kdeTools =
[
okteta
plasma5Packages.kdeconnect-kde
]
++ (with kdePackages; [
okular
gwenview
yakuake
dolphin
spectacle
kate
kleopatra
qdirstat
ark
kwalletmanager
#ktouch # TODO: unbreak
kcharselect
konversation
krdc
skanlite
akonadiconsole
tokodon # mastodon client
networkmanager-qt
kcrash
breeze-gtk
]);
kdeTools = [
okteta
plasma5Packages.kdeconnect-kde
]
++ (with kdePackages; [
okular
gwenview
yakuake
dolphin
spectacle
kate
kleopatra
qdirstat
ark
kwalletmanager
#ktouch # TODO: unbreak
kcharselect
konversation
krdc
skanlite
akonadiconsole
tokodon # mastodon client
networkmanager-qt
kcrash
breeze-gtk
]);
in
{
options.schmittlauch.packages = {