Squash merge main into testing

This commit is contained in:
Don Harper 2025-11-11 15:19:17 -06:00
parent 3cf83fb118
commit c27f617078
22 changed files with 334 additions and 289 deletions

View file

@ -1,4 +1,11 @@
{ inputs, outputs, lib, config, pkgs, ... }: {
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
./hardware-configuration.nix
@ -6,7 +13,6 @@
../workstation
];
networking.hostName = "loki";
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
variables.address = "100.72.0.1";
variables.swayScale = "1.2";
@ -20,5 +26,5 @@
gnome-calendar.enable = true;
};
primary.enable = true;
wm = { sway.enable = true; };
wm = {sway.enable = true;};
}