project: rewrite

1 files changed, 13 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index eecd9ee..ebcd2ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,12 @@
     master.url = "github:nixos/nixpkgs/master";
 
     # https://github.com/nix-community/home-manager/issues/2546 
-    home-manager.url = "github:nix-community/home-manager?rev=9de77227d7780518cfeaee5a917970247f3ecc56";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
+    flake-utils.url = "github:numtide/flake-utils";
+    flake-utils.inputs.nixpkgs.follows = "nixpkgs";
+
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -20,29 +23,26 @@
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
 
     # https://github.com/NixOS/nix/pull/5342
-    nixpkgs-extra.url = "git+https://git.sr.ht/~boppy/nixpkgs-extra?ref=main";
-    nixpkgs-extra.inputs.nixpkgs.follows = "nixpkgs";
+    chaotic-nixpkgs.url = "git+https://git.sr.ht/~boppy/chaotic-nixpkgs?ref=main";
+    chaotic-nixpkgs.inputs.nixpkgs.follows = "nixpkgs";
 
     phocus = { url = "git+https://git.sr.ht/~boppy/phocus"; flake = false; };
     wallpapers = { url = "git+https://git.sr.ht/~boppy/wall?ref=main"; flake = false; };
   };
 
-  outputs = { self, nixpkgs, ... } @ inputs:
-    {
-      nixosModules = import ./nixos/modules;
-      nixosConfigurations = import ./nixos/configurations inputs;
+  outputs = { self, nixpkgs, flake-utils, sops-nix, ... } @ inputs:
+  {
+
+      nixosConfigurations = import ./nixos inputs;
 
-      homeModules = import ./home/modules;
-      homeConfigurations = import ./home/configurations inputs;
+      homeConfigurations = import ./home inputs;
 
       packages.x86_64-linux = (import ./packages inputs)
-        // self.lib.nixosConfigurationsAsPackages.x86_64-linux
-        // self.lib.homeConfigurationsAsPackages.x86_64-linux;
+      // self.lib.nixosConfigurationsAsPackages.x86_64-linux
+      // self.lib.homeConfigurationsAsPackages.x86_64-linux;
 
       checks = self.packages;
 
       lib = import ./lib inputs;
-
-      non-flake = (import ./packages/non-flake inputs);
     };
 }