Compare commits

..

No commits in common. "3515c370774149afe3f1128b1413d7636f92c9e9" and "96c88583c3261fd0a5449908027eeb67c34b7748" have entirely different histories.

6 changed files with 33 additions and 53 deletions

30
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1662478528, "lastModified": 1661882940,
"narHash": "sha256-Myjd0HPL5lXri3NXOcJ6gP7IKod2eMweQBKM4uxgEGw=", "narHash": "sha256-4LaVFnV22WrOA0aolqqk9dXrM8crikcrLQt29G18F7M=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "3b69bf3cc26ae19de847bfe54d6ab22d7381a90a", "rev": "80cec5115aae74accc4ccfb9f84306d7863f0632",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1662472236, "lastModified": 1661824092,
"narHash": "sha256-epA5KzVUxw9ZV+st2aU4oFfJGyIcYleTpX28wsCQQP4=", "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "de94878b6b83f7f2cfda9cdff005417a6d7ac82c", "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1662458987, "lastModified": 1662092548,
"narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=", "narHash": "sha256-nmAbyJ5+DBXcNJ2Rcy/Gx84maqtLdr6xEe82+AXCaY8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "504b32caf83986b7e6b9c79c1c13008f83290f19", "rev": "786633331724f36967853b98d9100b5cfaa4d798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +157,11 @@
}, },
"nixpkgs-22_05": { "nixpkgs-22_05": {
"locked": { "locked": {
"lastModified": 1662221733, "lastModified": 1661656705,
"narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=", "narHash": "sha256-1ujNuL1Tx1dt8dC/kuYS329ZZgiXXmD96axwrqsUY7w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed", "rev": "290dbaacc1f0b783fd8e271b585ec2c8c3b03954",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +224,11 @@
"nixpkgs-22_05": "nixpkgs-22_05" "nixpkgs-22_05": "nixpkgs-22_05"
}, },
"locked": { "locked": {
"lastModified": 1662390490, "lastModified": 1661660105,
"narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", "narHash": "sha256-3ITdkYwsNDh2DRqi7FZOJ92ui92NmcO6Nhj49u+JjWY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", "rev": "d92fba1bfc9f64e4ccb533701ddd8590c0d8c74a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,6 +2,15 @@
{ {
homebrew = { homebrew = {
enable = true;
brewPrefix = "/opt/homebrew/bin";
autoUpdate = true;
cleanup = "zap";
global = {
brewfile = true;
noLock = true;
};
taps = [ taps = [
"homebrew/cask" "homebrew/cask"
"homebrew/cask-drivers" "homebrew/cask-drivers"

View File

@ -4,7 +4,6 @@
./homebrew.nix ./homebrew.nix
../../modules/base/darwin.nix ../../modules/base/darwin.nix
../../modules/dev
../../modules/builder ../../modules/builder
]; ];

View File

@ -2,6 +2,15 @@
{ {
homebrew = { homebrew = {
enable = true;
brewPrefix = "/opt/homebrew/bin";
autoUpdate = true;
cleanup = "zap";
global = {
brewfile = true;
noLock = true;
};
taps = [ taps = [
"homebrew/cask" "homebrew/cask"
"homebrew/cask-drivers" "homebrew/cask-drivers"

View File

@ -13,20 +13,6 @@
}; };
}; };
homebrew = {
enable = true;
brewPrefix = "/opt/homebrew/bin";
global = {
brewfile = true;
lockfiles = false;
};
onActivation = {
autoUpdate = true;
cleanup = "zap";
upgrade = true;
};
};
system.activationScripts.applications.text = pkgs.lib.mkForce ( system.activationScripts.applications.text = pkgs.lib.mkForce (
'' ''
rm -rf /Applications/Nix rm -rf /Applications/Nix

View File

@ -1,23 +0,0 @@
{ config, lib, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
emacs
# Elixir
elixir
# Golang
go
gopls
# Node/JS
deno
nodejs
yarn
# Rust
rustup
rust-analyzer
];
}