diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el index 31eb790..22b4ba1 100644 --- a/flakes/emacs/config/init.el +++ b/flakes/emacs/config/init.el @@ -18,10 +18,14 @@ (use-package apheleia :config - (add-to-list 'apheleia-formatters - '(nixpkgs-fmt . ("nixpkgs-fmt"))) - (add-to-list 'apheleia-mode-alist - '(nix-mode . nixpkgs-fmt))) + (setf (alist-get 'nixpkgs-fmt apheleia-formatters) + '("nixpkgs-fmt")) + (setf (alist-get 'python-mode apheleia-mode-alist) + '(ruff-isort ruff)) + (setf (alist-get 'python-ts-mode apheleia-mode-alist) + '(ruff-isort ruff)) + (setf (alist-get 'nix-mode apheleia-mode-alist) + 'nixpkgs-fmt)) (use-package autorevert :config @@ -166,6 +170,7 @@ (js-ts-mode . eglot-ensure) (json-mode . eglot-ensure) (json-ts-mode . eglot-ensure) + (python-base-mode . eglot-ensure) (typescript-ts-mode . eglot-ensure) (typescript-mode . eglot-ensure) (nix-mode . eglot-ensure) diff --git a/module/home-manager.nix b/module/home-manager.nix index e0451ae..f1fb0fe 100644 --- a/module/home-manager.nix +++ b/module/home-manager.nix @@ -41,14 +41,6 @@ nodePackages.vscode-json-languageserver noto-fonts pass - python312Packages.flake8 - python312Packages.isort - python312Packages.rope - python312Packages.pyflakes - python312Packages.python-lsp-server - python312Packages.pyls-isort - python312Packages.python-lsp-black - python312Packages.pylsp-rope ripgrep tree typescript