Skip to content

Commit

Permalink
chore: update flake lock
Browse files Browse the repository at this point in the history
  • Loading branch information
o-az committed Nov 10, 2024
1 parent 44d99d7 commit ea93709
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 30 deletions.
9 changes: 7 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/usr/bin/env bash
set -eou pipefail
use flake --accept-flake-config

export DIRENV_WARN_TIMEOUT=1m
use flake . --accept-flake-config

watch_file flake.nix
watch_file flake.lock
watch_file home-modules/home.nix

export DIRENV_WARN_TIMEOUT=2m
22 changes: 12 additions & 10 deletions darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ nix-darwin.lib.darwinSystem rec {
./modules/nix.nix
home-manager.darwinModules.home-manager
{
# home-manager.users.o = {
# name = "o";
# home = "/Users/o";
# };
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
Expand All @@ -40,7 +36,6 @@ nix-darwin.lib.darwinSystem rec {
./home-modules/ghostty
./home-modules/bat.nix
./home-modules/git.nix
./home-modules/pls.nix
# ./home-modules/fonts.nix
./home-modules/direnv.nix
./home-modules/shells/bash
Expand All @@ -66,11 +61,18 @@ nix-darwin.lib.darwinSystem rec {
}
];
specialArgs = {
inherit inputs;
inherit system;
inherit nixpkgs;
inherit ghostty;
inherit overlays;
inherit
inputs
system
nixpkgs
ghostty
overlays
;
};
environment = {
variables = {
EDITOR = "hx";
};
};
homebrew = {
enable = true;
Expand Down
26 changes: 13 additions & 13 deletions flake.lock

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

12 changes: 7 additions & 5 deletions nixos.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@ nixpkgs.lib.nixosSystem rec {
allowBroken = true;
config.allowUnfree = true;
};
inherit pls;
inherit nvix;
inherit inputs;
inherit ghostty;
inherit overlays;
inherit
pls
nvix
inputs
ghostty
overlays
;
};
};
}
Expand Down
15 changes: 15 additions & 0 deletions orbstack/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
with lib;

{
#
# nix-ld is specifically so that wrangler can work
# https://github.com/unlux/workerd/blob/main/docs/nixos.md
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
icu
nss
curl
zlib
fuse3
expat
openssl
stdenv.cc.cc
];

imports = [
# Include the default lxd configuration.
"${modulesPath}/virtualisation/lxc-container.nix"
Expand Down

0 comments on commit ea93709

Please sign in to comment.