diff --git a/flake.nix b/flake.nix
index 8f48cb0..6c02a6b 100755
--- a/flake.nix
+++ b/flake.nix
@@ -43,12 +43,20 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 	nixosConfigurations = {
 		Archie = nixpkgs-unstable.lib.nixosSystem {
 			system = "x86_64-linux";
-			/*
-			I used to set up nixpkgs in the flake, but doing that made
-			defining overlays in modules impossible (or at least I could
-			not figure out how)
-			Also has nice side effect of making it easier to add new systems :3
-			*/
+			pkgs = import nixpkgs-unstable {
+				system = "x86_64-linux";
+				config = { allowUnfree = true; }; # TODO: Find why this doesn't work
+				overlays =
+				let
+					discordOverlay = self: super: {
+						discord = super.discord.override {
+							withOpenASAR = true;
+							withVencord = true;
+						};
+					};
+				in
+				[ discordOverlay ];
+			};
 			modules = [
 				# Needed for nix-index
 				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
@@ -64,6 +72,10 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 
 		Everest = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
+			pkgs = import nixpkgs {
+				system = "x86_64-linux";
+				config = { allowUnfree = false; }; # TODO: Find why this doesn't work 
+			};
 			modules = [
 				# Needed for nix-index
 				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index 6262b48..d28c74d 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -4,7 +4,6 @@
 	imports = [
 		./htop.nix
 		./nix.nix
-		./micro.nix
 		./nix-index.nix
 		./command-not-found.nix
 	];
@@ -12,6 +11,7 @@
 	environment.systemPackages = with pkgs; [
 		speedtest-cli
 		bat
+		micro
 		nvd
 		ncdu
 		tree
diff --git a/roles/common/programs/micro.nix b/roles/common/programs/micro.nix
deleted file mode 100644
index a80a708..0000000
--- a/roles/common/programs/micro.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-	home-manager = {
-		users.toast = { config, pkgs, ... }:
-		{
-			programs.micro = {
-				enable = true;
-				settings = {
-					clipboard = "terminal";
-					indentchar = "|";
-					softwrap = true;
-				};
-			};
-		};
-	};
-}
diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index 6aa4825..ac8b5dc 100755
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -4,7 +4,6 @@
 	imports = [
 		./discord.nix
 		./firefox.nix
-		./micro.nix
 		./keepassxc.nix
 	];
 }
diff --git a/roles/desktop/discord.nix b/roles/desktop/discord.nix
index 5f47f87..bdabdc4 100644
--- a/roles/desktop/discord.nix
+++ b/roles/desktop/discord.nix
@@ -1,5 +1,9 @@
 { config, pkgs, ... }:
 
+{
+	# TODO: Find out why this does not do anything. If I put this
+	# on flake.nix it does work, so it's not completely wrong.
+	/* nixpkgs.overlays =
 	let
 		discordOverlay = self: super: {
 			discord = super.discord.override {
@@ -8,8 +12,7 @@
 			};
 		};
 	in
-{
-	nixpkgs.overlays = [ discordOverlay ];
+	[ discordOverlay ]; */
 	users.users.toast.packages = with pkgs; [
 		discord
 	];
diff --git a/roles/desktop/micro.nix b/roles/desktop/micro.nix
deleted file mode 100644
index a09e819..0000000
--- a/roles/desktop/micro.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-	home-manager = {
-		users.toast = { config, pkgs, ... }:
-		{
-			programs.micro = {
-				enable = true;
-				settings = {
-					# Use xclip/wl-clipboard for copying and pasting
-					clipboard = lib.mkForce "external";
-				};
-			};
-			/*
-			On a kde wayland session micro uses xsel or xclip instead of wl-clipboard
-			which doesn't work, so I only install wl-clipboard here to make micro use it
-			*/
-			home.packages = with pkgs; [ wl-clipboard ];
-		};
-	};
-}
diff --git a/roles/gaming/mangohud.nix b/roles/gaming/mangohud.nix
index 47b37be..ff6f5df 100644
--- a/roles/gaming/mangohud.nix
+++ b/roles/gaming/mangohud.nix
@@ -13,7 +13,6 @@
 			enableSessionWide = true;
 			settings = {
 				preset = 4;
-				no_display = true;
 			};
 		};
 	};