diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 96e5188..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-# Editor configuration, see http://editorconfig.org
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-indent_style = space
-indent_size = 2
-
-# Ignore diffs/patches
-[*.{diff,patch}]
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-indent_size = unset
-
-[{.*,secrets}/**]
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-charset = unset
-indent_style = unset
-indent_size = unset
-
-[*.py]
-indent_size = 4
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false
diff --git a/flake.lock b/flake.lock
index 0da46f3..4ffe995 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1616437843,
-        "narHash": "sha256-mOrPTDNW2hwryNBAVkmWuDdb9Owjb7AcSwob7ecfRIk=",
+        "lastModified": 1617693609,
+        "narHash": "sha256-/+6wm08yHK8mhyljzELD4WE9Gh8XUVbHL0R1TQpZtTQ=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "1a760930266ac00b7d422320c0b01d583d294ec7",
+        "rev": "a7492a8c76dcc702d0a65cd820a5f9baa8702684",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1617082367,
-        "narHash": "sha256-W0cQPGjc4IVzryaGycuoS8KZkXafS1P23w/fcKLoD5Y=",
+        "lastModified": 1617636226,
+        "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04a2b269d8921505a2969fc9ec25c1f517f2b307",
+        "rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1617608389,
-        "narHash": "sha256-Dom5AICRbxorNjaP+7to8rSJ5+8I52UwaJu9M1GkO10=",
+        "lastModified": 1617690895,
+        "narHash": "sha256-5TUizPI+ibn/LBzevTIIyIZ1XeLl3HU0PTRk7H6AKTQ=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "085790185c3e8a7dd6c2f456eaf15ffcc66b0ac9",
+        "rev": "7c00c8b5cab5dedb6519eabba7ca6d069e2dfdae",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1617651867,
-        "narHash": "sha256-ktlubMXrvk2HOAH0A0guiWNjebfEuV1CTqNjvApBlho=",
+        "lastModified": 1617784025,
+        "narHash": "sha256-SToCdZXGbUAGQU//DTlzxOvIk0QeR4bg9aFv2u6M7EA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b78c87469acc055d40d54669e4e052a00e831f98",
+        "rev": "44611746a60fa2dd11ffb3881593f9d78eed2770",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
     },
     "override": {
       "locked": {
-        "lastModified": 1617658314,
-        "narHash": "sha256-HAlamxyHjggTZqF/xfeCZd9N9Xyq7cS/VfP+2VLuQ44=",
+        "lastModified": 1617784895,
+        "narHash": "sha256-gJOCUkf2Y1T8lFFjgw1zsNM+f0yQ1YEq3p31P8YUHHY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "42368bf52159d0be87141e7a7fd4949ff2f29148",
+        "rev": "de679c57ca579974f35fab5444c7892ceb16230a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a661529..9700d81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
     {
       nixos.url = "nixpkgs/nixos-unstable";
       override.url = "nixpkgs";
+
       ci-agent = {
         url = "github:hercules-ci/hercules-ci-agent";
         inputs = { nix-darwin.follows = "darwin"; flake-compat.follows = "flake-compat"; nixos-20_09.follows = "nixos"; nixos-unstable.follows = "override"; };
diff --git a/hosts/tesco.nix b/hosts/tesco.nix
index 4a2824c..db25fdb 100644
--- a/hosts/tesco.nix
+++ b/hosts/tesco.nix
@@ -1,6 +1,6 @@
-{ suites, ... }@inputs:
+{ suites, modulesPath, ... }@inputs:
 {
-  imports = builtins.trace (builtins.attrNames inputs) (suites.desktop ++ suites.amd);
+  imports = suites.desktop ++ [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -14,6 +14,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  boot.kernelParams = [ "boot.shell_on_fail=1" "shell_on_fail=1" "shell_on_fail" "boot.shell_on_fail" ];
   networking.hostName = "tesco"; # Define your hostname.
   networking.useDHCP = false;
   networking.interfaces.enp6s0.useDHCP = true;
diff --git a/overrides/default.nix b/overrides/default.nix
index 78e6ee8..93fe0df 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -8,26 +8,6 @@
 
   # packages pulled from override
   packages = pkgs: final: prev: {
-    inherit (pkgs)
-      cachix
-      dhall
-      discord
-      element-desktop
-      manix
-      nixpkgs-fmt
-      qutebrowser
-      signal-desktop
-      starship;
-
-    haskellPackages = prev.haskellPackages.override {
-      overrides = hfinal: hprev:
-        let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
-        in
-        {
-          # same for haskell packages, matching ghc versions
-          inherit (pkgs.haskell.packages."ghc${version}")
-            haskell-language-server;
-        };
-    };
+    #inherit (pkgs)
   };
 }
diff --git a/profiles/game/default.nix b/profiles/game/default.nix
index 66449db..d95302f 100644
--- a/profiles/game/default.nix
+++ b/profiles/game/default.nix
@@ -1,7 +1,8 @@
 { pkgs, ... }:
 {
   environment.systemPackages = [
-    pkgs.steam
-    pkgs.lutris
+     pkgs.flatpak
+#    pkgs.steam
+#    pkgs.lutris
   ];
 }
diff --git a/profiles/school/default.nix b/profiles/school/default.nix
new file mode 100644
index 0000000..2bbe875
--- /dev/null
+++ b/profiles/school/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+     ungoogled-chromium
+  ];
+}
diff --git a/suites/default.nix b/suites/default.nix
index f98158f..2070337 100644
--- a/suites/default.nix
+++ b/suites/default.nix
@@ -2,9 +2,9 @@
 {
   system = with profiles; rec {
     base = [ users.mae users.root ];
-    amd = [ profiles.amd ];
-    desktop = base ++ [ sway develop game workstation ssh users.mae users.root ];
-    lap = desktop ++ [ laptop bluetooth print networkmanager ];
+    workstation = base ++ [ sway develop game profiles.workstation ssh ];
+    desktop = workstation ++ [ amd school ];
+    lap = workstation ++ [ laptop bluetooth print networkmanager ];
   };
   user = with userProfiles; rec {
     base = [ direnv git ];