fixed build, nixvim standalone works awesomely

nixvim standalone is now *properly* being integrated into home manager.
combinePlugins is also working ( nixvim was injecting treesitter stuff
that broke nix grammar )

the signalis plymouth theme was just moved from main/hosts/hyprdash to
refactor/packages

still working towards parity with main but it's getting much closer

flake.nix

@@ -2,7 +2,6 @@
   description = "nyadiia's systems configuration";
 
   inputs = {
-
     # nixpkgs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
@@ -46,6 +45,8 @@
       url = "https://github.com/nyadiia.keys";
       flake = false;
     };
+
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
@@ -55,6 +56,8 @@
       nixpkgs-small,
       nixos-hardware,
       hyprland,
+      flake-utils,
+      nixvim,
       ...
     }:
     let
@@ -109,24 +112,15 @@
                 users.${username}.imports = [
                   hmConfig
                   inputs.nix-index-database.hmModules.nix-index
+                  inputs.nixvim.homeManagerModules.nixvim
                 ] ++ hm-modules;
                 extraSpecialArgs = specialArgs;
               };
             }
           ] ++ modules;
         };
     in
-    # nixvimModule = {
-    #   inherit pkgs;
-    #   module = import ./packages/nixvim; # import the module directly
-    #   # You can use `extraSpecialArgs` to pass additional arguments to your module files
-    #   extraSpecialArgs = {
-    #     # inherit (inputs) foo;
-    #   };
-    # };
     {
-      # packages.x86_64-linux.nvim = nixvim.legacyPackages.x86_64-linux.makeNixvimWithModule nixvimModule;
-
       nixosConfigurations = {
         hyprdash = mkSystem {
           name = "hyprdash";
@@ -137,10 +131,35 @@
           ];
           hm-modules = [
             inputs.ironbar.homeManagerModules.default
-            inputs.nix-index-database.hmModules.nix-index
-            inputs.ironbar.homeManagerModules.default
           ];
         };
       };
-    };
+    }
+    // flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        };
+        nixvimPkgs = nixvim.legacyPackages."${system}";
+        nixvimLib = nixvim.lib."${system}";
+        nvim = nixvimPkgs.makeNixvimWithModule {
+          inherit pkgs;
+          module = import ./packages/nixvim;
+        };
+      in
+      {
+        checks = {
+          nvim = nixvimLib.check.mkTestDerivationFromNvim {
+            inherit nvim;
+            name = "nadiavim configuration";
+          };
+        };
+        packages = {
+          inherit nvim;
+        };
+        formatter = pkgs.nixfmt-rfc-style;
+      }
+    );
 }

hm/common.nix

@@ -1,17 +1,6 @@
 { pkgs, small, ... }:
 {
-  imports = [ ./shell ];
-
-  home = {
-    username = "nyadiia";
-    homeDirectory = "/home/nyadiia";
-  };
-
   programs = {
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
     git = {
       enable = true;
       package = pkgs.gitAndTools.gitFull;

hm/hyprdash.nix

@@ -1,8 +1,68 @@
+{ pkgs, small, ... }:
 {
   imports = [
     ./shell
     ./wm
     ./vscode.nix
     ./firefox.nix
+    ./nvim.nix
+  ];
+
+  programs = {
+    gpg.enable = true;
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
+
+  home.packages = with pkgs; [
+    # cargo
+    # rustc
+    vlc
+    zathura
+    brave
+    libreoffice-fresh
+    # neovim
+    yubioath-flutter
+    small.proton-pass
+    anki
+    imv
+    mpv
+    nil
+    obsidian
+    spotify
+    nixpkgs-fmt
+    vesktop
+    tigervnc
+    prismlauncher
+    playerctl
+    tofi
+    wl-clipboard
+    libnotify
+    pavucontrol
+    libqalculate
+    qalculate-gtk
+    file-roller
+    grimblast
+    ffmpeg
+    signal-desktop
+    hyprlock
+    rustup
+    glib
+
+    (octaveFull.withPackages (
+      opkgs: with opkgs; [
+        symbolic
+        io
+        ocl
+        linear-algebra
+        matgeom
+        general
+        audio
+        control
+      ]
+    ))
   ];
 }

hm/laptop.nix

@@ -14,24 +14,6 @@
     ./xcompose.nix
   ];
 
-  home.sessionVariables = {
-    XDG_SESSION_DESKTOP = "Hyprland";
-    XDG_CURRENT_DESKTOP = "Hyprland";
-
-    NIXOS_OZONE_WL = "1";
-    ELECTRON_OZONE_PLATFORM_HINT = "wayland";
-    XDG_SESSION_TYPE = "wayland";
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    QT_QPA_PLATFORM = "wayland;xcb";
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    GDK_BACKEND = "wayland";
-    GDK_SCALE = "2";
-    CLUTTER_BACKEND = "wayland";
-    SDL_VIDEODRIVER = "wayland";
-    ANKI_WAYLAND = "1";
-  };
-
   programs = {
     gpg.enable = true;
   };

hm/nvim.nix

@@ -1,42 +1,10 @@
 { pkgs, ... }:
 let
-  module = import ../packages/nixvim/nixvim.nix;
+  module = import ../packages/nixvim { inherit pkgs; };
 in
 {
-  programs.nixvim = {
+  programs.nixvim = module // {
     enable = true;
     defaultEditor = true;
-
-    extraPackages = with pkgs; [
-      nixfmt-rfc-style
-      typstyle
-    ];
-
-    plugins.treesitter.settings.grammarPackages = [ pkgs.tree-sitter-grammars.tree-sitter-nu ];
-
-    colorscheme = "gruvbox-material";
-    extraPlugins = with pkgs.vimPlugins; [
-      gruvbox-material-nvim
-      quick-scope
-    ];
-    extraConfigLuaPre = ''
-      require('gruvbox-material').setup({
-      	italics = true,             -- enable italics in general
-      	contrast = "hard",        -- set contrast, can be any of "hard", "medium", "soft"
-      	comments = {
-      	  italics = true,           -- enable italic comments
-      	},
-      	background = {
-      	  transparent = true,      -- set the background to transparent
-      	},
-      	float = {
-      	  force_background = false, -- force background on floats even when background.transparent is set
-      	  background_color = nil,   -- set color for float backgrounds. If nil, uses the default color set
-      	},
-      	signs = {
-      	  highlight = true,         -- whether to highlight signs
-      	},
-      }) 
-    '';
-  } // module;
+  };
 }

hm/shell/default.nix

@@ -54,7 +54,7 @@
     };
     eza = {
       enable = true;
-      icons = true;
+      icons = "auto";
     };
     gh.enable = true;
   };

hm/wm/default.nix

@@ -10,4 +10,22 @@
     ./hyprlock.nix
     ./hyprpaper.nix
   ];
+
+  home.sessionVariables = {
+    XDG_SESSION_DESKTOP = "Hyprland";
+    XDG_CURRENT_DESKTOP = "Hyprland";
+
+    NIXOS_OZONE_WL = "1";
+    ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+    XDG_SESSION_TYPE = "wayland";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+    QT_QPA_PLATFORM = "wayland;xcb";
+    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    GDK_BACKEND = "wayland";
+    GDK_SCALE = "2";
+    CLUTTER_BACKEND = "wayland";
+    SDL_VIDEODRIVER = "wayland";
+    ANKI_WAYLAND = "1";
+  };
 }