diff --git a/flake.nix b/flake.nix
index 3483e27..95f319a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,11 @@
     dan.inputs.nixpkgs.follows = "unstable";
   };
 
-  outputs = {home-manager-2205, unstable, nur, dan, ... }:
+  outputs = {self, home-manager-2205, unstable, nur, dan, ... }:
+  let
+    pvv-home = "/home/pvv/d/${pvv-username}";
+    pvv-username = "danio";
+  in
   {
     homeConfigurations.laptop = home-manager-2205.lib.homeManagerConfiguration {
       configuration = import ./machines/laptop.nix;
@@ -23,7 +27,27 @@
       username = "daniel";
       homeDirectory = "/home/daniel";
       stateVersion = "22.05";
-      extraSpecialArgs = { inherit nur unstable dan; };
+      extraSpecialArgs = { inherit (self) overlays; };
     };
+
+
+    homeConfigurations.pvv-terminal = home-manager-2205.lib.homeManagerConfiguration {
+      configuration = import ./machines/pvv-terminal.nix;
+      system = "x86_64-linux";
+      username = pvv-username;
+      homeDirectory = pvv-home;
+      stateVersion = "22.05";
+      extraSpecialArgs = { inherit (self) overlays; };
+    };
+
+    overlays = [
+      (final: prev: {
+        unstable = import unstable {
+          inherit (prev) system config;
+        };
+        dan = dan.packages.${prev.system};
+      })
+      nur.overlay
+    ];
   };
 }
diff --git a/machines/laptop.nix b/machines/laptop.nix
index 9d53671..210d511 100644
--- a/machines/laptop.nix
+++ b/machines/laptop.nix
@@ -1,17 +1,8 @@
-{ config, lib, pkgs, nur, unstable, dan, ... }:
+{ config, lib, pkgs, overlays, ... }:
 {
-  nixpkgs.overlays = [
-    nur.overlay
-    (final: prev: {
-      unstable = import unstable {
-        inherit (prev) system;
-        config.allowUnfree = true;
-      };
-
-      dan = dan.packages.${prev.system};
-    })
-  ];
+  nixpkgs.overlays = overlays;
   nixpkgs.config.allowUnfreePredicate = (pkg: true);
+  nixpkgs.config.allowUnfree = true;
 
   imports = [ ../profiles ];
 
diff --git a/machines/pvv-terminal.nix b/machines/pvv-terminal.nix
index 626a9c9..bd4c41f 100644
--- a/machines/pvv-terminal.nix
+++ b/machines/pvv-terminal.nix
@@ -1,5 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, overlays, ... }:
 {
+  nixpkgs.overlays = overlays;
+  #nixpkgs.config.allowUnfreePredicate = (pkg: true);
+
   imports = [ ../profiles ];
 
   machine = {
diff --git a/profiles/audio.nix b/profiles/audio.nix
index 6b4572a..4a815ad 100644
--- a/profiles/audio.nix
+++ b/profiles/audio.nix
@@ -21,6 +21,7 @@ in
 
     ] ++ lib.optionals config.profiles.gui.enable (with pkgs; [
       pavucontrol
+    ]) ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) (with pkgs; [
       spotify
     ]) ++ lib.optionals cfg.fancy (with pkgs; [
       carla
diff --git a/profiles/base/default.nix b/profiles/base/default.nix
index ffed43a..0308ae0 100644
--- a/profiles/base/default.nix
+++ b/profiles/base/default.nix
@@ -81,7 +81,7 @@ in {
       konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
 
       gnome3.gedit
-      unstable.vscode
+      vscodium
 #      texlive.combined.scheme-full
 #      kile
       libreoffice
@@ -97,7 +97,7 @@ in {
 #      ardour
       kdenlive
       frei0r
-      
+    ]  ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) [
       geogebra
     ];