Flatten programming directory a bit

Remove python and lua directories, combine into default

Swap pylsp for pyright language server

system/home/programming/default.nix

@@ -1,10 +1,28 @@
 { pkgs, ... }:
 {
-  imports = [
+  home.packages =
-    ./python/default.nix
+    let
-    ./lua/default.nix
+      pythonEnv = (
-  ];
+        pkgs.python312.withPackages (
-  home.packages = with pkgs; [
+          ps: with ps; [
+            flake8
+            isort
+            numpy
+            scipy
+            xarray
+            netcdf4
+            matplotlib
+          ]
+        )
+      );
+      luaEnv = (pkgs.luajit.withPackages (ps: [ (ps.callPackage ./luarocks/scilua.nix { }) ]));
+    in
+    with pkgs;
+    [
+      ## Language Environments
+      pythonEnv
+      luaEnv
+
       ## Linters
       shellcheck
       yamllint
@@ -12,12 +30,16 @@
       ## Formatters
       nixfmt-rfc-style
       shfmt
+      ruff
+      stylua
       nodePackages.prettier
       nodePackages.prettier-plugin-toml
 
       ## Language servers
       nixd
+      pyright
+      lua-language-server
       rust-analyzer
-    nodePackages.typescript-language-server
     ];
+  xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml;
 }

system/home/programming/lua/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    (luajit.withPackages (ps: [ (ps.callPackage ./luarocks/scilua.nix { }) ]))
-    lua-language-server
-    stylua
-  ];
-}

system/home/programming/python/default.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-let
-  pythonEnv = (
-    pkgs.python312.withPackages (
-      ps: with ps; [
-        python-lsp-server
-        isort
-        flake8
-        mypy
-        numpy
-        scipy
-        xarray
-        netcdf4
-        matplotlib
-      ]
-    )
-  );
-in
-{
-  home.packages = [
-    pkgs.ruff
-    pythonEnv
-  ];
-  xdg.configFile."ruff/pyproject.toml".source = ./ruff.toml;
-}