Move language files to top-level.

jrpotter/default.nix

@@ -1,36 +1,27 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
-  options.home.extraPythonPackages = lib.mkOption {
-    type = lib.types.listOf lib.types.string;
-    example = ''
-      [ debugpy mccabe ]
-    '';
-    description = lib.mdDoc ''
-      Extra Python packages that should be linked to the topmost Python
-      interpreter.
-    '';
-  };
-
   imports = [
     ./git.nix
+    ./lang/bash.nix
+    ./lang/c.nix
+    ./lang/elixir.nix
+    ./lang/lean.nix
+    ./lang/lua.nix
+    ./lang/nix.nix
+    ./lang/python.nix
+    ./lang/typescript.nix
     ./neovim
     ./wezterm
   ];
 
-  config = {
   home = {
     username = "jrpotter";
     homeDirectory = "/home/jrpotter";
-
     packages = with pkgs; [
       anki-bin
       bitwarden
-        elan
       firefox
-        gnumake
       mullvad-vpn
-        (python3.withPackages
-          (ps: builtins.map (s: ps.${s}) config.home.extraPythonPackages))
       unzip
       wezterm
       zotero
@@ -54,5 +45,4 @@
   # See the Home Manager release notes for a list of state
   # version changes in each release.
   home.stateVersion = "23.05";
-  };
 }

jrpotter/lang/c.nix

@@ -1,13 +1,17 @@
 { pkgs, ... }:
+let
+  codelldb = pkgs.writeShellScriptBin "codelldb" ''
+    #!/usr/bin/env bash
+    exec ${pkgs.vscode-extensions.vadimcn.vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/codelldb "$@"
+  '';
+in
 {
   home.packages = with pkgs; [
     bear
     clang
     clang-tools
-    (writeShellScriptBin "codelldb" ''
-      #!/usr/bin/env bash
-      exec ${vscode-extensions.vadimcn.vscode-lldb}/share/vscode/extensions/vadimcn.vscode-lldb/adapter/codelldb "$@"
-    '')
+    codelldb
+    gnumake
   ];
 
   programs.neovim = {

jrpotter/lang/lean.nix

@@ -1,9 +1,9 @@
 args @ { pkgs, ... }:
 let
-  utils = import ../utils.nix args;
+  neovimUtils = import ../neovim/utils.nix args;
 
   lean-nvim = {
-    plugin = utils.pluginGit
+    plugin = neovimUtils.pluginGit
       "47ff75ce2fcc319fe7d8e031bc42a75473919b93"
       "Julian/lean.nvim";
     config = ''
@@ -17,6 +17,10 @@ let
   };
 in
 {
+  home.packages = with pkgs; [
+    elan
+  ];
+
   programs.neovim = {
     plugins = [
       lean-nvim

jrpotter/lang/python.nix

@@ -1,12 +1,14 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  home.extraPythonPackages = [
-    "debugpy"
-    "mccabe"
-    "pycodestyle"
-    "pyflakes"
-    "python-lsp-server"
-    "python-lsp-black"
+  home.packages = with pkgs; [
+    (python3.withPackages (ps: with ps; [
+      debugpy
+      mccabe
+      pycodestyle
+      pyflakes
+      python-lsp-server
+      python-lsp-black
+    ]))
   ];
 
   programs.neovim = {

jrpotter/neovim/default.nix

@@ -68,27 +68,6 @@ in
     };
   };
 
-  # Notice that within our imports we use `home.packages` instead of
-  # `extraPackages`. The latter is preferable but comes with `$PATH`-related
-  # problems.
-  #
-  # Specifically, Home Manager appends paths specifed in `extraPackages` to the
-  # end of `$PATH` meaning any already defined instance of some package will be
-  # used instead. Prepending is not an option either since that would break
-  # environments like those produced by `direnv` or `nix-shell`.
-  #
-  # https://github.com/nix-community/home-manager/pull/1756
-  imports = [
-    ./lang/bash.nix
-    ./lang/c.nix
-    ./lang/elixir.nix
-    ./lang/lean.nix
-    ./lang/lua.nix
-    ./lang/nix.nix
-    ./lang/python.nix
-    ./lang/typescript.nix
-  ];
-
   config = {
     programs.neovim = {
       defaultEditor = true;