From a9d83b0cd0ebe5c237b9f0a386e8171e90b02956 Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Mon, 25 Jul 2022 10:29:24 +0530
Subject: [PATCH] update nixos

---
 configuration.nix          |  8 +++++---
 desktop-configuration.nix  |  3 +--
 hardware-configuration.nix |  5 -----
 nix/sources.json           | 12 ++++++------
 nix/sources.nix            | 22 +++++++++++++++++++++-
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index bcce622..756307f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -196,7 +196,7 @@
 			joinNetworks = [ "93afae5963c6858e" ];
 		};
 		flatpak.enable = true;
-		gnome3.gnome-keyring.enable = true;
+		gnome.gnome-keyring.enable = true;
 		qemuGuest.enable = true;
 	};
 
@@ -208,7 +208,6 @@
 	networking.firewall.enable = false;
 
 	nix = {
-		autoOptimiseStore = true;
 		extraOptions = ''
 			experimental-features = nix-command flakes
 		'';
@@ -216,7 +215,10 @@
 			"nixpkgs=${pkgs.path}"
 			"nixos-config=/etc/nixos/configuration.nix"
 		];
-		trustedUsers = [ "root" "illustris" ];
+		settings = {
+			trusted-users = [ "root" "illustris" ];
+			auto-optimise-store = true;
+		};
 	};
 
 	xdg.portal.enable = true;
diff --git a/desktop-configuration.nix b/desktop-configuration.nix
index 9bcf351..fd44f87 100644
--- a/desktop-configuration.nix
+++ b/desktop-configuration.nix
@@ -23,7 +23,6 @@
 		picom = {
 			enable = true;
 			vSync = true;
-			refreshRate = 60;
 			#backend = "xr_glx_hybrid";
 			backend = "glx";
 		};
@@ -95,7 +94,7 @@
 		perlPackages.AppClusterSSH
 		x11vnc
 		#kcachegrind
-		#remmina
+		remmina
 		insomnia
 		vlc
 		openhmd
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 52747a0..6525d9a 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -34,11 +34,6 @@
 			fsType = "zfs";
 		};
 
-		#"/var/lib/steam" = {
-		#	device = "ssd/steam";
-		#	fsType = "zfs";
-		#};
-
 		"/tmp" = {
 			device = "ssd/tmp";
 			fsType = "zfs";
diff --git a/nix/sources.json b/nix/sources.json
index c523c0f..b24232c 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a",
-        "sha256": "1ajyqr8zka1zlb25jx1v4xys3zqmdy3prbm1vxlid6ah27a8qnzh",
+        "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41",
+        "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
-        "sha256": "01j7nhxbb2kjw38yk4hkjkkbmz50g3br7fgvad6b1cjpdvfsllds",
+        "rev": "e494a908e8895b9cba18e21d5fc83362f64b3f6a",
+        "sha256": "1w03pdgk9xbx7hwiib2hixlalnfwxn6zr1j1g384r9z1hnpnggj4",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/e494a908e8895b9cba18e21d5fc83362f64b3f6a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nix/sources.nix b/nix/sources.nix
index 1938409..9a01c8a 100644
--- a/nix/sources.nix
+++ b/nix/sources.nix
@@ -31,8 +31,28 @@ let
           if spec ? branch then "refs/heads/${spec.branch}" else
             if spec ? tag then "refs/tags/${spec.tag}" else
               abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;