diff --git a/machines/pvv-terminal.nix b/machines/pvv-terminal.nix
index db61f84..d5c3353 100644
--- a/machines/pvv-terminal.nix
+++ b/machines/pvv-terminal.nix
@@ -6,6 +6,7 @@
     name = "PVV Terminal";
     eth = null;
     wlan = null;
+    secondary-fs = null;
   };
   profiles.base.enable = true;
   profiles.gui.enable = true;
@@ -15,14 +16,22 @@
 
   profiles.audio.fancy = false;
 
-  services.gammastep =  {
-    enable = true;
-    dawnTime = "7:00-8:15";
-    duskTime = "21:30-22:30";
-  };
-
   profiles.games.enable = false;
 
+  services.polybar.config."module/uquota" = {
+    type = "custom/script";
+    exec-if = "which uquota";
+    exec = "" + pkgs.writers.writePerl "parse_uquota" { } ''
+      my $raw = `uquota`;
+      if ( $raw =~ /Du har brukt (\d+(?:[KMGT]iB)) av (\d+(?:[KMGT]iB)), eller (\d+)/ )
+      {
+          print $3 . "%\n";
+      }
+    '';
+    interval = 10;
+    format = "ﴥ <label>";
+  };
+
   programs.home-manager = {
     enable = true;
     path = "https://github.com/rycee/home-manager/archive/release-21.11.tar.gz";
diff --git a/profiles/base/default.nix b/profiles/base/default.nix
index bb24fe4..ffed43a 100644
--- a/profiles/base/default.nix
+++ b/profiles/base/default.nix
@@ -11,8 +11,9 @@ in {
     eth = lib.mkOption {};
     wlan = lib.mkOption {};
     secondary-fs = lib.mkOption {
-      type = lib.types.str;
-      default = "$HOME";
+      type = lib.types.nullOr lib.types.nonEmptyStr;
+      default = null;
+      example = "''${env:HOME}";
     };
   };
 
diff --git a/profiles/xsession/.polybar.nix.swp b/profiles/xsession/.polybar.nix.swp
deleted file mode 100644
index b7e0159..0000000
Binary files a/profiles/xsession/.polybar.nix.swp and /dev/null differ
diff --git a/profiles/xsession/polybar.nix b/profiles/xsession/polybar.nix
index 1c15d1f..47b9080 100644
--- a/profiles/xsession/polybar.nix
+++ b/profiles/xsession/polybar.nix
@@ -45,7 +45,7 @@ in
           module-margin-right = "2";
 
           modules-left = "i3 title";
-          modules-right = "wlan eth filesystem cpu memory battery date";
+          modules-right = "wlan eth filesystem uquota cpu memory battery date";
         };
 
         "module/i3" = {
@@ -115,7 +115,7 @@ in
           interval = 25;
 
           mount-0 = "/";
-          mount-1 = config.machine.secondary-fs;
+          mount-1 = lib.mkIf (config.machine.secondary-fs != null) config.machine.secondary-fs;
 
           label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
           label-unmounted = "%mountpoint% not mounted";