From e40be04dfefe63e35aa0c3ca2d2a6006e6f0a087 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <account@voronind.com>
Date: Thu, 8 Feb 2024 00:53:02 +0300
Subject: [PATCH] Flake : Use nixpkgs.lib instead of pkgs.lib.

---
 .config/linux/flake/template/Rust.nix |  2 +-
 .config/linux/shell/Game.nix          | 13 -------------
 .config/linux/shell/Main.nix          | 26 --------------------------
 .config/linux/shell/Rust.nix          | 12 ------------
 .config/linux/shell/TODO              |  1 +
 .config/linux/system/flake.nix        |  2 +-
 6 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 .config/linux/shell/Game.nix
 delete mode 100644 .config/linux/shell/Main.nix
 delete mode 100644 .config/linux/shell/Rust.nix
 create mode 100644 .config/linux/shell/TODO

diff --git a/.config/linux/flake/template/Rust.nix b/.config/linux/flake/template/Rust.nix
index cb554cf..dc6cf01 100644
--- a/.config/linux/flake/template/Rust.nix
+++ b/.config/linux/flake/template/Rust.nix
@@ -9,7 +9,7 @@
 		let
 			system = "x86_64-linux";
 			pkgs   = nixpkgs.legacyPackages.${system};
-			lib    = pkgs.lib;
+			lib    = nixpkgs.lib;
 		in {
 			devShell.${system} = pkgs.mkShell rec {
 				nativeBuildInputs = with pkgs; [
diff --git a/.config/linux/shell/Game.nix b/.config/linux/shell/Game.nix
deleted file mode 100644
index 2cee283..0000000
--- a/.config/linux/shell/Game.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-with import <nixpkgs> {};
-
-mkShell {
-	NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-		stdenv.cc.cc
-	];
-	NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";
-
-	buildInputs = [
-		freesweep
-		vitetris
-	];
-}
diff --git a/.config/linux/shell/Main.nix b/.config/linux/shell/Main.nix
deleted file mode 100644
index 2bb3cc0..0000000
--- a/.config/linux/shell/Main.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-with import <nixpkgs> {};
-
-mkShell {
-	NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-		alsa-lib
-		expat
-		libGL
-		libpulseaudio
-		libuuid
-		libz
-		nspr
-		nss
-		openssl
-		stdenv.cc.cc
-		xorg.libX11
-		xorg.libXcomposite
-		xorg.libXcursor
-		xorg.libXdamage
-		xorg.libXext
-		xorg.libXfixes
-		xorg.libXi
-		xorg.libXrender
-		xorg.libXtst
-	];
-	NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";
-}
diff --git a/.config/linux/shell/Rust.nix b/.config/linux/shell/Rust.nix
deleted file mode 100644
index fc9fcfa..0000000
--- a/.config/linux/shell/Rust.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-let
-	pkgs = import <nixpkgs> {};
-	lib = pkgs.lib;
-in
-pkgs.mkShell {
-	nativeBuildInputs = with pkgs; [
-		cargo
-		rustc
-		rust-analyzer
-		rustfmt
-	];
-}
diff --git a/.config/linux/shell/TODO b/.config/linux/shell/TODO
new file mode 100644
index 0000000..a598ce3
--- /dev/null
+++ b/.config/linux/shell/TODO
@@ -0,0 +1 @@
+Use flakes here with devShell
diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix
index f2a9a3d..dcb7253 100644
--- a/.config/linux/system/flake.nix
+++ b/.config/linux/system/flake.nix
@@ -3,7 +3,7 @@
 		nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 	};
 
-	outputs = { self, nixpkgs }@inputs: {
+	outputs = { self, nixpkgs } @inputs: {
 		nixosModules.common.imports = [
 			./module/common/Bootloader.nix
 			./module/common/Firewall.nix