diff --git a/home/desktop.nix b/home/desktop.nix
index 1e089e7..7fa7840 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -33,40 +33,39 @@
       contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
-      includes =
-        [
-          {
-            condition = "gitdir:~/Seafile/Studium/";
+      includes = [
+        {
+          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 = {
-              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 = {
-                user = {
-                  inherit (contacts.schmittlauch) email name;
-                };
+              user = {
+                inherit (contacts.schmittlauch) email name;
               };
-            })
-            [
-              "~/src/"
-              "~/bin/"
-              "~/tmp/"
-              "~/nixconfigs/"
-            ];
+            };
+          })
+          [
+            "~/src/"
+            "~/bin/"
+            "~/tmp/"
+            "~/nixconfigs/"
+          ];
     };
 
   services.gpg-agent = {
diff --git a/home/modules/latex.nix b/home/modules/latex.nix
index 3f79930..a9b853c 100644
--- a/home/modules/latex.nix
+++ b/home/modules/latex.nix
@@ -43,5 +43,6 @@ in
         koma-script
         ;
     })
-  ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
+  ]
+  ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools;
 }
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 57f097e..d9f1a31 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -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 = {
diff --git a/home/workmac.nix b/home/workmac.nix
index 5227db0..f0803ec 100644
--- a/home/workmac.nix
+++ b/home/workmac.nix
@@ -66,26 +66,25 @@ in
       contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; };
     in
     {
-      includes =
-        [
-          {
-            condition = "gitdir:~/src/schmittlauch/";
-            contents = {
-              user = {
-                inherit (contacts.schmittlauch) name email;
-              };
-            };
-          }
-        ]
-        # set default name for several other common locations
-        ++ map (dir: {
-          condition = "gitdir:${dir}";
+      includes = [
+        {
+          condition = "gitdir:~/src/schmittlauch/";
           contents = {
             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