diff --git a/defaults/desktop/hardware.nix b/defaults/desktop/hardware.nix
index f97d375..348cbb7 100644
--- a/defaults/desktop/hardware.nix
+++ b/defaults/desktop/hardware.nix
@@ -12,7 +12,6 @@
   # Enable sound.
   nixpkgs.config.pulseaudio = true;
 
-
   services.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
diff --git a/flake.nix b/flake.nix
index 7b2a616..c24a0cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,7 @@
         "ochsenchopf"
       ];
     in
+    with pkgsUnstable.lib;
     {
       # Build with `nixos-rebuild --flake .#<hostname>` or
       # `nix build .#nixosConfigurations.<hostname>.config.system.build.toplevel
@@ -100,19 +101,13 @@
               ] ++ (if host == "bachtel" then [ ] else [ home-manager-config ]);
             };
         in
-        pkgsUnstable.lib.genAttrs hosts mapHostnameToAttr;
+        genAttrs hosts mapHostnameToAttr;
 
-      # Nix development shell
-      devShells.${system}.default = import ./shell.nix { pkgs = pkgsUnstable; };
-
-      # Run checks and build all hosts as default package
       packages.${system}.default =
-        with pkgsUnstable.lib;
         let
-          checks = attrValues self.checks.${system};
           nixosConfigs = mapAttrsToList (n: v: v.config.system.build.toplevel) self.nixosConfigurations;
         in
-        pkgsUnstable.linkFarmFromDrvs "allHosts" (checks ++ nixosConfigs);
+        pkgsUnstable.linkFarmFromDrvs "all" nixosConfigs;
 
       formatter.${system} = pkgsUnstable.nixfmt-rfc-style;
     };
diff --git a/home/fhauser/applications/gpg.nix b/home/fhauser/applications/gpg.nix
index 55fb4b8..9d27353 100644
--- a/home/fhauser/applications/gpg.nix
+++ b/home/fhauser/applications/gpg.nix
@@ -20,7 +20,8 @@
       "personal-cipher-preferences" = "AES256 AES192 AES CAST5";
       "cert-digest-algo" = "SHA512";
       "personal-digest-preferences" = "SHA512 SHA384 SHA256 SHA224";
-      "default-preference-list" = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
+      "default-preference-list" =
+        "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
       "display-charset" = "utf-8";
       "fixed-list-mode" = true;
       "with-fingerprint" = true;
@@ -42,7 +43,7 @@
     enableScDaemon = true;
     enableSshSupport = true;
     enableExtraSocket = true;
-    # TODO: pinentryPackage = 
+    # TODO: pinentryPackage =
     extraConfig =
       let
         pinentryBemenu = pkgs.writeShellApplication {
diff --git a/home/fhauser/applications/waybar.nix b/home/fhauser/applications/waybar.nix
index cb09139..95e7e53 100644
--- a/home/fhauser/applications/waybar.nix
+++ b/home/fhauser/applications/waybar.nix
@@ -17,7 +17,7 @@
     settings = [
       {
         position = "top";
-        #height = 
+        #height =
         modules-left = [
           "sway/mode"
           "sway/workspaces"
diff --git a/home/fhauser/multimedia.nix b/home/fhauser/multimedia.nix
index a77dd0b..72c9bea 100644
--- a/home/fhauser/multimedia.nix
+++ b/home/fhauser/multimedia.nix
@@ -57,7 +57,8 @@
       libdvbpsi # librtmp
       xvidcore
       x264
-    ] ++ (with gst_all_1; [
+    ]
+    ++ (with gst_all_1; [
       gstreamer
       gst-vaapi
       gst-rtsp-server