massive lsp evaluated rewrite

modules/shell/exercism.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }: {
   options.my.shell.exercism.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.exercism.enable {
-    users.users.jawz.packages = with pkgs; ([
+    users.users.jawz.packages = with pkgs; [
       exercism # learn to code
       bats # testing system, required by Exercism
-    ]);
+    ];
   };
 }

modules/shell/multimedia.nix

@@ -1,25 +1,23 @@
 { config, lib, pkgs, ... }: {
   options.my.shell.multimedia.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.multimedia.enable {
-    users.users.jawz.packages = with pkgs;
-      [
-        gallery-dl # similar to yt-dlp but for most image gallery websites
-        yt-dlp # downloads videos from most video websites
-        ffmpeg # not ffmpreg, the coolest video conversion tool!
-        imagemagick # photoshop what??
-      ] ++ (with pkgs.python3Packages;
-        [
-          (buildPythonApplication rec {
-            pname = "ffpb";
-            version = "0.4.1";
-            src = fetchPypi {
-              inherit pname version;
-              sha256 = "sha256-7eVqbLpMHS1sBw2vYS4cTtyVdnnknGtEI8190VlXflk=";
-            };
-            doCheck = false;
-            buildInputs = [ setuptools ];
-            propagatedBuildInputs = [ tqdm ];
-          })
-        ]);
+    users.users.jawz.packages = (with pkgs; [
+      gallery-dl # similar to yt-dlp but for most image gallery websites
+      yt-dlp # downloads videos from most video websites
+      ffmpeg # not ffmpreg, the coolest video conversion tool!
+      imagemagick # photoshop what??
+    ]) ++ [
+      (pkgs.python3Packages.buildPythonApplication rec {
+        pname = "ffpb";
+        version = "0.4.1";
+        src = pkgs.python3Packages.fetchPypi {
+          inherit pname version;
+          sha256 = "sha256-7eVqbLpMHS1sBw2vYS4cTtyVdnnknGtEI8190VlXflk=";
+        };
+        doCheck = false;
+        buildInputs = [ pkgs.python3Packages.setuptools ];
+        propagatedBuildInputs = [ pkgs.python3Packages.tqdm ];
+      })
+    ];
   };
 }

modules/shell/tools.nix

@@ -1,51 +1,53 @@
 { config, lib, pkgs, ... }: {
   options.my.shell.tools.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.tools.enable {
-    home-manager.users.jawz.programs = {
-      bash = {
-        initExtra = ''
-          if command -v fzf-share >/dev/null; then
-          source "$(fzf-share)/key-bindings.bash"
-          source "$(fzf-share)/completion.bash"
-          fi
-        '';
-        shellAliases = {
-          cd = "z";
-          hh = "hstr";
-          ls = "eza --icons --group-directories-first";
-          rm = "trash";
-          b = "bat";
-          f = "fzf --multi --exact -i";
-          unique-extensions = ''
-            fd -tf | rev | cut -d. -f1 | rev |
-            tr '[:upper:]' '[:lower:]' | sort |
-            uniq --count | sort -rn'';
+    home-manager.users.jawz = {
+      xdg.configFile."htop/htoprc".source = ../../dotfiles/htop/htoprc;
+      programs = {
+        hstr.enable = true;
+        htop = {
+          enable = true;
+          package = pkgs.htop-vim;
         };
-      };
-      xdg.configFile = { "htop/htoprc".source = ../dotfiles/htop/htoprc; };
-      hstr.enable = true;
-      htop = {
-        enable = true;
-        package = pkgs.htop-vim;
-      };
-      zoxide = {
-        enable = true;
-        enableBashIntegration = true;
-      };
-      bat = {
-        enable = true;
-        config = {
-          pager = "less -FR";
-          theme = "base16";
+        zoxide = {
+          enable = true;
+          enableBashIntegration = true;
+        };
+        bash = {
+          initExtra = ''
+            if command -v fzf-share >/dev/null; then
+            source "$(fzf-share)/key-bindings.bash"
+            source "$(fzf-share)/completion.bash"
+            fi
+          '';
+          shellAliases = {
+            cd = "z";
+            hh = "hstr";
+            ls = "eza --icons --group-directories-first";
+            rm = "trash";
+            b = "bat";
+            f = "fzf --multi --exact -i";
+            unique-extensions = ''
+              fd -tf | rev | cut -d. -f1 | rev |
+              tr '[:upper:]' '[:lower:]' | sort |
+              uniq --count | sort -rn'';
+          };
+        };
+        bat = {
+          enable = true;
+          config = {
+            pager = "less -FR";
+            theme = "base16";
+          };
+          extraPackages = with pkgs.bat-extras; [
+            batman # man pages
+            batpipe # piping
+            batgrep # ripgrep
+            batdiff # this is getting crazy!
+            batwatch # probably my next best friend
+            prettybat # trans your sourcecode!
+          ];
         };
-        extraPackages = with pkgs.bat-extras; [
-          batman # man pages
-          batpipe # piping
-          batgrep # ripgrep
-          batdiff # this is getting crazy!
-          batwatch # probably my next best friend
-          prettybat # trans your sourcecode!
-        ];
       };
     };
     programs = {