From b3326b16a930586d4b1c9af6c3426d4b144404bf Mon Sep 17 00:00:00 2001
From: Johannes Rothe <mail@johannes-rothe.de>
Date: Sun, 29 Sep 2024 22:55:55 +0200
Subject: [PATCH] Move more packages to home-manager

---
 configuration.nix         | 13 -------------
 home/terminal/default.nix | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 943e513..afdd494 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -100,7 +100,6 @@
     ack
     avrdude
     bind
-    black  # code formatting
     calibre
     cmake
     cryptsetup
@@ -122,14 +121,9 @@
     gnucash
     gnumake
     gnupg
-    go
     google-cloud-sdk
-    gopls
-    gotools
-    htop
     inkscape
     ispell
-    jq
     keychain
     libreoffice
     mosquitto
@@ -139,14 +133,7 @@
     pavucontrol
     portfolio
     pulseaudio
-    pylint
-    python311
-    python311Packages.flake8
-    python311Packages.ipython
-    rusti-cal
     signal-desktop
-    silver-searcher
-    shellcheck
     spotify
     sqlite
     syncthing
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index fa7ad63..ceda8b6 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -2,7 +2,20 @@
 
 {
   home.packages = with pkgs; [
+    black
+    go
+    gopls
+    gotools
+    htop
+    jq
+    pylint
+    python311
+    python311Packages.flake8
+    python311Packages.ipython
+    rusti-cal
     roboto-mono
+    silver-searcher
+    shellcheck
     (nerdfonts.override { fonts = [ "RobotoMono" ]; })
   ];
   fonts.fontconfig.enable = true;
@@ -15,6 +28,7 @@
       exec sway
     end
     '';
+    # TODO make mails configurable
     # disable greeting
     shellInit = ''
     set fish_greeting
@@ -102,6 +116,7 @@
     enable = true;
     defaultEditor = true;
     # List of supported plugins: nix-env -f '<nixpkgs>' -qaP -A vimPlugins
+    # TODO Black plugin missing
     plugins = [
       pkgs.vimPlugins.ale
       pkgs.vimPlugins.gitgutter
@@ -156,6 +171,10 @@
       autocmd FileType go nnoremap gd <Plug>(go-def)
     augroup end
 
+    " Ale
+  let g:ale_linters = {'python': ['flake8', 'mypy'],'javascript': ['eslint']}
+  let g:ale_fixers = {'python': ['black', 'isort']}
+  let g:ale_python_pylint_options = '--disable=C0111,C0114'
 
     " YouCompleteMe
     let g:ycm_gopls_binary_path = "${pkgs.gopls}/bin/gopls"
@@ -176,6 +195,10 @@
     if exists("g:loaded_webdevicons")
       call webdevicons#refresh()
     endif
+
+    " terraform
+    let g:terraform_fmt_on_save = 1
+    let g:terraform_align = 1
     '';
   };