colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add img targets for desko and uninsane machines

This commit is contained in:
colin 2022-05-22 02:57:05 -07:00
parent c5e0310229
commit 454e65b027
3 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -29,11 +29,19 @@
system = "aarch64-linux";
extraModules = [ ./machines/uninsane ];
};
packages.aarch64-linux.uninsane-img = self.decl-img {
system = "aarch64-linux";
extraModules = [ ./machines/uninsane ];
};
nixosConfigurations.desko = self.decl-machine {
system = "x86_64-linux";
extraModules = [ ./machines/desko ];
};
packages.x86_64-linux.desko-img = self.decl-img {
system = "x86_64-linux";
extraModules = [ ./machines/desko ];
};
nixosConfigurations.lappy = self.decl-machine {
system = "x86_64-linux";

4
image.nix
View File

@ -2,7 +2,7 @@
{
fileSystems."/" = {
# boot by label instead of unpredictable uuid
device = "/dev/disk/by-label/nixos-lappy";
device = "/dev/disk/by-label/nixos-img";
# make-disk-image only supports ext4
fsType = "ext4";
};
@ -12,7 +12,7 @@
system.build.raw = import "${toString modulesPath}/../lib/make-disk-image.nix" {
inherit lib config pkgs;
partitionTableType = "efi";
label = "nixos-lappy";
label = "nixos-img";
fsType = config.fileSystems."/".fsType;
diskSize = "auto";
format = "raw";

34
machines/uninsane/fs.nix
View File

@ -1,45 +1,15 @@
{ config, pkgs, lib, ... }:
{
# fileSystems."/" = {
# device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
# fsType = "ext4";
# };
fileSystems."/" = {
fileSystems."/" = lib.mkDefault {
device = "/dev/disk/by-uuid/2be70d38-79f4-41b6-bee2-bce5a25f8f7b";
fsType = "ext4";
};
fileSystems."/boot" = {
# this is the /dev/sda1 boot device.
# by mounting this in boot, we can then run `nixos-rebuild` and it'll only take affect when booting from sda1
# (old mmc1 boot will be preserved)
device = "/dev/disk/by-uuid/B318-A67E";
device = lib.mkDefault "/dev/disk/by-uuid/B318-A67E";
fsType = "vfat";
};
# fileSystems."/mnt/storage" = {
# device = "/dev/disk/by-uuid/2be70d38-79f4-41b6-bee2-bce5a25f8f7b";
# fsType = "ext4";
# };
# temporary; nix porting
# fileSystems."/home/colin" = {
# device = "/mnt/storage/home/colin";
# options = [ "bind" ];
# };
# fileSystems."/boot" = {
# device = "/mnt/storage/boot";
# options = [ "bind" ];
# };
# fileSystems."/var/spool" = {
# device = "/mnt/storage/var/spool";
# options = [ "bind" ];
# };
# fileSystems."/var/lib" = {
# device = "/mnt/storage/var/lib";
# options = [ "bind" ];
# };
fileSystems."/var/lib/pleroma" = {
device = "/opt/pleroma";