massive lsp evaluated rewrite

modules/dev/docker.nix

@@ -1,8 +1,10 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.docker.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.docker.enable {
-    users.users.jawz.packages = (with pkgs; [ dockfmt ])
-      ++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs ]);
     environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
+    users.users.jawz.packages = with pkgs; [
+      dockfmt
+      nodePackages.dockerfile-language-server-nodejs
+    ];
   };
 }

modules/dev/haskell.nix

@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.haskell.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.haskell.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
       ghc # compiler
       haskell-language-server # lsp
-    ]);
+    ];
     environment.variables = {
       CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
       STACK_ROOT = "\${XDG_DATA_HOME}/stack";

modules/dev/javascript.nix

@@ -1,13 +1,12 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.javascript.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.javascript.enable {
-    home-manager.users.jawz.programs.xdg.configFile = {
-      "npm/npmrc".source = ../dotfiles/npm/npmrc;
+    home-manager.users.jawz.xdg.configFile = {
+      "npm/npmrc".source = ../../dotfiles/npm/npmrc;
       "configstore/update-notifier-npm-check.json".source =
-        ../dotfiles/npm/update-notifier-npm-check.json;
+        ../../dotfiles/npm/update-notifier-npm-check.json;
     };
-    users.users.jawz.packages = (with pkgs; [ nodejs ])
-      ++ (with pkgs.nodePackages; [ pnpm ]);
+    users.users.jawz.packages = with pkgs; [ nodejs nodePackages.pnpm ];
     environment.variables = {
       NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
       PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";

modules/dev/nix.nix

@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.nix.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.nix.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
       expect # keep color when nom'ing
       nix-output-monitor # autistic nix builds
       nixfmt-classic # linting
       nixfmt-rfc-style # linting
       cachix # why spend time compiling?
       nixd # language server
-    ]);
+    ];
   };
 }

modules/dev/python.nix

@@ -1,11 +1,13 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.python.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.python.enable {
-    home-manager.users.jawz.programs.xdg.configFile = {
-      "python/pythonrc".source = ../dotfiles/pythonrc;
+    home-manager.users.jawz.xdg.configFile = {
+      "python/pythonrc".source = ../../dotfiles/pythonrc;
     };
-    users.users.jawz.packages = (with pkgs; ([
+    environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
+    users.users.jawz.packages = with pkgs; [
       pipenv # python development workflow for humans
+      nodePackages.pyright # LSP
       (python3.withPackages (ps:
         with ps; [
           black # Python code formatter
@@ -19,10 +21,6 @@
           # poetry # dependency management made easy
           # pytest # framework for writing tests
         ]))
-    ])) ++ (with pkgs.nodePackages;
-      [
-        pyright # LSP
-      ]);
-    environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
+    ];
   };
 }

modules/dev/sh.nix

@@ -1,10 +1,11 @@
 { config, lib, pkgs, ... }: {
   options.my.dev.sh.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.sh.enable {
-    users.users.jawz.packages = (with pkgs; [
+    users.users.jawz.packages = with pkgs; [
       bashdb # autocomplete
       shellcheck # linting
       shfmt # a shell parser and formatter
-    ]) ++ (with pkgs.nodePackages; [ bash-language-server ]);
+      nodePackages.bash-language-server # LSP
+    ];
   };
 }