Skip to content

Commit

Permalink
use hosts in nix
Browse files Browse the repository at this point in the history
  • Loading branch information
brettinternet committed Nov 11, 2024
1 parent cfa1646 commit f556ade
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 87 deletions.
13 changes: 13 additions & 0 deletions keys/gpg-93E0BCEA.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mDMEX4SncBYJKwYBBAHaRw8BAQdAhvTXFUtPAnaZBRrKaTY0oY8cElWWtTbxnoA7
LyAl9gy0J0JyZXR0IEdhcmRpbmVyIDxicmV0dC5nYXJkaW5lckBwZHEuY29tPoiQ
BBMWCAA4FiEEgga6cxpWcureQ1rSi0DQEZPgvOoFAl+Ep3ACGwMFCwkIBwIGFQoJ
CAsCBBYCAwECHgECF4AACgkQi0DQEZPgvOotIwEAi3T8o+f3qHee6NjHvPtuR6RV
mNOi1zIn3f7NUrgjG+sA/i3yXW2tVP7ai4d14PuL18oStoT045+n453ZtVFtaHoN
uDgEX4SncBIKKwYBBAGXVQEFAQEHQDIsM/Thv/7MTgmiTVhkbqtfEfsQB2S2tzlx
E3j5acwtAwEIB4h4BBgWCAAgFiEEgga6cxpWcureQ1rSi0DQEZPgvOoFAl+Ep3AC
GwwACgkQi0DQEZPgvOq4GAD/YkkglejqnrlJ7/FnZnzkFlJ9COaZGhLdllO5GziF
o5YBAMUi2nBJZ/dCv7WcCBoFEwVuQx4ev67zpV6i//13MnMF
=bv+V
-----END PGP PUBLIC KEY BLOCK-----
52 changes: 52 additions & 0 deletions keys/gpg-A7CB9132.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQINBGbVzxsBEADNrd9DdhAcnb78SQFCrx6ZQk1py5RYCpuvOjeaTg66ZLFvIcBJ
qHPPkNJwVypoDO6cVzxd2KeCsOmlqxWJNqztZVLzWC/znabd7pU+X069fOlXOZ0m
dvLbOZ2dlKbjtn59VwY+Dukg9UpqTA0rxrknGF9s6Wj9K8ddQKqMDZUE4/y+5Hhv
imr9J+bgL0yETtP1RijF/rzaudKx2J4570nFvCLUOuq4Ip5v+Celb7tHlgm9vuzu
r1v9Y+vSP+928nd+vm376iXSYIfPIZF1vOBrp89LEvdKLp0YyReG/JbbpeaJKxFD
CxkO2KWU56uynX5zPXN97VwLs75HEbxHfh2wH32xrp9CKvBbMIPbrWkkm3DUigeU
+dSkC2GPxXvv7qJyWTwj6mR7AVKV1CInxBmGqmyXXpFfRHoeJagL8Uf5pCXYpEGy
lUj6pVxRBg/bivsIsRgxziiurtOLncHIpkT9BK4XadCdZpyOxDg3KYOZ0Ytwowfo
8MZkPPD9lyyIEVCS7ruEEY78Kht50+nku/PHSU1FrtOHAALVbL+y6Aaxq4/Lpm1J
sVX4AxxXr8h3AAlGj4XQQig/F22x6pk+TazD/GnjPYITudHK/H7ZBdVDCzhR21AR
xAHc7vq5OD668wg6OcZ+VodIHEO+mNMzzTGIYcMMujejwNOi4tmvoqjkPQARAQAB
tChCcmV0dCBHYXJkaW5lciA8YnJldHRnYXJkaW5lckBnbWFpbC5jb20+iQJUBBMB
CAA+FiEE1JBQJWMq5QNgXNiamrIwI6fLkTIFAmbVzxsCGwMFCQeGHzoFCwkIBwIG
FQoJCAsCBBYCAwECHgECF4AACgkQmrIwI6fLkTJMeQ/+MIMPnfFzx1vhnwKfK6eY
oCoRXNyiDFa3QWld1RplC20GFqlpUO26zIq3t0eFNzS55n4zr7RnG7kvOPVAVGjK
CrysrBl3LVtxilPILPtOCwMwu6DqXypj9h9+F7u59+pc/YzZTwJeA80XndyYLNyX
bloE21iv5myvKrScTSfQXmO+I0SiCBLM/tR0JfW3ZoJtBu+lcb8j2CZ2grScRCoi
Hu4iqWEB/deFnr08+N9wsgE0VVMmuHDwPxpA3JN1lkUjFFC5QvwjtIKfEsevzUSb
8/Mqj50VrkW/wzcezVaY67fYGfYqrxO9L0y94YWbXls18pYy9HCM717E/dlAuj3K
RsdH9RYiWs01+5W3cDlkFdbsCLmuU1MbVngoq7Q7Jz//jHHglLqEUvEN2yUltxxO
fqV+1Na0hkktd1v+rwlT80y0ab+zWCaXcbWnYMYVpjp6Op5CvuJu9mnQ33WFJ2ic
ZeQFWn3j7Hye8s3HLslXwfzWbVI3pG7SMqSGoWn7Fu+weQ9zKgYPGa5GscIrPG1M
5T6HThnpa4A6HpqDw6763DgJAlhcH517B2IgMHcFWccVNssStID/9p16dUy4o0mI
92nllgSlFwUsYMgmB12AFbK5O2sf1T5pGvmf2/7E4DpDzp0wIwETXCSxVBhKLcde
/b0cAvKMKHummgJ3TM8d5Ku5Ag0EZtXPGwEQALuuJL/6riQVZIngBNpwsGQFBygC
vSL64/KaGkSdG8kWYwbPQM6AORglsiY/07E6g03af1TbgZNgkbqIxYOYgwEdeKuI
yb+Mpw4jY0AGJj4AFyB4EIvsbfqWZKsgygpBFlWEDlaNbypsFXzSbtDOJFu+aj2u
W2+YcrWsSJCTFq2rNb42c8r6mKU4Kt1sPs3pvy3Wa6sdI2PM/nXDx6xBu1paYbY8
QD5bREY07Z8zZsdq4mDJMbZ76Czi/dWbU7QlXrRYCzQYuf0/rD6kkChYSt42HpY2
spRVd3hYR8LvyeAg9LwSZx3paC7eTwPada2EBW0KfPPeuprfDcNUqW0MujLC2SvX
c7WUR4mo8UhydZqd0KUe85ZIi50mXo+onC+qhXLt2QEZCynJc9JqUWrbJS7NOM05
32hUS6VYOefEt7rVoPIFuY5DLkIwOHUASZiUxX4NJWH+sdZloJjGbPw3q3drKEh7
xM6U5eHoaaH3BNubxYsAFmAgqPuNWQHhGZwlYe0Q5ew2iNLdNC8JkUxchp0prl1O
nw1B6WG8Qt58vTeznOjsEw6rXH3gJqYZy737oZm6VNiOSAMG7cHH0tiTtFMvgZIJ
e99aBJuLjb0t57iRoPkdAMlym+lYGdDylcEFrkNYVci/dZhUs2HUu20XSfsPsnPm
bJ5ZBeqNraNh0OUZABEBAAGJAjwEGAEIACYWIQTUkFAlYyrlA2Bc2JqasjAjp8uR
MgUCZtXPGwIbDAUJB4YfOgAKCRCasjAjp8uRMr8PD/9VY11fgslwwBCYWdlfKBdk
+msNQzJ0m/mOVDVwSKsZC5XEPdwspTtGiyGI0fz0gK/17UJRHpKSui+Q3kzw3cb+
+Utlw64WCNlYrFWtTwES42BqmtcLwCHf9HpK1tmmj7QucaZTFvSbieoB1yRMovs6
dQ7Yw9ZCVyMH93Nj73wm4VTnSUAWWuW2SKAHxFrJvvBwJ5MzeYJDhpg9LvtwPazy
E2ulq7YOB9YgxrLmLGiy4vgC/kJ5YYg79qM7bZbUYzS981dy0+BomX3J8DRyHhXd
akEcAdkZ2sXv74569xEd1J2vSZwUoeZ5yDDUlroJZ5zf1/fGjw489MpSxO4DcD8W
/hmPMcw5mbRNZ3XhmKHQMVfWk+caGe/sPVPlUX7M22sDoWQKXqfp3rLAFIvJea6A
N4+5uex5Itk1CCbwJyg1sxQA7oFksr8AGFdz+7e08jsa0iZ4W9KA4h0CWU0x8wOx
wMv2Q3sIZHGmDyzevmkTmdsQAuQjniQUCAd+grERpKB0c60PMJNSisHaGYap1loo
rhjMPyGEx+6x3I6zbgmpTAm/AM0B/TWQ2nOwfXP0s6gAewADU+iFFqef+H4jcMIQ
l6Azvoeu9RI2SnwYD43YbU7DmqxhKl04RdtBp/x53ZrlOYXWINXwIdcJyFXvFQUe
/tbJ8M/LIrGA8mpWXYSefw==
=CPEU
-----END PGP PUBLIC KEY BLOCK-----
34 changes: 0 additions & 34 deletions nix/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 35 additions & 31 deletions nix/flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Nix annoyances:
# - git add first? 🤔 https://github.com/NixOS/nix/issues/6642
{
description = "Personal nix-darwin system flake";
description = "My nix-darwin system flake";

nixConfig = {
experimental-features = [ "nix-command" "flakes" ];
};

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
Expand All @@ -10,39 +14,39 @@
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
# https://github.com/zhaofengli/nix-homebrew
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
homebrew-core = {
url = "github:homebrew/homebrew-core";
flake = false;
};
homebrew-cask = {
url = "github:homebrew/homebrew-cask";
flake = false;
};
# homebrew-core = {
# url = "github:homebrew/homebrew-core";
# flake = false;
# };
# homebrew-cask = {
# url = "github:homebrew/homebrew-cask";
# flake = false;
# };
};

outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, homebrew-core, homebrew-cask }: {
outputs = inputs@{ self, nix-darwin, nixpkgs, ... }: {
# Build flake: darwin-rebuild build --flake .#bort
darwinConfigurations."bort" = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
pkgs = import nixpkgs { system = "aarch64-darwin"; };
modules = [
./modules/darwin
nix-homebrew.darwinModules.nix-homebrew
{
nix-homebrew = {
enable = true;
enableRosetta = true;
user = "brett";
taps = {
"homebrew/homebrew-core" = homebrew-core;
"homebrew/homebrew-cask" = homebrew-cask;
};
mutableTaps = false;
autoMigrate = true; # Disable if new setup
};
}
];
darwinConfigurations = {
"kipp" = nix-darwin.lib.darwinSystem {
modules = [
./hosts/kipp
# nix-homebrew.darwinModules.nix-homebrew
# {
# nix-homebrew = {
# enable = true;
# enableRosetta = true;
# user = "brett";
# taps = {
# "homebrew/homebrew-core" = homebrew-core;
# "homebrew/homebrew-cask" = homebrew-cask;
# };
# mutableTaps = false;
# autoMigrate = true; # Disable if new setup
# };
# }
];
};
};
darwinPackages = self.darwinConfigurations."bort".pkgs;
darwinPackages = self.darwinConfigurations."kipp".pkgs;
};
}
48 changes: 26 additions & 22 deletions nix/darwin/default.nix → nix/hosts/kipp/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
{ pkgs, ... }: {
# Search packages: nix-env -qaP | grep wget
environment.systemPackages = [
pkgs.asdf
pkgs.atuin
pkgs.bat
pkgs.broot
pkgs.btop
pkgs.coreutils
pkgs.elixir
pkgs.fd
pkgs.git
pkgs.go-task
pkgs.lsd
pkgs.mas
pkgs.neovim
pkgs.qrencode
pkgs.rustc
pkgs.terminal-notifier
pkgs.tmux
pkgs.trash-cli
pkgs.wget
];
nix.settings.experimental-features = "nix-command flakes";

system.defaults = {
dock.autohide = true;
dock.persistent-apps = [];
Expand All @@ -43,6 +23,29 @@
nixpkgs.hostPlatform = "aarch64-darwin";
time.timeZone = "America/Denver";

# Search packages: nix-env -qaP | grep wget
environment.systemPackages = [
pkgs.asdf
pkgs.atuin
pkgs.bat
pkgs.broot
pkgs.btop
pkgs.coreutils
pkgs.elixir
pkgs.fd
pkgs.git
pkgs.go-task
pkgs.lsd
pkgs.mas
pkgs.neovim
pkgs.qrencode
pkgs.rustc
pkgs.terminal-notifier
pkgs.tmux
pkgs.trash-cli
pkgs.wget
];

homebrew = {
enable = true;
taps = [
Expand Down Expand Up @@ -96,5 +99,6 @@

nix.extraOptions = ''
extra-platforms = aarch64-darwin x86_64-darwin
experimental-features = nix-command flakes
'';
}

0 comments on commit f556ade

Please sign in to comment.