schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

treewide: nixfmt

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

63
home/desktop.nix
View file

@ -33,40 +33,39 @@
contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes = [
[ {
{ condition = "gitdir:~/Seafile/Studium/";
condition = "gitdir:~/Seafile/Studium/"; contents = {
user.name = contacts.personal.name;
user.email = contacts.uni.email;
};
}
{
condition = "gitdir:~/src/nixpkgs/";
contents = {
user.name = "Trolli Schmittlauch";
user.email = contacts.nixOs.email;
};
}
]
# set default name for several other common locations
++
map
(dir: {
condition = "gitdir:${dir}";
contents = { contents = {
user.name = contacts.personal.name; user = {
user.email = contacts.uni.email; inherit (contacts.schmittlauch) email name;
};
}
{
condition = "gitdir:~/src/nixpkgs/";
contents = {
user.name = "Trolli Schmittlauch";
user.email = contacts.nixOs.email;
};
}
]
# set default name for several other common locations
++
map
(dir: {
condition = "gitdir:${dir}";
contents = {
user = {
inherit (contacts.schmittlauch) email name;
};
}; };
}) };
[ })
"~/src/" [
"~/bin/" "~/src/"
"~/tmp/" "~/bin/"
"~/nixconfigs/" "~/tmp/"
]; "~/nixconfigs/"
];
}; };
services.gpg-agent = { services.gpg-agent = {

3
home/modules/latex.nix
View file

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

253
home/modules/packages.nix
View file

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

31
home/workmac.nix
View file

@ -66,26 +66,25 @@ in
contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
in in
{ {
includes = includes = [
[ {
{ condition = "gitdir:~/src/schmittlauch/";
condition = "gitdir:~/src/schmittlauch/";
contents = {
user = {
inherit (contacts.schmittlauch) name email;
};
};
}
]
# set default name for several other common locations
++ map (dir: {
condition = "gitdir:${dir}";
contents = { contents = {
user = { user = {
inherit (contacts.work) name email; inherit (contacts.schmittlauch) name email;
}; };
}; };
}) [ "~/" ]; }
]
# set default name for several other common locations
++ map (dir: {
condition = "gitdir:${dir}";
contents = {
user = {
inherit (contacts.work) name email;
};
};
}) [ "~/" ];
}; };
# some extra shell scripts # some extra shell scripts