Merge branch 'nixos' into nixos-work

modules/programs/python.nix

@@ -7,19 +7,35 @@
 with lib;
 let
   cfg = config.my.programs.python;
+
+  mkPython = packages: version: pkgs.${version}.withPackages (ps: map (flip getAttr ps) packages);
+
+  pythonVersions = [
+    "python311"
+    "python310"
+    "python39"
+    "python38"
+  ];
+
+  packageLists = map (version: attrNames pkgs."${version}Packages") cfg.versions;
+
+  commonPackages = foldl' intersectLists (head packageLists) (tail packageLists);
 in
 {
   options.my.programs.python = {
     enable = mkEnableOption "python";
     versions = mkOption {
       default = [ "python310" ];
-      type = with types; listOf str;
+      type = with types; nonEmptyListOf (enum pythonVersions);
       example = [ "python39" ];
-      apply = builtins.map (version: pkgs.${version}.withPackages (packages: with packages; [ black pyflakes isort nose pytest python-lsp-server ]));
+    };
+    packages = mkOption {
+      default = [ "isort" "pytest" "flake8" "python-lsp-server" ];
+      type = with types; listOf (enum commonPackages);
     };
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.moritz.home.packages = cfg.versions;
+    users.users.moritz.packages = map (mkPython cfg.packages) cfg.versions;
   };
 }

modules/virtualisation/virtualisation.nix

@@ -20,7 +20,7 @@ in
   config = mkIf cfg.enable {
     virtualisation.libvirtd = {
       enable = true;
-      package = pkgs.stable.libvirt;
+      package = pkgs.libvirt;
     };
     home-manager.users.moritz.home.packages = with pkgs; [ virt-manager ];
     users.users.moritz.extraGroups = [ "libvirtd" ];