From d0af9423598e496f213f9be8a1981772b32928f7 Mon Sep 17 00:00:00 2001
From: Noa Aarts <itepastra@gmail.com>
Date: Thu, 29 Feb 2024 23:48:45 +0100
Subject: [PATCH] ozone discord

---
 hosts/default/configuration.nix    | 12 ++++++++----
 hosts/default/electron-wayland.nix | 24 ------------------------
 hosts/default/home.nix             | 10 +++-------
 3 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 hosts/default/electron-wayland.nix

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 6a476ed..fbeb4db 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -26,11 +26,15 @@
 	# Enable networking
 	networking.networkmanager.enable = true;
 
-	nix.settings = {
-		# auto optimise every so often
-		auto-optimise-store = true;
-		experimental-features = ["nix-command" "flakes"];
+	nix = {
+		settings = {
+			# auto optimise every so often
+			auto-optimise-store = true;
+			experimental-features = ["nix-command" "flakes"];
+		};
+		gc.automatic = true;
 	};
+
 	# Set your time zone.
 	time.timeZone = "Europe/Amsterdam";
 
diff --git a/hosts/default/electron-wayland.nix b/hosts/default/electron-wayland.nix
deleted file mode 100644
index 8254c24..0000000
--- a/hosts/default/electron-wayland.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-self:
-let
-	enableWayland = drv: bin: drv.overrideAttrs (
-		old: {
-			nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.makeWrapper ];
-			postFixup = (old.postFixup or "") + ''
-				wrapProgram $out/bin/${bin} \
-					--add-flags "--enable-features=UseOzonePlatform" \
-					--add-flags "--ozone-platform=wayland"
-			'';
-		}
-	);
-in
-super:
-	{
-		slack = enableWayland super.slack "slack";
-		discord = enableWayland super.discord "discord";
-		vscode = enableWayland super.vscode "code";
-		google-chrome-beta = (
-			super.google-chrome-beta.override {
-				commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
-			}
-		);
-	}
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 699d271..f6ab646 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -21,10 +21,6 @@
 
 	nixpkgs.config.allowUnfree = true;
 
-	nixpkgs.overlays = [
-		(import ./electron-wayland.nix)
-	];
-
 	# The home.packages option allows you to install Nix packages into your
 	# environment.
 	home.packages = with pkgs; [
@@ -428,7 +424,7 @@
 					"v"
 				];
 				key = "<leader>d";
-				action = "[[\"_d]]";
+				action = ''[["_d]]'';
 				options.desc = "Delete no without copying";
 			}
 			{
@@ -437,13 +433,13 @@
 					"v"
 				];
 				key = "<leader>y";
-				action = "[[\"+y]]";
+				action = ''[["+y]]'';
 				options.desc = "Copy to system clipboard";
 			}
 			{
 				mode = "n";
 				key = "<leader>Y";
-				action = "[[\"+Y]]";
+				action = ''[["+Y]]'';
 				# TODO find out what this remap does
 				options.desc = "IDK";
 			}