c2vi/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Sebastian Moser
2023-11-20 14:30:09 +01:00
parent 7ded3f16d3
commit 31a632d87b
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
flake.nix
View File

@@ -58,7 +58,7 @@
workDir = "/home/me/work"; workDir = "/home/me/work";
secretsDir = "/home/me/.mysecrets"; secretsDir = "/home/me/.mysecrets";
persistentDir = "/home/me/work/app-data"; persistentDir = "/home/me/work/app-data";
specialArgs = { specialArgs = {
inherit inputs confDir workDir secretsDir persistentDir self; inherit inputs confDir workDir secretsDir persistentDir self;
pkgs = import nixpkgs { system = "x86_64-linux"; config = { pkgs = import nixpkgs { system = "x86_64-linux"; config = {
allowUnfree = true; allowUnfree = true;
@@ -99,44 +99,17 @@
# my raspberry to try out stuff with # my raspberry to try out stuff with
"luna" = nixpkgs.lib.nixosSystem { "luna" = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "aarch64-linux"; system = "aarch64-linux";
#system = "armv7l-linux";
modules = [ modules = [
"${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
#"${inputs.rpi-nixpkgs}/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix"
inputs.nixos-hardware.nixosModules.raspberry-pi-4 inputs.nixos-hardware.nixosModules.raspberry-pi-4
./hosts/luna.nix ./hosts/luna.nix
{ {
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
nixpkgs.overlays = [
{
ubootRaspberryPi4_64bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_64bit;
ubootRaspberryPi3_64bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_64bit;
ubootRaspberryPi4_32bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_32bit;
ubootRaspberryPi3_3264bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_32bit;
raspberrypi-armstubs = nixpkgs.legacyPackages.x86_64.pkgsCross.raspberryPi.raspberrypi-armstubs;
}
];
#nixpkgs.crossSystem.system = "armv7l-linux";
#nixpkgs.config.allowUnsupportedSystem = true;
#nixpkgs.hostPlatform.system = "armv7l-linux";
#nixpkgs.buildPlatform.system = "x86_64-linux"; #If you build on x86 other wise changes this.
# ... extra configs as above
#nixpkgs.config.allowUnsupportedSystem = true;
#nixpkgs.hostPlatform.system = "armv7l-linux";
nixpkgs.hostPlatform.system = "aarch64-linux"; nixpkgs.hostPlatform.system = "aarch64-linux";
nixpkgs.buildPlatform.system = "x86_64-linux"; #If you build on x86 other wise changes this. nixpkgs.buildPlatform.system = "x86_64-linux"; #If you build on x86 other wise changes this.
#nixpkgs.crossSystem.system = "armv7l-linux";
# ... extra configs as above
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
} }
]; ];

2
hosts/luna.nix
View File

@@ -11,7 +11,6 @@
fsType = "ext4"; fsType = "ext4";
}; };
/*
boot = { boot = {
kernelPackages = lib.mkForce pkgs.linuxPackages_latest; kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
loader = { loader = {
@@ -19,7 +18,6 @@
grub.enable = lib.mkDefault false; grub.enable = lib.mkDefault false;
}; };
}; };
*/
nix.settings = { nix.settings = {
experimental-features = lib.mkDefault "nix-command flakes"; experimental-features = lib.mkDefault "nix-command flakes";