diff --git a/nixos/common.nix b/nixos/common.nix
index 78343e8c..f50d23e7 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -2,6 +2,7 @@
 
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz;
+  bisqTarball = fetchTarball https://github.com/emmanuelrosa/nixpkgs/archive/6ee154d2bc8c4c48cde2d7ae5bcd0a3da28b2b72.tar.gz;
   nurTarball = fetchTarball https://github.com/nix-community/NUR/archive/master.tar.gz;
 in
   {
@@ -23,6 +24,9 @@ in
           unstable = import unstableTarball {
             config = config.nixpkgs.config;
           };
+          bisq = import bisqTarball {
+            config = config.nixpkgs.config;
+          };
           nur = import nurTarball {
             inherit pkgs;
           };
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index 6a0c320b..19e274ba 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -38,6 +38,9 @@
       spotify shotwell
       gnome-builder flatpak-builder flatpak python38Packages.lxml python38Packages.jedi meson
       libreoffice simple-scan
+      unstable.freecad
+      unstable.openscad
+      unstable.inkscape
     ];
   };
 }
diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix
index ee45dc04..f171a99a 100644
--- a/nixos/home-manager/cli.nix
+++ b/nixos/home-manager/cli.nix
@@ -2,7 +2,7 @@
 {
   home.packages = with pkgs; [
     ( pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ]))
-    nur.repos.emmanuelrosa.bisq-desktop
+    bisq.bisq-desktop
     apvlv
     aria
     atop