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 = {
+    nvf = {
-      url = "github:nix-community/nixvim";
+      url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
@@ -46,8 +46,7 @@
     musnix.url = "github:musnix/musnix";
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs-stable,
     nixpkgs,
@@ -55,8 +54,7 @@
     nur,
     home-manager,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
@@ -71,7 +69,7 @@
       {
         nix.registry.nixos.flake = inputs.self;
         environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
-	  nix.nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
+        nix.nixPath = ["nixpkgs=${nixpkgs.outPath}"];
       }
     ];
     genericHomeModule = [
@@ -96,15 +94,16 @@
         config.allowUnfree = true;
       };
     };
-    in
+  in {
-    {
     nixosConfigurations.gabbielaptop = nixpkgs.lib.nixosSystem {
       inherit system;
       inherit pkgs;
       specialArgs = {
         inherit inputs;
       };
-        modules = genericModules ++ [
+      modules =
+        genericModules
+        ++ [
           # Import nixos modules here
           ./hosts/gabbielaptop/configuration.nix
           ./modules/nh.nix
@@ -114,17 +113,19 @@
           inputs.aagl.nixosModules.default
           inputs.lanzaboote.nixosModules.lanzaboote
           inputs.musnix.nixosModules.musnix
-#         inputs.stylix.nixosModules.stylix
+          #         inputs.stylix.nixosModules.stylix
-#	  inputs.home-manager.nixosModules.home-manager
+          #	        inputs.home-manager.nixosModules.home-manager
-#	  inputs.nixvim.homeManagerModules.nixvim
+          #	        inputs.nixvim.homeManagerModules.nixvim
-          { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
+          {nix.settings = inputs.aagl.nixConfig;} # Setup cachix for aagl projects
-#	  { home-manager.users.blue = ./home-manager/home.nix; }
+          #     	  { home-manager.users.blue = ./home-manager/home.nix; }
         ];
     };
     nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
       inherit system;
       inherit pkgs;
-        modules = genericModules ++ [
+      modules =
+        genericModules
+        ++ [
           inputs.disko.nixosModules.disko
           inputs.satisfactory-server.nixosModules.satisfactory
           ./hosts/biggerpi/configuration.nix
@@ -141,7 +142,7 @@
       # Import home-manager modules here
       modules = [
         ./home-manager/home.nix
-          inputs.nixvim.homeManagerModules.default
+        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
       ];
     };

home-manager/home.nix

@@ -4,9 +4,7 @@
   lib,
   inputs,
   ...
-}:
+}: {
-
-{
   home.username = "blue";
   home.homeDirectory = "/home/blue";
 
@@ -14,12 +12,10 @@
     ./hyprland.nix
     ./waybar.nix
     ./swaync.nix
-#   ./flatpak.nix
-#   ./sober.nix
     ./hyprlock.nix
     ./zsh.nix
     ./eza.nix
-    ./nixvim.nix
+    ./nvf.nix
     ./nextcloud.nix
     ./git.nix
     ./stylix.nix

home-manager/nvf.nix

@@ -0,0 +1,44 @@
+{config, ...}: {
+  programs.nvf = {
+    enable = true;
+    settings = {
+      vim = {
+        theme = {
+          enable = true;
+          name = "base16";
+        };
+        viAlias = true;
+        vimAlias = true;
+        lsp = {
+          enable = true;
+        };
+        languages = {
+          rust.enable = true;
+          nix.enable = true;
+          markdown.enable = true;
+          java.enable = true;
+        };
+      };
+    };
+  };
+  # Pulls stylix base16 colours into nvf for use in the vim theme.
+  # This works for colours generated from the wallpaper, colours set manually and colours pulled from a base16Scheme yaml file.
+  programs.nvf.settings.vim.theme.base16-colors = {
+    base00 = "${config.lib.stylix.colors.base00}";
+    base01 = "${config.lib.stylix.colors.base01}";
+    base02 = "${config.lib.stylix.colors.base02}";
+    base03 = "${config.lib.stylix.colors.base03}";
+    base04 = "${config.lib.stylix.colors.base04}";
+    base05 = "${config.lib.stylix.colors.base05}";
+    base06 = "${config.lib.stylix.colors.base06}";
+    base07 = "${config.lib.stylix.colors.base07}";
+    base08 = "${config.lib.stylix.colors.base08}";
+    base09 = "${config.lib.stylix.colors.base09}";
+    base0A = "${config.lib.stylix.colors.base0A}";
+    base0B = "${config.lib.stylix.colors.base0B}";
+    base0C = "${config.lib.stylix.colors.base0C}";
+    base0D = "${config.lib.stylix.colors.base0D}";
+    base0E = "${config.lib.stylix.colors.base0E}";
+    base0F = "${config.lib.stylix.colors.base0F}";
+  };
+}