From 3b2d407db1f40c1d95fb30c723b8ba7ae4c71cef Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 18 May 2023 06:00:31 -0400
Subject: [PATCH] nix-collect-garbage fixed

---
 flake.lock      | 8 ++++----
 flake.nix       | 2 +-
 modules/nix.nix | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index c5ce84e..0eb8849 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,17 +152,17 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1681227902,
-        "narHash": "sha256-hNHfvmb1bIWwqFT5nesQgwh4V0OlyZHxj5ZVSQbZ+p4=",
+        "lastModified": 1684340480,
+        "narHash": "sha256-Am5hyxd37D5WukGddmF2TqSAtBMYcQeOc4DVWpD34cI=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "8340e2623a7f87b86c0bb88666c85ef6c8562519",
+        "rev": "684e9be8b9356f92b7882d74cba9d146fb71f850",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "latest-release",
         "repo": "nix",
+        "rev": "684e9be8b9356f92b7882d74cba9d146fb71f850",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 0d1d007..82043e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     stable.url = "github:NixOS/nixpkgs/nixos-22.11";
     #nix 2.16
-    nix.url = "github:NixOS/nix/latest-release";
+    nix.url = "github:NixOS/nix/684e9be8b9356f92b7882d74cba9d146fb71f850";
 
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
diff --git a/modules/nix.nix b/modules/nix.nix
index dcfedb2..077c7f7 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,4 +1,5 @@
 {
+  pkgs,
   inputs,
   lib,
   self,
@@ -30,7 +31,7 @@ in {
 
   #other nix settings
   nix = {
-    #package = inputs.nix.packages.${pkgs.system}.default;
+    package = inputs.nix.packages.${pkgs.system}.default;
     settings = {
       experimental-features = ["nix-command" "flakes" "repl-flake"];
       auto-optimise-store = true;
@@ -38,7 +39,7 @@ in {
       #ignore global registry
       flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
       #become stable faster stupid
-      #use-xdg-base-directories = true;
+      use-xdg-base-directories = true;
       trusted-users = [
         "root"
         "@wheel"