thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 02:41:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update flake

Browse Source
This commit is contained in:
thiloho
2024-08-11 19:53:22 +02:00
parent 6ec02ccb7e
commit d5f61ae70b
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@@ -75,23 +75,23 @@
} }
); );
nixosConfigurations = forAllSystems (system: { nixosConfigurations = {
module-test = nixpkgs.lib.nixosSystem { module-test = nixpkgs.lib.nixosSystem {
inherit system; system = "x86_64-linux";
modules = [ modules = [
./nix/module-test.nix ./nix/module-test.nix
{ _module.args.localArchtikaPackage = self.packages.${system}.default; } { _module.args.localArchtikaPackage = self.packages."x86_64-linux".default; }
]; ];
}; };
dev-vm = nixpkgs.lib.nixosSystem { dev-vm = nixpkgs.lib.nixosSystem {
inherit system; system = "x86_64-linux";
modules = [ ./nix/dev-vm.nix ]; modules = [ ./nix/dev-vm.nix ];
}; };
demo-server = nixpkgs.lib.nixosSystem { demo-server = nixpkgs.lib.nixosSystem {
inherit system; system = "aarch64-linux";
modules = [ ./nix/demo-server ]; modules = [ ./nix/demo-server ];
}; };
}); };
formatter = forAllSystems ( formatter = forAllSystems (
system: system:

4
nix/demo-server/default.nix
View File

@@ -1,8 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [ ./hardware-configuration.nix ];
./hardware-configuration.nix
];
boot = { boot = {
loader = { loader = {

43
nix/demo-server/hardware-configuration.nix
View File

@@ -1,32 +1,41 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_scsi" "sr_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"virtio_scsi"
"sr_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/af7c3a41-3427-4354-8bf5-bd98698792c5"; device = "/dev/disk/by-uuid/af7c3a41-3427-4354-8bf5-bd98698792c5";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/BA3C-CCAF"; device = "/dev/disk/by-uuid/BA3C-CCAF";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
}; "fmask=0077"
"dmask=0077"
swapDevices =
[ { device = "/dev/disk/by-uuid/a58e9054-0b76-4da5-ae13-0d73515ec41e"; }
]; ];
};
swapDevices = [ { device = "/dev/disk/by-uuid/a58e9054-0b76-4da5-ae13-0d73515ec41e"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's