mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mac config

Browse Source
This commit is contained in:
mjallen18
2024-03-19 16:26:52 -05:00
parent f62082a35a
commit 64cb797740
4 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
flake.lock generated
View File

@@ -53,11 +53,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1710433570, "lastModified": 1710784390,
"narHash": "sha256-39Kzdv8rPhKses/VwBTCfTtNOGLQr/8xnRUGk2LhTRw=", "narHash": "sha256-DaYRkYxkznDA+dvP9Qk9DoMQy6oowqe5KDi+DX1sPBA=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "58ce1f8057475ebf3cbcc327af33eb9af5646c98", "rev": "ab818205cb4916ec49fb67f8940771c550ffb5bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710090208, "lastModified": 1710602287,
"narHash": "sha256-1W7yDW+kqCr/9SygZwygBayE8HwLnzJq48fMAOZQLAY=", "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "e888a0a745ac979abe6a687ff24b8c5e7b7b79ed", "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -353,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710423955, "lastModified": 1710820906,
"narHash": "sha256-6N/65EqYVqCaz5SVoPMx2HgA+DJZAlw5lW+U9VHSSbE=", "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "587719494ed18a184c98c4d55dde9469af4446bf", "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -416,11 +416,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1710390908, "lastModified": 1710753783,
"narHash": "sha256-v050f/BDWKbSDNW1tR3Y22aPRwccXoqnHTBqGB2Mk3c=", "narHash": "sha256-Av5QpYJvJYNefRCKhsOfSzTBaqQ2o+rj60/NVzGytOQ=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "33911712a20170ef09b122800e7cfc8d61d095e2", "rev": "54bb3b4114b1ee7fcd01e47553803f157c3635f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -480,11 +480,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710390363, "lastModified": 1710525749,
"narHash": "sha256-ooechLU/68O8sIBqtRsBWY2Vtbn4kPxnP+5pWQ30IEg=", "narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "cc83ff008d7500f38bce4e75c2dbcdfc1621cac4", "rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -498,11 +498,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1710281379, "lastModified": 1710717205,
"narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -566,11 +566,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710123225, "lastModified": 1710783728,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -582,12 +582,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710631334,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
"revCount": 596105, "revCount": 598085,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.596105%2Brev-0ad13a6833440b8e238947e47bea7f11071dc2b2/018e36a8-f6ad-749d-b12f-45cea2d52979/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598085%2Brev-c75037bbf9093a2acb617804ee46320d6d1fea5a/018e4cfd-3f0a-7531-8a72-60a3a8a3d087/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -641,11 +641,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710806803,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@@ -16,6 +16,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
#nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
nix-darwin.url = "github:LnL7/nix-darwin"; nix-darwin.url = "github:LnL7/nix-darwin";
# Pi4 # Pi4

6
hosts/default.nix
View File

@@ -74,9 +74,9 @@ in {
programs = { programs = {
fish.enable = true; fish.enable = true;
gnupg.agent = { gnupg.agent = {
enable = true; enable = lib.mkDefault true;
# pinentryPackage = pkgs.pinentry-curses; pinentryPackage = lib.mkForce pkgs.pinentry-qt;
enableSSHSupport = true; enableSSHSupport = lib.mkDefault true;
}; };
}; };

3
hosts/mac-nixos/configuration.nix
View File

@@ -16,6 +16,7 @@
hardware.asahi.enable = true; hardware.asahi.enable = true;
hardware.asahi.useExperimentalGPUDriver = true; hardware.asahi.useExperimentalGPUDriver = true;
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@@ -59,6 +60,7 @@
users.users.matt = { users.users.matt = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
shell = pkgs.fish;
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
tree tree
@@ -67,6 +69,7 @@
box64 box64
#minecraft #minecraft
prismlauncher prismlauncher
#vmware-horizon-client
]; ];
}; };