diff --git a/README.md b/README.md index 33a0d74..1c9677d 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ Switch server nixos-rebuild switch --target-host root@posixlycorrect.com --use-substitutes --show-trace --flake .\#vps -Update homepage - - nix flake update --commit-lock-file homepage - ## Cleanup diff --git a/flake.nix b/flake.nix index 0c39b9e..71c7fc6 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ inherit flakes; system = "x86_64-linux"; + doctrinePrefix = "local"; paths = { localOverlay = "pkgs"; diff --git a/sys/modules/defaultDesktopPack.nix b/sys/modules/defaultDesktopPack.nix index 9cc8283..0dde759 100644 --- a/sys/modules/defaultDesktopPack.nix +++ b/sys/modules/defaultDesktopPack.nix @@ -27,14 +27,19 @@ in { }; }; - trivium = { + # trivionomicon + local = { sway.enable = true; trivionomiconMotd.enable = true; }; networking = { networkmanager.enable = true; + + #TODO useDHCP = false; # The global useDHCP flag is deprecated, therefore explicitly set to false here. + interfaces.enp7s0.useDHCP = true; # Per-interface useDHCP will be mandatory in the future, so this generated config + interfaces.wlp6s0.useDHCP = true; # replicates the default behaviour. }; }; } diff --git a/sys/platforms/t14/default.nix b/sys/platforms/t14/default.nix index 884293b..cbb2a67 100644 --- a/sys/platforms/t14/default.nix +++ b/sys/platforms/t14/default.nix @@ -18,7 +18,8 @@ bluetooth.enable = true; }; - trivium = { + # trivionomicon + local = { laptop.enable = true; thinkpad.enable = true; }; diff --git a/sys/platforms/vps/default.nix b/sys/platforms/vps/default.nix index 87433d8..25b29da 100644 --- a/sys/platforms/vps/default.nix +++ b/sys/platforms/vps/default.nix @@ -37,7 +37,8 @@ with lib; { }; }; - trivium.soju = { + # trivionomicon + local.soju = { enable = true; fullyQualifiedDomain = "soju.posixlycorrect.com"; };