From d5f61ae70b2d9d1648e61e274804060635fba3ec Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Sun, 11 Aug 2024 19:53:22 +0200 Subject: [PATCH] Update flake --- flake.nix | 12 +++--- nix/demo-server/default.nix | 4 +- nix/demo-server/hardware-configuration.nix | 43 +++++++++++++--------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 91cf0f0..cec6d84 100644 --- a/flake.nix +++ b/flake.nix @@ -75,23 +75,23 @@ } ); - nixosConfigurations = forAllSystems (system: { + nixosConfigurations = { module-test = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; modules = [ ./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 { - inherit system; + system = "x86_64-linux"; modules = [ ./nix/dev-vm.nix ]; }; demo-server = nixpkgs.lib.nixosSystem { - inherit system; + system = "aarch64-linux"; modules = [ ./nix/demo-server ]; }; - }); + }; formatter = forAllSystems ( system: diff --git a/nix/demo-server/default.nix b/nix/demo-server/default.nix index aeaf63b..dd4c4c1 100644 --- a/nix/demo-server/default.nix +++ b/nix/demo-server/default.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ]; + imports = [ ./hardware-configuration.nix ]; boot = { loader = { diff --git a/nix/demo-server/hardware-configuration.nix b/nix/demo-server/hardware-configuration.nix index dd3e37d..b53eac3 100644 --- a/nix/demo-server/hardware-configuration.nix +++ b/nix/demo-server/hardware-configuration.nix @@ -1,32 +1,41 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = [ (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.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/af7c3a41-3427-4354-8bf5-bd98698792c5"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/af7c3a41-3427-4354-8bf5-bd98698792c5"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BA3C-CCAF"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/a58e9054-0b76-4da5-ae13-0d73515ec41e"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BA3C-CCAF"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ { device = "/dev/disk/by-uuid/a58e9054-0b76-4da5-ae13-0d73515ec41e"; } ]; # 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