From 68318f6fda3cf13ba8b2ca6af300e81187096cd6 Mon Sep 17 00:00:00 2001
From: mir <mirmarq428@gmail.com>
Date: Sun, 3 Mar 2024 09:25:54 -0900
Subject: [PATCH] okay this works. new graphics driver

---
 configuration.nix |  2 +-
 flake.lock        | 70 ++++++++++-------------------------------------
 flake.nix         | 16 +++++++----
 3 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 2c527ab..c99f0f8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, nixos-unstable, ... }:
 
 {
   # Bootloader.
diff --git a/flake.lock b/flake.lock
index 312168d..64db5c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,9 @@
     "apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -54,7 +56,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1706981411,
@@ -73,7 +77,9 @@
     },
     "home-manager-unstable": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
       },
       "locked": {
         "lastModified": 1709204054,
@@ -91,17 +97,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708984720,
-        "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=",
+        "lastModified": 1701282334,
+        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
+        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "23.11",
         "repo": "nixpkgs",
-        "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538",
         "type": "github"
       }
     },
@@ -121,61 +127,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1709309926,
-        "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1708118438,
-        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1701282334,
-        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "apple-silicon": "apple-silicon",
         "emacs-config": "emacs-config",
         "home-manager": "home-manager",
         "home-manager-unstable": "home-manager-unstable",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
diff --git a/flake.nix b/flake.nix
index f540552..48671e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,15 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     apple-silicon = {
       url = "github:tpwrules/nixos-apple-silicon";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
-      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager-unstable = {
       url = "github:nix-community/home-manager"; #/release-23.11";
-      inputs.nixpkgs-unstable.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
     emacs-config = {
       url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
@@ -26,12 +27,17 @@
 	      home-manager,
 	      ... }: {
     nixosConfigurations = {
-      galvatron = nixpkgs.lib.nixosSystem {
+      galvatron = nixpkgs-unstable.lib.nixosSystem {
 	system = "aarch64-linux";
+	# specialArgs = { inherit nixpkgs-unstable; };
         modules = [
 	  ./configuration.nix {
-	    hardware.asahi.peripheralFirmwareDirectory = ./galvatron/firmware;
-            # hardware.asahi.useExperimentalGPUDriver = true;
+  	    # nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
+	    hardware.asahi = {
+	      peripheralFirmwareDirectory = ./galvatron/firmware;
+              useExperimentalGPUDriver = true;
+	      experimentalGPUInstallMode = "driver";
+	    };
 	    boot.loader.efi.canTouchEfiVariables = false;
 	    networking.hostName = "galvatron";
 	    sound.enable = false;