convert asahi module to flake

This commit is contained in:
mjallen18
2024-03-22 17:12:08 -05:00
parent 85202b98e6
commit 044288cc05
4 changed files with 79 additions and 12 deletions

82
flake.lock generated
View File

@@ -231,6 +231,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -353,11 +368,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710974515, "lastModified": 1711122977,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "narHash": "sha256-EnHux7wf7/7r+YMv8d/Ym1OTllp4sqqq0Bws1a4s2Zo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "rev": "19b87b9ae6ecfd81104a2a36ef8364f1de1b54b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -564,6 +579,26 @@
"type": "github" "type": "github"
} }
}, },
"nixos-apple-silicon": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1710209440,
"narHash": "sha256-1JwFo3u2aVrvpz12OotjCK51EQ0hEDI7xSG7CEvTSk8=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "bdc68b494d6a26c9457f4841ab1a6109b12a33e6",
"type": "github"
},
"original": {
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710783728, "lastModified": 1710783728,
@@ -641,11 +676,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1709961763,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1711001935,
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -694,8 +745,9 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-apple-silicon": "nixos-apple-silicon",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@@ -767,6 +819,22 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_3": {
"flake": false,
"locked": {
"lastModified": 1686795910,
"narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,

View File

@@ -16,7 +16,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
#nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.url = "github:LnL7/nix-darwin";
@@ -25,7 +25,7 @@
}; };
outputs = { self, nixpkgs, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager outputs = { self, nixpkgs, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager
, nixos-hardware, nix-darwin }@inputs: { , nixos-hardware, nix-darwin, nixos-apple-silicon }@inputs: {
nixosConfigurations = { nixosConfigurations = {
# Desktop # Desktop
"matt-nixos" = nixpkgs.lib.nixosSystem { "matt-nixos" = nixpkgs.lib.nixosSystem {
@@ -50,6 +50,7 @@
"mac-nixos" = nixpkgs.lib.nixosSystem { "mac-nixos" = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
nixos-apple-silicon.nixosModules.apple-silicon-support
./hosts/mac-nixos/configuration.nix ./hosts/mac-nixos/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View File

@@ -51,5 +51,6 @@
protonvpn-gui protonvpn-gui
nixfmt nixfmt
deadnix deadnix
papirus-icon-theme
]; ];
} }

View File

@@ -8,9 +8,6 @@
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
# using channel right now, convert to flake???
#./apple-silicon-support
<apple-silicon-support/apple-silicon-support>
../default.nix ../default.nix
]; ];