feat(nix/darwin): Moving stuff away from homebrew
This commit is contained in:
parent
b0952e8a34
commit
b4f1b3a647
4 changed files with 107 additions and 8 deletions
81
.config/nix/flake.lock
generated
81
.config/nix/flake.lock
generated
|
@ -1,5 +1,49 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"brew-api": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730330788,
|
||||||
|
"narHash": "sha256-4cBYfZwWbhNB1uxzOMtlG71aanRzckRBum8jCzqLPhA=",
|
||||||
|
"owner": "BatteredBunny",
|
||||||
|
"repo": "brew-api",
|
||||||
|
"rev": "549a465b34da92f8eb2dfbbb9047d73751ce4107",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "BatteredBunny",
|
||||||
|
"repo": "brew-api",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"brew-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"brew-api": [
|
||||||
|
"brew-api"
|
||||||
|
],
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nix-darwin": [
|
||||||
|
"nix-darwin"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1724407874,
|
||||||
|
"narHash": "sha256-3nw5O0wLkeTeBXJTyY2pZ57JaRtouLva1a6nVx2syLU=",
|
||||||
|
"owner": "BatteredBunny",
|
||||||
|
"repo": "brew-nix",
|
||||||
|
"rev": "d3d3a2666e5330e83b6a64b1eb3e1e9380f6da9b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "BatteredBunny",
|
||||||
|
"repo": "brew-nix",
|
||||||
|
"rev": "d3d3a2666e5330e83b6a64b1eb3e1e9380f6da9b",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727974419,
|
"lastModified": 1727974419,
|
||||||
|
@ -76,6 +120,24 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1710146030,
|
||||||
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_2": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_2"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
|
@ -233,6 +295,8 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"brew-api": "brew-api",
|
||||||
|
"brew-nix": "brew-nix",
|
||||||
"firefox-darwin": "firefox-darwin",
|
"firefox-darwin": "firefox-darwin",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
|
@ -265,7 +329,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"devshell": "devshell",
|
"devshell": "devshell",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils_2",
|
||||||
"nix-vm-test": "nix-vm-test",
|
"nix-vm-test": "nix-vm-test",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
@ -304,6 +368,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
|
@ -40,6 +40,20 @@
|
||||||
url = "github:LnL7/nix-darwin/a60ac02f9466f85f092e576fd8364dfc4406b5a6";
|
url = "github:LnL7/nix-darwin/a60ac02f9466f85f092e576fd8364dfc4406b5a6";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
firefox-darwin = {
|
||||||
|
url = "github:bandithedoge/nixpkgs-firefox-darwin";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
brew-nix = {
|
||||||
|
url = "github:BatteredBunny/brew-nix/d3d3a2666e5330e83b6a64b1eb3e1e9380f6da9b";
|
||||||
|
inputs.nix-darwin.follows = "nix-darwin";
|
||||||
|
inputs.brew-api.follows = "brew-api";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
brew-api = {
|
||||||
|
url = "github:BatteredBunny/brew-api";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/64c6325b28ebd708653dd41d88f306023f296184";
|
url = "github:nix-community/home-manager/64c6325b28ebd708653dd41d88f306023f296184";
|
||||||
|
@ -50,10 +64,5 @@
|
||||||
url = "github:numtide/system-manager/c93e62f2e962b54fd961798731d25eaa5778dbe2";
|
url = "github:numtide/system-manager/c93e62f2e962b54fd961798731d25eaa5778dbe2";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox-darwin = {
|
|
||||||
url = "github:bandithedoge/nixpkgs-firefox-darwin";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
pkgs.pinentry_mac
|
pkgs.pinentry_mac
|
||||||
pkgs.iina
|
pkgs.iina
|
||||||
pkgs.floorp-bin
|
pkgs.floorp-bin
|
||||||
|
pkgs.brewCasks.zotero
|
||||||
];
|
];
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
# Auto upgrade nix package and the daemon service.
|
||||||
|
|
|
@ -13,7 +13,12 @@ in
|
||||||
# Lenovo ThinkPad L460; Intel Core i5-6300U
|
# Lenovo ThinkPad L460; Intel Core i5-6300U
|
||||||
"ThiccBook-Pro" =
|
"ThiccBook-Pro" =
|
||||||
let
|
let
|
||||||
inherit (mkSystem "x86_64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
|
inherit (
|
||||||
|
mkSystem "x86_64-darwin" nixpkgs [
|
||||||
|
inputs.firefox-darwin.overlay
|
||||||
|
inputs.brew-nix.overlays.default
|
||||||
|
]
|
||||||
|
) system pkgs;
|
||||||
common = (mkCommon pkgs);
|
common = (mkCommon pkgs);
|
||||||
in
|
in
|
||||||
nix-darwin.lib.darwinSystem {
|
nix-darwin.lib.darwinSystem {
|
||||||
|
@ -27,7 +32,12 @@ in
|
||||||
# Imaginary M1, just for reference
|
# Imaginary M1, just for reference
|
||||||
MacBookProM1 =
|
MacBookProM1 =
|
||||||
let
|
let
|
||||||
inherit (mkSystem "aarch64-darwin" nixpkgs [inputs.firefox-darwin.overlay]) system pkgs;
|
inherit (
|
||||||
|
mkSystem "aarch64-darwin" nixpkgs [
|
||||||
|
inputs.firefox-darwin.overlay
|
||||||
|
inputs.brew-nix.overlays.default
|
||||||
|
]
|
||||||
|
) system pkgs;
|
||||||
common = (mkCommon pkgs);
|
common = (mkCommon pkgs);
|
||||||
in
|
in
|
||||||
nix-darwin.lib.darwinSystem {
|
nix-darwin.lib.darwinSystem {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue