diff --git a/home-manager/features/3d-printing.nix b/home-manager/features/3d-printing.nix
new file mode 100644
index 0000000..b32f7e3
--- /dev/null
+++ b/home-manager/features/3d-printing.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+
+  home.packages = with pkgs; [
+    bambu-studio
+    LycheeSlicer
+    orca-slicer
+    blender
+  ];
+
+  # Options to get Bambu Studio to run:
+  # __GLX_VENDOR_LIBRARY_NAME=mesa __EGL_VENDOR_LIBRARY_FILENAMES=/nix/store/js9cfbjvlsls14nddk39fw74vyvlhz4l-mesa-25.0.7/share/glvnd/egl_vendor.d/50_mesa.json MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink WEBKIT_DISABLE_DMABUF_RENDERER=1 bambu-studio
+}
diff --git a/home-manager/features/shell.nix b/home-manager/features/shell.nix
index 553b765..98fcdd6 100644
--- a/home-manager/features/shell.nix
+++ b/home-manager/features/shell.nix
@@ -17,15 +17,17 @@
     neofetch
     psmisc # fuser, killal, pstree
 
-    # Files
+    # Archives
     zip
     xz
     unzip
     p7zip
+    unrar-wrapper
+
+    # File manipulation
     file
     tree
     yazi # File manager
-    ueberzugpp # for image previews
     w3m # terminal browser for image previews
     dysk # better disk info
     ripgrep # better grep
diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix
index 023d491..3465c58 100644
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -13,6 +13,7 @@
     nerd-fonts.jetbrains-mono
 
     libsixel # For working with images in terminals
+    ueberzugpp # for image previews
   ];
 
   # Allow Home Manager to set fonts.
diff --git a/system/features/flatpak.nix b/system/features/flatpak.nix
new file mode 100644
index 0000000..8a67a7b
--- /dev/null
+++ b/system/features/flatpak.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  services.flatpak.enable = true;
+
+  systemd.services.flatpak-repo = {
+    wantedBy = [ "multi-user.target" ];
+    path = [ pkgs.flatpak ];
+    script = ''
+      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    '';
+  };
+}
diff --git a/system/hosts/altair/default.nix b/system/hosts/altair/default.nix
index 7ccbe2d..a77697a 100644
--- a/system/hosts/altair/default.nix
+++ b/system/hosts/altair/default.nix
@@ -10,6 +10,7 @@
     ../../features/gui.nix
     ../../features/container-dev.nix
     ../../features/android-dev.nix
+    ../../features/flatpak.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix
index b158b08..9126f12 100644
--- a/system/hosts/altair/drew.nix
+++ b/system/hosts/altair/drew.nix
@@ -18,6 +18,7 @@ in
       "/features/gaming.nix"
       "/features/linux-desktop.nix"
       "/features/notes.nix"
+      "/features/3d-printing.nix"
     ]
     ++ [
       (import ../../../home-manager/features/wallpaper.nix monitors)