Move python and lua config into emacs directory

Change python lsp to use pyright, add lua-language-server
This commit is contained in:
Evie Litherland-Smith 2024-06-04 15:43:27 +01:00
parent db43e17270
commit 8b51847ac0
9 changed files with 8 additions and 4 deletions

View file

@ -14,8 +14,6 @@
../programs/firefox/default.nix ../programs/firefox/default.nix
../programs/cava/default.nix ../programs/cava/default.nix
../programs/obs/default.nix ../programs/obs/default.nix
../programs/python/default.nix
../programs/lua/default.nix
# Services # Services
../services/email/work.nix # TODO combine again at some point ../services/email/work.nix # TODO combine again at some point
../services/password-store/default.nix ../services/password-store/default.nix

View file

@ -3,6 +3,10 @@
fonts, fonts,
... ...
}: { }: {
imports = [
./python/default.nix
./lua/default.nix
];
programs.emacs = { programs.emacs = {
# Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
# git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.emacs.d
@ -153,5 +157,9 @@
isort isort
stylua stylua
nodePackages.prettier nodePackages.prettier
## Language servers
pyright
lua-language-server
]; ];
} }

View file

@ -4,11 +4,9 @@
"pypoetry/config.toml".source = ./pypoetry.toml; "pypoetry/config.toml".source = ./pypoetry.toml;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
poetry
(python3.withPackages (python3.withPackages
(ps: (ps:
with ps; [ with ps; [
python-lsp-server
mypy mypy
numpy numpy
scipy scipy