From eb7e6c3b13fd008fef850a8cfafc5ab67837744d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 26 Apr 2024 13:50:35 +0100
Subject: [PATCH] Remove ruff, issues with flymake integration

Use flake8 for python flymake linting (along with mypy of course)

Add fortls FORTRAN language server to default installed packages as well
---
 home/emacs/default.nix |  1 -
 home/prog/default.nix  | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 96ff6a5a..608b158a 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -81,7 +81,6 @@
         treesit-auto
         flymake-popon
         flymake-collection
-        flymake-ruff
         flymake-eslint
         flymake-shellcheck
         apheleia
diff --git a/home/prog/default.nix b/home/prog/default.nix
index c7d71da7..1aa8a857 100644
--- a/home/prog/default.nix
+++ b/home/prog/default.nix
@@ -15,18 +15,14 @@
     shellcheck
     nodePackages.prettier
 
-    # Lua
-    (luajit.withPackages
-      (ps: [(ps.callPackage ./luarocks/scilua.nix {})]))
-    luarocks-nix
-    lua-language-server
-    stylua
-
     # Python
     (python3.withPackages
-      (ps: with ps; [python-lsp-server pylsp-rope mypy]))
+      (ps: with ps; [python-lsp-server flake8 mypy]))
+    black
     isort
-    ruff
+
+    # FORTRAN
+    fortls
 
     # JavaScript / TypeScript
     nodejs