From c249aff6a66e581bb6a4363c5359d0da616e71df Mon Sep 17 00:00:00 2001 From: Don Harper Date: Wed, 3 Sep 2025 21:39:32 -0500 Subject: [PATCH] loki - swich to framework and primary, book to not primary --- hosts/book/default.nix | 2 +- hosts/loki/default.nix | 4 ++-- hosts/workstation/default.nix | 2 +- hosts/workstation/systemd-primary.nix | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hosts/book/default.nix b/hosts/book/default.nix index c660ecd..7d38840 100644 --- a/hosts/book/default.nix +++ b/hosts/book/default.nix @@ -27,7 +27,7 @@ tlp.enable = true; gnome-calendar.enable = true; }; - primary.enable = true; + primary.enable = false; wm = { sway.enable = true; kde.enable = false; diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix index f5be54b..4b41cf7 100644 --- a/hosts/loki/default.nix +++ b/hosts/loki/default.nix @@ -7,7 +7,7 @@ ... }: { imports = [ - inputs.nixos-hardware.nixosModules.dell-xps-13-9310 + inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series ./hardware-configuration.nix # ../disko/nvme.nix ../workstation @@ -29,7 +29,7 @@ auto-cpufreq.enable = true; gnome-calendar.enable = true; }; - primary.enable = false; + primary.enable = true; wm = { sway.enable = true; kde.enable = false; diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix index 17fc272..ed0bb47 100644 --- a/hosts/workstation/default.nix +++ b/hosts/workstation/default.nix @@ -246,7 +246,7 @@ in { config = { allowUnfree = true; allowUnfreePredicate = true; - permittedInsecurePackages = ["libsoup-2.74.3"]; + permittedInsecurePackages = ["libsoup-2.74.3" "qtwebengine-5.15.19"]; allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"]; }; diff --git a/hosts/workstation/systemd-primary.nix b/hosts/workstation/systemd-primary.nix index afa1354..8825d2e 100644 --- a/hosts/workstation/systemd-primary.nix +++ b/hosts/workstation/systemd-primary.nix @@ -3,10 +3,12 @@ lib, config, ... -}: let +}: +with lib; let cfg = config.primary; in { - options.primary = mkIf cfg.enable { + options.primary = {enable = mkEnableOption "is primary host";}; + config = mkIf cfg.enable { systemd = { user = { services = {