diff --git a/.hm-modules/home-manager.nix b/.hm-modules/home-manager.nix
new file mode 100644
index 0000000..310bc0c
--- /dev/null
+++ b/.hm-modules/home-manager.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+{
+# https://github.com/arouzing/nix/blob/main/hm/sky/home.nix
+  home = {
+    username = "speccon18";
+    homeDirectory = "/home/speccon18";
+    stateVersion = "22.11";
+  };
+  direnv = {
+    enableZshIntegration = true;
+    enable = true;
+  };
+  starship = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+  zsh = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/.modules/features/desktop/environments/wayfire.nix b/.modules/features/desktop/environments/wayfire.nix
new file mode 100644
index 0000000..60282a1
--- /dev/null
+++ b/.modules/features/desktop/environments/wayfire.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, lib, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    inputs.nixpkgs-wayland.packages.${system}.wayfire-unstable
+  ];
+}
\ No newline at end of file
diff --git a/.modules/services/pipewire.nix b/.modules/services/pipewire.nix
new file mode 100644
index 0000000..dfde8b9
--- /dev/null
+++ b/.modules/services/pipewire.nix
@@ -0,0 +1,17 @@
+# https://nixos.wiki/wiki/PipeWire
+{ config, pkgs, lib, ... }:
+{
+    # Remove sound.enable or turn it off if you had it set previously, it seems to cause conflicts with pipewire
+    #sound.enable = false;
+    # rtkit is optional but recommended
+    security.rtkit.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      pulse.enable = true;
+      jack.enable = true;
+    };
+}
\ No newline at end of file