diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 790cc05..5703b5b 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -6,7 +6,6 @@
         ./x270.nix
         ./scanner.nix
         ./printer.nix
-        # ./clamav.nix
     ];
 
     boot.loader.systemd-boot.enable = true;
@@ -67,13 +66,12 @@
         vlc mpv a52dec
         gthumb
         gimp
-        darktable
         tenacity
 
         openscad
         freecad
         solvespace
-        dune3d
+        (pkgs.callPackage ../packages/dune3d.nix {})
 
         vscodium
         marktext
@@ -81,7 +79,6 @@
         libreoffice-fresh
         tdesktop
         horizon-eda
-        kicad-small
         cura
         pulseview
         nextcloud-client
@@ -118,9 +115,8 @@
 
     programs.steam = {
         enable = true;
-        remotePlay.openFirewall = true;
-        dedicatedServer.openFirewall = true;
-        localNetworkGameTransfers.openFirewall = true;
+        # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+        # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     };
 
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -128,7 +124,6 @@
         "steam-original"
         "steam-runtime"
         "steam-run"
-        "steam-unwrapped"
     ];
 
     fileSystems."/windows" = {
diff --git a/hosts/clamav.nix b/hosts/clamav.nix
deleted file mode 100644
index a6c9c79..0000000
--- a/hosts/clamav.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-    environment.systemPackages = [
-        pkgs.clamav
-    ];
-    services.clamav.daemon.enable = true;
-
-    services.clamav.updater.enable = true;
-}
diff --git a/packages/dune3d.nix b/packages/dune3d.nix
new file mode 100644
index 0000000..f32ce7c
--- /dev/null
+++ b/packages/dune3d.nix
@@ -0,0 +1,65 @@
+{
+    cmake,
+    eigen,
+    fetchFromGitHub,
+    glm,
+    gobject-introspection,
+    gtkmm4,
+    lib,
+    libepoxy,
+    librsvg,
+    libspnav,
+    libuuid,
+    meson,
+    ninja,
+    opencascade-occt,
+    pkg-config,
+    python3,
+    gcc13Stdenv,
+    wrapGAppsHook,
+}:
+
+gcc13Stdenv.mkDerivation rec {
+    pname = "dune3d";
+    version = "1.1.0";
+
+    src = fetchFromGitHub {
+        owner = "dune3d";
+        repo = "dune3d";
+        rev = "v${version}";
+        hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";
+    };
+
+    nativeBuildInputs = [
+        gobject-introspection
+        meson
+        ninja
+        pkg-config
+        wrapGAppsHook
+    ];
+    buildInputs = [
+        cmake
+        eigen
+        glm
+        gtkmm4
+        libepoxy
+        librsvg
+        libspnav
+        libuuid
+        opencascade-occt
+        (python3.withPackages (pp: [
+            pp.pygobject3
+        ]))
+    ];
+
+    env.CASROOT = opencascade-occt;
+
+    meta = with lib; {
+        description = "3D CAD application";
+        homepage = "https://dune3d.org";
+        license = licenses.gpl3Plus;
+        mainProgram = "dune3d";
+        platforms = platforms.linux;
+    };
+}
+