diff --git a/hosts/default.nix b/hosts/default.nix
index e2001df..3a02583 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -31,7 +31,7 @@ inputs: let
           networking.hostName = hostname;
           nixpkgs.hostPlatform = system;
         })
-        (flatten (
+        (
           concatLists [
             # configuration for the host, passed as an argument.
             (singleton ./${hostname}/default.nix)
@@ -39,12 +39,12 @@ inputs: let
             (singleton ./common.nix)
             # Import all files called module.nix from my modules directory.
             (
-              filter (hasSuffix "module.nix") (
-                map toString (listFilesRecursive ../modules)
-              )
+              map toString (listFilesRecursive ../modules)
+              |> filter (hasSuffix "module.nix")
             )
           ]
-        ))
+          |> flatten
+        )
       ];
     };
 in {
@@ -61,8 +61,8 @@ in {
     system = "aarch64-linux";
     hostname = "tower";
   };
-  world = mkSystem {
-    system = "x86_64-linux";
-    hostname = "world";
-  };
+  # world = mkSystem {
+  #   system = "x86_64-linux";
+  #   hostname = "world";
+  # };
 }
diff --git a/modules/wms/wayland/hyprland/workspaces.nix b/modules/wms/wayland/hyprland/workspaces.nix
index f526436..d04397d 100644
--- a/modules/wms/wayland/hyprland/workspaces.nix
+++ b/modules/wms/wayland/hyprland/workspaces.nix
@@ -16,10 +16,8 @@ in {
     # To be able to use this for a varying amount of monitors we do some nasty trickery.
     # This was inspired by jacekpoz, whose configuration is linked in this project's README.md.
     workspace =
-      # We're creating several lists of workspace assignments, one for each monitor,
-      # and have to merge them into one big list.
-      (flatten
-        # We then use imap0 insted of map because imap0 starts indexing at zero as oppsed to one with map.
+      (
+        # We use imap0 insted of map because imap0 starts indexing at zero as oppsed to one with map.
         (imap0 (monitorIndex: monitorName: (
             map (
               i: let
@@ -35,7 +33,11 @@ in {
             (genList (i: i + 1 + (10 * monitorIndex)) 10)
           ))
           # our attrSet of different monitors
-          (attrNames monitors)))
+          (attrNames monitors))
+        # We're creating several lists of workspace assignments, one for each monitor,
+        # and have to merge them into one big list.
+        |> flatten
+      )
       # These are my two special workspaces
       ++ [
         "special:nixos, decorate:false"
diff --git a/packages/shell/default.nix b/packages/shell/default.nix
index c6dd285..2fdbabc 100644
--- a/packages/shell/default.nix
+++ b/packages/shell/default.nix
@@ -7,8 +7,9 @@
   fishinit = import ./fishinit.nix {inherit pkgs aliasesStr;};
 
   aliasesStr =
-    pkgs.lib.concatStringsSep "\n"
-    (pkgs.lib.mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases);
+    mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases
+    |> concatStringsSep "\n";
+
   packages = import ./packages.nix pkgs;
 
   # this was taken from viperml, check out his config for this!