greg/nixos
1
0
Fork 2
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Update Darwin building and copier

Browse Source
This commit is contained in:
Greg Hellings
2024-01-22 12:16:56 -06:00
committed by greg-compass
parent 21540946b0
commit b9cca7d400
6 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
darwin/default.nix
+10 -1
View File
@@ -18,6 +18,7 @@ let
{ nixpkgs.overlays = overlays; } { nixpkgs.overlays = overlays; }
hm.darwinModules.home-manager hm.darwinModules.home-manager
{ {
system.stateVersion = 4;
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
users."gregory.hellings" = import ../home/home.nix; users."gregory.hellings" = import ../home/home.nix;
@@ -30,8 +31,16 @@ let
}; };
}; };
users.users."gregory.hellings".home = "/Users/gregory.hellings"; users.users."gregory.hellings".home = "/Users/gregory.hellings";
programs = {
zsh.enable = true;
bash.enable = true;
};
services.nix-daemon.enable = true;
nix = {
gc.interval.Hour = 24;
settings.auto-optimise-store = false; # Darwin bugs?
};
} }
../modules
./${name} ./${name}
] ++ extraMods; ] ++ extraMods;
}; };
flake.lock
Generated
+6 -6
View File
@@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697723594, "lastModified": 1705915768,
"narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -406,11 +406,11 @@
}, },
"nixunstable": { "nixunstable": {
"locked": { "locked": {
"lastModified": 1705677747, "lastModified": 1705856552,
"narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
home/home.nix
+1 -5
View File
@@ -35,7 +35,6 @@
home.stateVersion = "23.05"; home.stateVersion = "23.05";
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden-cli bitwarden-cli
copier
diffutils diffutils
findutils findutils
gh gh
@@ -54,8 +53,5 @@
tree tree
unzip unzip
wget wget
] ++ ( if pkgs.system == "x86_64-linux" || pkgs.system == "aarch64-linux" then ] ++ (if (pkgs.copier.version == "9.1.0") then [ pkgs.copier ] else []);
# Linux-only packages here
[
] else []);
} }
home/xonsh.nix
+3 -3
View File
@@ -28,20 +28,20 @@
GOPATH = "${config.home.homeDirectory}/src/go"; GOPATH = "${config.home.homeDirectory}/src/go";
GOBIN = "${config.home.homeDirectory}/src/bin"; GOBIN = "${config.home.homeDirectory}/src/bin";
EFI_DIR = "${pkgs.OVMF.fd}/FV/"; EFI_DIR = lib.mkIf pkgs.stdenv.isLinux "${pkgs.OVMF.fd}/FV/";
}; };
aliases = { aliases = {
ac = "vox activate"; ac = "vox activate";
cavg = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/avg_duration/cmd/avg_duration:avg_duration";
cbazel = "compass workspace exec bazel"; cbazel = "compass workspace exec bazel";
cblack = "compass workspace run src/python3/uc/tools:run_black --"; cblack = "compass workspace run src/python3/uc/tools:run_black --";
cbuild = "compass workspace build"; cbuild = "compass workspace build";
cci = "compass workspace run src/python3/uc/tools:circleci-checks"; cci = "compass workspace run src/python3/uc/tools:circleci-checks";
ccover = "compass workspace cover --extra-cmd-args=\"--test_output=errors\""; ccover = "compass workspace cover --extra-cmd-args=\"--test_output=errors\"";
cexec = "compass workspace exec"; cexec = "compass workspace exec";
cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache:fetch"; cfetch = "compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/fetch/cmd/fetch:fetch";
cgh = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/compass\" gh"; cgh = "$GH_CONFIG_DIR=\"${config.home.homeDirectory}/.config/gh/compass\" gh";
cpip = "compass workspace run src/python3/uc/tools:run_pip_compile"; cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";
crun = "compass workspace run"; crun = "compass workspace run";
modules/darwin/default.nix
-11
View File
@@ -1,11 +0,0 @@
{ ... }:
{
system.stateVersion = 4;
programs = {
zsh.enable = true;
bash.enable = true;
};
services.nix-daemon.enable = true;
nix.gc.interval.Hour = 24;
}
modules/default.nix
+5 -5
View File
@@ -2,12 +2,12 @@
let let
inherit (lib.strings) hasSuffix; inherit (lib.strings) hasSuffix;
system = pkgs.system; in system = pkgs.system;
{ inherit (pkgs.stdenv) isDarwin isLinux;
in {
imports = [ imports = [
] ]
++ (if (lib.strings.hasSuffix "darwin" "nope") then [./darwin] else []) ++ (if (isLinux) then [./linux] else []);
++ (if (lib.strings.hasSuffix "linux" "linux") then [./linux] else []);
# Enable flakes # Enable flakes
nix = { nix = {
@@ -20,7 +20,7 @@ let
}; };
settings = { settings = {
auto-optimise-store = (if lib.strings.hasSuffix "darwin" pkgs.system then false else true); auto-optimise-store = true;
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
keep-outputs = true; keep-outputs = true;
keep-derivations = true; keep-derivations = true;