diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix
index 4e55645..e0842dd 100644
--- a/homes/x86_64-linux/harald@x1/default.nix
+++ b/homes/x86_64-linux/harald@x1/default.nix
@@ -2,19 +2,17 @@
 , ...
 }:
 {
-  home = {
-    username = "harald";
-    homeDirectory = "/home/${config.home.username}";
-    stateVersion = "23.11"; # Please read the comment before changing.
-    sessionPath = [ "$HOME/bin" ];
-  };
+  home.sessionPath = [ "$HOME/bin" ];
 
   plusultra = {
+    user = {
+      enable = true;
+      name = config.snowfallorg.user.name;
+    };
     cli-apps = {
       bash.enable = true;
       fish.enable = true;
       neovim.enable = true;
-      tmux.enable = true;
       bat.enable = true;
       starship.enable = true;
       home-manager.enable = true;
@@ -23,7 +21,6 @@
       git.enable = true;
       direnv.enable = true;
       ssh.enable = true;
-      # jetbrains.enable = true;
     };
   };
 
diff --git a/modules/home/cli-apps/fish/default.nix b/modules/home/cli-apps/fish/default.nix
index 5318b32..ca22cdc 100644
--- a/modules/home/cli-apps/fish/default.nix
+++ b/modules/home/cli-apps/fish/default.nix
@@ -36,18 +36,18 @@ in
         };
       }];
 
-      shellInit =
-        ''
-          # nix
-          if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-              fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-          end
-
-          # home-manager
-          if test -e $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
-              fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
-          end
-        '';
+      #      shellInit =
+      #        ''
+      #          # nix
+      #          if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+      #              fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+      #          end
+      #
+      #          # home-manager
+      #          if test -e $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+      #              fenv source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+      #          end
+      #        '';
     };
   };
 }
diff --git a/modules/nixos/gui/default.nix b/modules/nixos/gui/default.nix
index 8f64e8f..e59338e 100644
--- a/modules/nixos/gui/default.nix
+++ b/modules/nixos/gui/default.nix
@@ -71,7 +71,6 @@ in
 
     environment.systemPackages = with pkgs; [
       bat
-      cachix
       cardpeek
       ccache
       clang
@@ -88,7 +87,7 @@ in
       gnomeExtensions.vitals
       gnupg
       go
-jetbrains-toolbox
+      jetbrains-toolbox
       jq
       kbfs
       keybase
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index 81e7c72..58c3139 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -61,7 +61,6 @@ in
           auto-optimise-store = true;
           trusted-users = users;
           allowed-users = users;
-          allowUnfree = true;
 
           substituters =
             [ cfg.default-substituter.url ]
diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix
index 6eb3d3d..e6a9b29 100644
--- a/systems/x86_64-linux/sgx-nixos/default.nix
+++ b/systems/x86_64-linux/sgx-nixos/default.nix
@@ -109,6 +109,7 @@ with lib.plusultra;
     freetype
     glib
     openssl
+    tmux
     # ...
   ];
 
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index f0fd792..ec300e7 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -1,7 +1,6 @@
 { pkgs, lib, ... }:
 with lib;
 with lib.plusultra;
-
 {
   imports =
     [
@@ -10,7 +9,10 @@ with lib.plusultra;
     ];
 
   plusultra.gui.enable = true;
-
+  plusultra.nix.enable = true;
+  plusultra.nix.extra-substituters = {
+    "https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
+  };
 
   boot = {
     tmp.cleanOnBoot = true;
@@ -30,9 +32,11 @@ with lib.plusultra;
   };
 
   environment = {
+    sessionVariables = { PATH = "$HOME/bin:$HOME/.cargo/bin"; };
     systemPackages = with pkgs; [
-     age
-appimage-run
+      age
+      bash
+      cachix
       cifs-utils
       clevis
       delta
@@ -41,7 +45,6 @@ appimage-run
       git-delete-merged-branches
       home-manager
       htop
-      mdadm
       mosh
       nixpkgs-fmt
       openssl
@@ -154,20 +157,29 @@ appimage-run
 
   # Sets up all the libraries to load
   programs.nix-ld.libraries = with pkgs; [
-    appimage-run
-    stdenv.cc.cc
-    libclang.lib
-    zlib
-    fuse3
-    fuse
-    icu
-    nss
     curl
     expat
+    fontconfig
     freetype
+    fuse
+    fuse3
     glib
+    icu
+    libclang.lib
+    libdbusmenu
+    libxcrypt-legacy
+    libxml2
+    nss
     openssl
-    # ...
+    python3
+    stdenv.cc.cc
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
+    xorg.libXrender
+    xorg.libXtst
+    xz
+    zlib
   ];
 
 }
diff --git a/systems/x86_64-linux/x1/hardware-configuration.nix b/systems/x86_64-linux/x1/hardware-configuration.nix
index 170895d..6e980fe 100644
--- a/systems/x86_64-linux/x1/hardware-configuration.nix
+++ b/systems/x86_64-linux/x1/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usbhid" "sd_mod" ];
@@ -14,7 +15,8 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";
+    {
+      device = "/dev/disk/by-uuid/1106202c-c3bf-4c15-b7cd-e78749e5c955";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
@@ -22,7 +24,8 @@
   boot.initrd.luks.devices."luks-0e2792db-1b80-49a7-b2eb-54e4b5fc3502".device = "/dev/disk/by-uuid/0e2792db-1b80-49a7-b2eb-54e4b5fc3502";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/13C4-A825";
+    {
+      device = "/dev/disk/by-uuid/13C4-A825";
       fsType = "vfat";
     };