all of my custom options are now held in an attribute set called movOpts

modules/sys/software/default.nix

@@ -12,7 +12,6 @@
     ++ [(import ./programs.nix)]
     ++ [(import ./services.nix)]
     ++ [(import ./nixvim)]
-    ++ [(import ./module-test.nix)]
     ++ [(import ./virtualization.nix)]
     ++ [(import ./gaming)];
 }

modules/sys/software/gaming/gaming_pkgs.nix

@@ -12,9 +12,9 @@ let
 in
 {
   options = {
-    gamingPkgs.enable = lib.mkEnableOption "enables gaming packages";
+    movOpts.gamingPkgs.enable = lib.mkEnableOption "enables gaming packages";
   };
-  config = lib.mkIf config.gamingPkgs.enable {
+  config = lib.mkIf config.movOpts.gamingPkgs.enable {
     environment.systemPackages = with pkgs; [
       snes9x-gtk
       cust-openrct2

modules/sys/software/gaming/steam.nix

@@ -1,8 +1,8 @@
 {lib, config, ...}: {
   options = {
-    steamConfig.enable = lib.mkEnableOption "enables steam configuration";
+    movOpts.steamConfig.enable = lib.mkEnableOption "enables steam configuration";
   };
-  config = lib.mkIf config.steamConfig.enable {
+  config = lib.mkIf config.movOpts.steamConfig.enable {
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;

modules/sys/software/module-test.nix

@@ -1,11 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-  options = {
-    testmodule.enable = lib.mkEnableOption "enables test module";
-  };
-  config = lib.mkIf config.testmodule.enable {
-    environment.systemPackages = with pkgs; [
-      hello
-    ];
-  };
-}

modules/sys/software/nixvim/default.nix

@@ -1,6 +1,8 @@
 {
   config,
   pkgs,
+  host,
+  self,
   ...
 }: {
   imports = [

modules/sys/software/nixvim/keymaps.nix

@@ -1,6 +1,16 @@
 {
   programs.nixvim = {
     keymaps = [
+      {
+        action = "<cmd>lua vim.lsp.buf.format()<CR>";
+        key = "!fmt";
+        mode = "n";
+      }
+      {
+        action = "<cmd>lua vim.diagnostic.open_float()<CR>";
+        key = "!df";
+        mode = "n";
+      }
       {
         action = "<C-W>W";
         key = "<S-Tab>";

modules/sys/software/nixvim/plugins/coq.nix

@@ -3,7 +3,7 @@
     plugins.coq-nvim = {
       enable = true;
       settings = {
-        auto_start = false;
+        auto_start = true;
       };
     };
   };

modules/sys/software/nixvim/plugins/default.nix

@@ -1,3 +1,5 @@
+{ host, self, ... }:
+
 {
   imports = [
     ./alpha.nix
@@ -6,7 +8,7 @@
     ./coq.nix
     ./barbar.nix
     ./cmp.nix
-    ./lsp.nix
+    ( import ./lsp.nix { inherit host self; })
     ./lualine.nix
     ./plugins.nix
     ./nvim-tree.nix

modules/sys/software/nixvim/plugins/lsp.nix

@@ -1,3 +1,7 @@
+{ host, ... }:
+let
+  flakePath = builtins.getEnv "FLAKEPATH";
+in
   {
     programs.nixvim = {
       plugins.lsp = {
@@ -11,7 +15,18 @@
           jsonls.enable = true;
           lua_ls.enable = true;
           marksman.enable = true;
-        nil_ls.enable = true;
+          nixd = {
+            enable = true;
+            settings = {
+              nixd = {
+                nixpkgs.expr = "import <nixpkgs> { }";
+                formatting.command = "nixfmt";
+                options = {
+                  nixos.expr = "(builtins.getFlake \"${flakePath}\").nixosConfigurations.${host}.options";
+                };
+              };
+            };
+          };
           pyright.enable = true;
           sqls.enable = true;
           hls = {

modules/sys/software/packages.nix

@@ -1,8 +1,8 @@
 {lib, config, pkgs, inputs, ... }: {
   options = {
-    sysPkgs.enable = lib.mkEnableOption "enables default system packages";
+    movOpts.sysPkgs.enable = lib.mkEnableOption "enables default system packages";
   };
-  config = lib.mkIf config.sysPkgs.enable {
+  config = lib.mkIf config.movOpts.sysPkgs.enable {
     environment.systemPackages = with pkgs; [
       alsa-lib
       alsa-utils
@@ -25,6 +25,7 @@
       nixos-option
       nix-search-cli
       nix-template
+      nixfmt
       sshfs
       nvd
       pamixer

modules/sys/software/programs.nix

@@ -1,8 +1,8 @@
 {lib, config, pkgs, ...}: {
   options = {
-    sysProgs.enable = lib.mkEnableOption "enables default system programs";
+    movOpts.sysProgs.enable = lib.mkEnableOption "enables default system programs";
   };
-  config = lib.mkIf config.sysProgs.enable {
+  config = lib.mkIf config.movOpts.sysProgs.enable {
     programs = {
       hyprland.enable = lib.mkDefault true;
       zsh.enable = lib.mkDefault true;

modules/sys/software/services.nix

@@ -1,8 +1,8 @@
 {lib, config, ...}: {
   options = {
-    sysServices.enable = lib.mkEnableOption "enables default system services";
+    movOpts.sysServices.enable = lib.mkEnableOption "enables default system services";
   };
-  config = lib.mkIf config.sysServices.enable {
+  config = lib.mkIf config.movOpts.sysServices.enable {
     services = {
       keyd = {
         enable = true;

modules/sys/software/virtualization.nix

@@ -1,8 +1,8 @@
 {lib, config, username, ...}: {
   options = {
-    virtConfig.enable = lib.mkEnableOption "enables virtualization";
+    movOpts.virtConfig.enable = lib.mkEnableOption "enables virtualization";
   };
-  config = lib.mkIf config.virtConfig.enable {
+  config = lib.mkIf config.movOpts.virtConfig.enable {
     virtualisation.libvirtd.enable = true;
     programs.virt-manager.enable = true;
   };