diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 257af11..0588d7e 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -78,6 +78,7 @@ with lib; { hub.enable = true; kitty.enable = true; ledger.enable = true; + python.enable = true; rofi.enable = true; spotify.enable = true; thunar.enable = true; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 2b440a8..bdc63b1 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -21,6 +21,7 @@ ./kakoune.nix ./kitty.nix ./ledger + ./python.nix ./rofi ./spotify.nix ./sway.nix diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 817ad73..1a2a7d1 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -80,7 +80,6 @@ in # python nodePackages.pyright - python-dev # sh nodePackages.bash-language-server diff --git a/modules/programs/python.nix b/modules/programs/python.nix new file mode 100644 index 0000000..d8268df --- /dev/null +++ b/modules/programs/python.nix @@ -0,0 +1,25 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.python; +in +{ + options.my.programs.python = { + enable = mkEnableOption "python"; + versions = mkOption { + default = [ "python310" ]; + type = with types; listOf str; + example = [ "python39" ]; + apply = versions: builtins.map (version: prev.${version}.withPackages (packages: with packages; [ black pyflakes isort nose pytest python-lsp-server ])); + }; + }; + + config = mkIf cfg.enable { + home-manager.user.moritz.home.packages = cfg.versions; + }; +} diff --git a/overlays/default.nix b/overlays/default.nix index b587cb5..5f8d1a9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,5 @@ { inputs }: final: prev: { inherit (inputs.comma.packages."${prev.system}") comma; - - python-dev = import ./python.nix final prev; nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; agenix = inputs.agenix.defaultPackage."${prev.system}"; master = import inputs.master { diff --git a/overlays/python.nix b/overlays/python.nix deleted file mode 100644 index 0746c84..0000000 --- a/overlays/python.nix +++ /dev/null @@ -1,3 +0,0 @@ -final: prev: -prev.python310.withPackages - (packages: with packages; [ black pyflakes isort nose pytest python-lsp-server ])