From ec0b560c6ea211a9a695834adce6617f8e4200da Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Thu, 17 Mar 2022 00:47:52 +0530
Subject: [PATCH] update

---
 configuration.nix            | 18 ++++++------------
 desktop-configuration.nix    |  2 +-
 hardware-configuration.nix   |  4 ++++
 modules/chromium/default.nix |  7 +++++--
 modules/default.nix          |  2 ++
 modules/openvpn/default.nix  |  8 ++++++++
 6 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 modules/openvpn/default.nix

diff --git a/configuration.nix b/configuration.nix
index 70d2707..252fc85 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,6 +17,7 @@
 	imports = [
 		./hardware-configuration.nix
 		./desktop-configuration.nix
+		./modules
 	];
 
 	# Support ARM builds
@@ -91,10 +92,10 @@
 			networkmanager
 			nfs-utils
 			nix-du
+			nix-top
 			nix-prefetch-git
 			nix-tree
 			nnn
-			openvpn
 			p7zip
 			pciutils
 			powertop
@@ -122,7 +123,6 @@
 			(writeScriptBin "vpnpass" (builtins.readFile ./scripts/vpnpass))
 		];
 		etc = {
-			openvpn.source = "${pkgs.update-resolv-conf}/libexec/openvpn";
 			nixpkgs.source = let sources = import ./nix/sources.nix; in sources.nixpkgs;
 		};
 	};
@@ -194,6 +194,7 @@
 		zerotierone.enable = true;
 		flatpak.enable = true;
 		gnome3.gnome-keyring.enable = true;
+		qemuGuest.enable = true;
 	};
 
 	virtualisation = {
@@ -201,20 +202,13 @@
 		libvirtd.enable = true;
 	};
 
-	# Temporary fix for qemu-ga till #112886 gets merged
-	systemd.services.qemu-guest-agent = {
-		description = "Run the QEMU Guest Agent";
-		serviceConfig = {
-			ExecStart = "${pkgs.qemu}/bin/qemu-ga --statedir /var/run";
-			Restart = "always";
-			RestartSec = 0;
-		};
-	};
-
 	networking.firewall.enable = false;
 
 	nix = {
 		autoOptimiseStore = true;
+		extraOptions = ''
+			experimental-features = nix-command flakes
+		'';
 		nixPath = [
 			"nixpkgs=${pkgs.path}"
 			"nixos-config=/etc/nixos/configuration.nix"
diff --git a/desktop-configuration.nix b/desktop-configuration.nix
index b876bb1..9bcf351 100644
--- a/desktop-configuration.nix
+++ b/desktop-configuration.nix
@@ -27,6 +27,7 @@
 			#backend = "xr_glx_hybrid";
 			backend = "glx";
 		};
+		blueman.enable = true;
 		pipewire = {
 			enable = true;
 			alsa = {
@@ -113,7 +114,6 @@
 		obs-studio
 		dunst
 		libnotify
-		ungoogled-chromium
 		zoom-us
 		guake
 	];
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 4063168..52747a0 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -70,4 +70,8 @@
 		enable = true;
 	};
 
+	hardware = {
+		firmware = with pkgs; [ linux-firmware ];
+		bluetooth.enable = true;
+	};
 }
diff --git a/modules/chromium/default.nix b/modules/chromium/default.nix
index 25f0092..13eed6f 100644
--- a/modules/chromium/default.nix
+++ b/modules/chromium/default.nix
@@ -1,7 +1,7 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
-	config.programs.chromium = {
+	programs.chromium = {
 		enable = true;
 		extensions = [
 			"gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
@@ -23,4 +23,7 @@
 			DefaultCookiesSetting = 1;
 		};
 	};
+	environment.systemPackages = with pkgs; [
+		ungoogled-chromium
+	];
 }
\ No newline at end of file
diff --git a/modules/default.nix b/modules/default.nix
index 7dfb3dc..4e62344 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,7 @@
 { config, pkgs, ... }:
 {
 	imports = [
+		./chromium
+		./openvpn
 	];
 }
\ No newline at end of file
diff --git a/modules/openvpn/default.nix b/modules/openvpn/default.nix
new file mode 100644
index 0000000..bf87a5b
--- /dev/null
+++ b/modules/openvpn/default.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+
+{
+	environment = {
+		systemPackages = with pkgs; [openvpn];
+		etc.openvpn.source = "${pkgs.update-resolv-conf}/libexec/openvpn";
+	};
+}
\ No newline at end of file