switched from nixvim to nvf, including porting colour scheme over

flake.nix

@@ -18,8 +18,8 @@
     flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
 
     # Nixvim neovim distro for easier nixified configuration
-    nixvim = {
-      url = "github:nix-community/nixvim";
+    nvf = {
+      url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
@@ -46,65 +46,64 @@
     musnix.url = "github:musnix/musnix";
   };
 
-  outputs =
-    {
-      self,
-      nixpkgs-stable,
-      nixpkgs,
-      nixpkgs-master,
-      nur,
-      home-manager,
-      ...
-    }@inputs:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-	inherit system;
-	config = {allowUnfree = true;};
-	overlays = [
-	  overlay-stable
-          overlay-master
-	  nur.overlays.default
-	];
-      };
-      genericModules = [
-        {
-          nix.registry.nixos.flake = inputs.self;
-	  environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
-	  nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
-        }
+  outputs = {
+    self,
+    nixpkgs-stable,
+    nixpkgs,
+    nixpkgs-master,
+    nur,
+    home-manager,
+    ...
+  } @ inputs: let
+    system = "x86_64-linux";
+    pkgs = import nixpkgs {
+      inherit system;
+      config = {allowUnfree = true;};
+      overlays = [
+        overlay-stable
+        overlay-master
+        nur.overlays.default
       ];
-      genericHomeModule = [
-	{
-	  nix.registry.nixos.flake = inputs.self;
-	  home-manager.useGlobalPkgs = true;
-	  home-manager.useUserPackages = true;
-	}
-      ];
-      # Overlay definitions
-      # nixpkgs-unstable
-      overlay-stable = final: prev: {
-	stable = import nixpkgs-stable {
-	  inherit system;
-	  config.allowUnfree = true;
-	};
-      };
-      # nixpkgs-master
-      overlay-master = final: prev: {
-	master = import nixpkgs-master {
-	  inherit system;
-	  config.allowUnfree = true;
-	};
-      };
-    in
-    {
-      nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
+    };
+    genericModules = [
+      {
+        nix.registry.nixos.flake = inputs.self;
+        environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
+        nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"];
+      }
+    ];
+    genericHomeModule = [
+      {
+        nix.registry.nixos.flake = inputs.self;
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+      }
+    ];
+    # Overlay definitions
+    # nixpkgs-unstable
+    overlay-stable = final: prev: {
+      stable = import nixpkgs-stable {
         inherit system;
-	inherit pkgs;
-        specialArgs = {
-          inherit inputs;
-        };
-        modules = genericModules ++ [
+        config.allowUnfree = true;
+      };
+    };
+    # nixpkgs-master
+    overlay-master = final: prev: {
+      master = import nixpkgs-master {
+        inherit system;
+        config.allowUnfree = true;
+      };
+    };
+  in {
+    nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
+      inherit system;
+      inherit pkgs;
+      specialArgs = {
+        inherit inputs;
+      };
+      modules =
+        genericModules
+        ++ [
           # Import nixos modules here
           ./hosts/gabbielaptop/configuration.nix
           ./modules/nh.nix
@@ -114,36 +113,38 @@
           inputs.aagl.nixosModules.default
           inputs.lanzaboote.nixosModules.lanzaboote
           inputs.musnix.nixosModules.musnix
-#         inputs.stylix.nixosModules.stylix
-#	  inputs.home-manager.nixosModules.home-manager
-#	  inputs.nixvim.homeManagerModules.nixvim
-          { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
-#	  { home-manager.users.blue = ./home-manager/home.nix; }
+          #         inputs.stylix.nixosModules.stylix
+          #	        inputs.home-manager.nixosModules.home-manager
+          #	        inputs.nixvim.homeManagerModules.nixvim
+          {nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects
+          #     	  { home-manager.users.blue = ./home-manager/home.nix; }
         ];
-      };
-      nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
-        inherit system;
-	inherit pkgs;
-        modules = genericModules ++ [
+    };
+    nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
+      inherit system;
+      inherit pkgs;
+      modules =
+        genericModules
+        ++ [
           inputs.disko.nixosModules.disko
           inputs.satisfactory-server.nixosModules.satisfactory
           ./hosts/biggerpi/configuration.nix
           ./modules/satisfactory-server.nix
         ];
-      };
-
-      #  Standalone home-manager config
-      homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = {
-          inherit inputs;
-        };
-        # Import home-manager modules here
-        modules = [
-          ./home-manager/home.nix
-          inputs.nixvim.homeManagerModules.default
-          inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
-        ];
-      };
     };
+
+    #  Standalone home-manager config
+    homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
+      extraSpecialArgs = {
+        inherit inputs;
+      };
+      # Import home-manager modules here
+      modules = [
+        ./home-manager/home.nix
+        inputs.nvf.homeManagerModules.default
+        inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine
+      ];
+    };
+  };
 }