hmm

flake.nix

@@ -3,8 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
-    nvf.url = "github:notashelf/nvf";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
 
     alejandra.url = "github:kamadorueda/alejandra/3.1.0";
     alejandra.inputs.nixpkgs.follows = "nixpkgs";
@@ -19,47 +18,44 @@
     self,
     nixpkgs,
     home-manager,
-    nvf,
-    alejandra,
+    systems,
     ...
   } @ inputs: let
     inherit (self) outputs;
+
+    # copied from https://github.com/Misterio77/nix-config/blob/main/flake.nix
+    lib = nixpkgs.lib // home-manager.lib;
+    forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
+    pkgsFor = lib.genAttrs (import systems) (
+      system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        }
+    );
   in {
-    # use "nixos", or your hostname as the name of the configuration
-    # it's a better practice than "default" shown in the video
-
+    inherit lib;
     nixosModules = import ./modules/nixos;
-
     homeManagerModules = import ./modules/home-manager;
 
-    packages."x86_64-linux".default =
-      (nvf.lib.neovimConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        modules = [./nvf-configuration.nix];
-      })
-      .neovim;
+    formatter = forEachSystem (pkgs: pkgs.alejandra);
 
     nixosConfigurations = {
-      hummingbird = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
+      # Main desktop for games & workstation
+      hummingbird = lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
         modules = [
-          {
-            environment.systemPackages = [alejandra.defaultPackage.x86_64-linux];
-          }
-
-          ./hosts/hummingbird/configuration.nix
-          nvf.nixosModules.default
-          ./nvf-configuration.nix
+          ./hosts/hummingbird
         ];
       };
     };
 
     homeConfigurations = {
-      "luna@hummingbird" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
+      "luna@hummingbird" = lib.homeManagerConfiguration {
+        pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/hummingbird/home.nix
+          ./home-manager/luna/hummingbird.nix
         ];
       };
     };