alot of stuff

1 files changed, 19 insertions, 17 deletions

diff --git a/flake.nix b/flake.nix
index c61d9fc..edbd2c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,40 +2,40 @@
   description = "NixOS Flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    agenix.url = "github:ryantm/agenix";
+    astal-bar.url = "path:/home/jras/projects/astal-bar";
 
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
-    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 
+    helix.url = "github:helix-editor/helix/master";
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-
-    helix.url = "github:helix-editor/helix/master";
-
     hyprland.url = "github:hyprwm/Hyprland?submodules=1&ref=v0.45.2-b";
     hy3 = {
       url = "github:outfoxxed/hy3?ref=hl0.45.0";
       inputs.hyprland.follows = "hyprland";  
     };
 
-    agenix.url = "github:ryantm/agenix";
-
-    update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved";
-    update-systemd-resolved.inputs.nixpkgs.follows = "nixpkgs";
+    microvm.url = "github:astro/microvm.nix";
+    microvm.inputs.nixpkgs.follows = "nixpkgs";
 
     nil.url = "github:oxalica/nil";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 
-    astal-bar.url = "path:/home/jras/projects/astal-bar";
+    update-systemd-resolved.url = "github:jonathanio/update-systemd-resolved";
+    update-systemd-resolved.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs@{
     self,
-    nixpkgs,
+    agenix,
     disko,
-    nixos-facter-modules,
     home-manager,
-    agenix,
+    microvm,
+    nixpkgs,
+    nixos-facter-modules,
     update-systemd-resolved,
     ...
   }:
@@ -53,7 +53,7 @@
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
 
-        ./configuration/work
+        ./modules/work
       ];
     };
 
@@ -69,7 +69,7 @@
         home-manager.nixosModules.home-manager
         agenix.nixosModules.default
 
-        ./configuration/tarrel
+        ./modules/tarrel
       ];
     };
 
@@ -81,8 +81,10 @@
         home-manager.nixosModules.home-manager
         disko.nixosModules.disko
         nixos-facter-modules.nixosModules.facter
-        { config.facter.reportPath = ./configuration/snorlax/facter.json; }
-        ./configuration/snorlax
+        microvm.nixosModules.host
+
+        { config.facter.reportPath = ./modules/snorlax/facter.json; }
+        ./modules/snorlax
       ];
     };
   };