From 64735fc5bdfb6904b32a30e7deddb35224b03e4c Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Mon, 25 Aug 2025 16:40:09 -0600 Subject: [PATCH] hotfixes for switch to standard trivionomicon flake.nix --- flake.nix | 6 +++--- home/default.nix | 1 + pkgs/config/default.nix | 2 +- pkgs/default.nix | 1 + sys/platforms/posixlycorrect/default.nix | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 66ad268..4401d6d 100644 --- a/flake.nix +++ b/flake.nix @@ -41,14 +41,14 @@ doctrinePrefix = "local"; paths = { - # localOverlay = "pkgs"; + localOverlay = "pkgs"; nixpkgsConfig = "pkgs/config"; nixosSource = "sys"; - nixosPlatforms = "sys/platform"; + nixosPlatforms = "sys/platforms"; hmSource = "home"; - hmPlatforms = "home/platform"; + hmPlatforms = "home/platforms"; }; }; } diff --git a/home/default.nix b/home/default.nix index 3db7471..3ba92a1 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,5 +9,6 @@ with lib; { imports = [ ./modules flakes.trivionomicon.homeManagerModules.default + flakes.hm-isolation.homeManagerModule ]; } diff --git a/pkgs/config/default.nix b/pkgs/config/default.nix index 0156348..681271f 100644 --- a/pkgs/config/default.nix +++ b/pkgs/config/default.nix @@ -1,4 +1,4 @@ -lib: +{lib}: with lib; { android_sdk.accept_license = true; #TODO: what the fuck is this allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg); diff --git a/pkgs/default.nix b/pkgs/default.nix index 05dfb66..daef071 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,7 @@ { final, prev, + flakes, }: with prev.lib; let inherit (final) callPackage fetchpatch; diff --git a/sys/platforms/posixlycorrect/default.nix b/sys/platforms/posixlycorrect/default.nix index 09ad159..3942928 100644 --- a/sys/platforms/posixlycorrect/default.nix +++ b/sys/platforms/posixlycorrect/default.nix @@ -31,7 +31,7 @@ }; }; - trivium.sway.enable = true; + local.sway.enable = true; networking = { hostName = "posixlycorrect";