-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nixos/nix: init, based on nixos/meta and nixos/dev/cross-compiling
- Loading branch information
1 parent
daeacfa
commit 6b7a191
Showing
7 changed files
with
43 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ let | |
in | ||
{ | ||
imports = [ | ||
./cross-compiling.nix | ||
./virtualisation.nix | ||
]; | ||
|
||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,8 @@ | |
|
||
{ | ||
imports = [ | ||
./meta.nix | ||
./system | ||
../modules | ||
./nix | ||
./system | ||
]; | ||
} |
9 changes: 4 additions & 5 deletions
9
nixos/dev/cross-compiling.nix → nixos/nix/cross-compiling.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ config, lib, pkgs, flake, ... }: | ||
|
||
{ | ||
imports = [ | ||
../../cachix.nix | ||
../../overlays | ||
./cross-compiling.nix | ||
]; | ||
|
||
options.nixos.nix.enable = lib.mkDefaultOption "nix/nixpkgs config"; | ||
|
||
config = lib.mkIf config.nixos.nix.enable { | ||
# Add some Nix related packages | ||
environment.systemPackages = with pkgs; [ | ||
nixos-cleanup | ||
nom-rebuild | ||
]; | ||
|
||
nix = import ../../shared/nix.nix { inherit pkgs flake; }; | ||
|
||
# Enable unfree packages | ||
nixpkgs.config.allowUnfree = true; | ||
|
||
# Change build dir to /var/tmp | ||
systemd.services.nix-daemon = { | ||
environment.TMPDIR = lib.mkDefault "/var/tmp"; | ||
}; | ||
|
||
# This value determines the NixOS release with which your system is to be | ||
# compatible, in order to avoid breaking some software such as database | ||
# servers. You should change this only after NixOS release notes say you | ||
# should. | ||
system.stateVersion = lib.mkDefault "23.11"; # Did you read the comment? | ||
}; | ||
} |