diff --git a/.vscode/settings.json b/.vscode/settings.json
index a32e958..bae5a7d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,6 +4,7 @@
         "cp": true,
         "mkdir": true,
         "git add": true,
-        "git commit": true
+        "git commit": true,
+        "just": true
     }
 }
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 2ea53bc..2279a87 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,8 @@
 # TODO
 
-- [ ] Refactor {workstation,server,pi-server}/default.nix to share as much as
+- [x] Refactor {workstation,server,pi-server}/default.nix to share as much as
       possible
 - [ ] do not do mail sync on servers
-- [ ] Get vim reset up
+- [x] Get vim reset up
 - [ ] evaluation warning: 'system' has been renamed to/replaced by
       'stdenv.hostPlatform.system'
diff --git a/home/work/citrix.nix b/home/work/citrix.nix
index 0d77bfe..3b59981 100644
--- a/home/work/citrix.nix
+++ b/home/work/citrix.nix
@@ -1,12 +1,18 @@
 { lib, config, pkgs, inputs, outputs, home-manager, ... }:
 with lib; let
   cfg = config.roles.citrix;
-  citrixPkgs = import inputs.nixpkgs { system = pkgs.system; config = pkgs.config // { permittedInsecurePackages = ["libsoup-2.74.3"]; }; };
+  citrixPkgs = import inputs.nixpkgs {
+    system = pkgs.system;
+    config = pkgs.config // {
+      allowUnfree = true;
+      allowInsecure = true;
+      permittedInsecurePackages = ["libsoup-2.74.3"];
+    };
+  };
 in {
   options.roles.citrix = {enable = lib.mkEnableOption "citrix tools";};
   config = mkIf cfg.enable {
     home-manager.users.don.home.packages = with citrixPkgs; [citrix_workspace];
-    home-manager.users.don.nixpkgs.config.permittedInsecurePackages = ["libsoup-2.74.3"];
     home-manager.users.don.home.file."ICAClient" = {
       recursive = true;
       source = ./files/citrix;