2 files changed, 30 insertions, 18 deletions

diff --git a/flake.lock b/flake.lock
index 2a23500..04a19e6 100644
--- a/flake.lock
+++ b/flake.lock
diff --git a/flake.nix b/flake.nix
index 99f4ba0..4997a7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,6 @@
       inputs.hyprland.follows = "hyprland";  
     };
 
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
-
     agenix.url = "github:ryantm/agenix";
 
     update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved";
@@ -27,36 +25,50 @@
     astal-bar.url = "git+http://tarreltaart.home:3000/jras/astal-bar.git";
   };
 
-  outputs = { self, utils, home-manager, agenix, update-systemd-resolved, astal-bar, ... }@inputs:
-    utils.lib.mkFlake {
-      inherit self inputs;
-
-      channelsConfig.allowUnfree = true;
-
-      hostDefaults.modules = [
+  outputs = { self, nixpkgs, home-manager, agenix, update-systemd-resolved, astal-bar, ... }@inputs:
+  {
+    nixosConfigurations.work = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [
+        ./hosts/work.nix
+        update-systemd-resolved.nixosModules.update-systemd-resolved
+        {
+          environment.systemPackages = [ agenix.packages."x86_64-linux".default ];
+        }
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
         ./config/shared.nix
 
         {
           environment.systemPackages = [
-            astal-bar.packages.${utils.lib.system.x86_64-linux}.default
+            astal-bar.packages."x86_64-linux".default
           ];
         }
       ];
+    };
 
-      hosts.work.modules = [
-        update-systemd-resolved.nixosModules.update-systemd-resolved
-        ./hosts/work.nix
+    nixosConfigurations.tarrel = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      # config = {
+      #   allowUnfree = true;
+      # };
+      specialArgs = { inherit inputs; };
+      modules = [
+        ./hosts/tarrel.nix
         {
-          environment.systemPackages = [ agenix.packages.${utils.lib.system.x86_64-linux}.default ];
+          environment.systemPackages = [ agenix.packages."x86_64-linux".default ];
         }
-      ];
-      hosts.tarrel.modules = [
-        ./hosts/tarrel.nix
+        home-manager.nixosModules.home-manager
+        agenix.nixosModules.default
+        ./config/shared.nix
+
         {
-          environment.systemPackages = [ agenix.packages.${utils.lib.system.x86_64-linux}.default ];
+          environment.systemPackages = [
+            astal-bar.packages."x86_64-linux".default
+          ];
         }
       ];
     };
+  };
 }