From 15ab33a4704ec428121a9127c8fee9eb88922990 Mon Sep 17 00:00:00 2001
From: tdpeuter <tibo.depeuter@gmail.com>
Date: Tue, 4 Apr 2023 11:23:33 +0200
Subject: [PATCH] Use flake-utils-plus

---
 nixos/flake.lock | 12 ++++++------
 nixos/flake.nix  | 37 ++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 4b1655c..80ae514 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1679067101,
-        "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=",
+        "lastModified": 1680555990,
+        "narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9154cd519a8942728038819682d6b3ff33f321bb",
+        "rev": "d6f3ba090ed090ae664ab5bac329654093aae725",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679472241,
-        "narHash": "sha256-VK2YDic2NjPvfsuneJCLIrWS38qUfoW8rLLimx0rWXA=",
+        "lastModified": 1680498889,
+        "narHash": "sha256-4nGFBm+oILOO6DPoKTPxVlfkZSxCOY4W25zSRHESK48=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ef6e7727f4c31507627815d4f8679c5841efb00",
+        "rev": "799d153e4f316143a9db0eb869ecf44d8d4c0356",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 44bdad6..235c9da 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "System configuration of my machines using flakes";
- 
+
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.11";
-    
+
     devshell = {
       url = "github:numtide/devshell";
       inputs = {
@@ -34,26 +34,21 @@
     in
     utils.lib.mkFlake {
       inherit self inputs;
-      homeManagerConfigurations = {
-        tdpeuter = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          modules = [
-            ./users/tdpeuter/home.nix
-          ];
-        };
+
+      channelsConfig = {
+        allowUnfree = true;
       };
-      nixosConfigurations = {
-        Tibo-NixFat = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [ ./hosts/Tibo-NixFat ];
-        };
-        Tibo-NixTest = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [ ./hosts/Tibo-NixTest ];
-        };
+
+      hostDefaults = {
+        inherit system;
+        modules = [
+          home-manager.nixosModule
+        ];
+      };
+
+      hosts = {
+        Tibo-NixFat.modules  = [ ./hosts/Tibo-NixFat  ];
+        Tibo-NixTest.modules = [ ./hosts/Tibo-NixTest ];
       };
     };
 }