diff --git a/flake.lock b/flake.lock index 6db56fa7..1a484314 100644 --- a/flake.lock +++ b/flake.lock @@ -382,11 +382,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1722734012, - "narHash": "sha256-9yiXIH5R7erAQ4ftWD9EqR4UtkVvBlFY/NNsZkrMOxQ=", + "lastModified": 1722789291, + "narHash": "sha256-lBeKlTzzzxqShRIP+ApY6bKJNFxk0VKuDPVLjE5WM5g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6fde03b3ee64491a75508af63fcec76c5abda5af", + "rev": "79723dbb2ad738817e2a1a52d2954def4bb1f004", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -444,11 +444,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722651103, + "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", "type": "github" }, "original": { @@ -489,12 +489,10 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1722640603, - "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", - "type": "github" + "lastModified": 0, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "path": "/nix/store/0ma1jl6szmcx4pr9vsczrn7vw7f85b08-source", + "type": "path" }, "original": { "id": "nixpkgs", @@ -517,12 +515,10 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1722640603, - "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", - "type": "github" + "lastModified": 0, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "path": "/nix/store/0ma1jl6szmcx4pr9vsczrn7vw7f85b08-source", + "type": "path" }, "original": { "id": "nixpkgs", @@ -637,11 +633,11 @@ }, "unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix index f72f0681..584359c7 100644 --- a/hosts/pc/configuration.nix +++ b/hosts/pc/configuration.nix @@ -36,7 +36,7 @@ with lib.my; games.enable = true; mihoyo.enable = true; }; - dev.lang.ides = [ "go" "fork" ]; + dev.lang.ides = [ "go" "fork" "python" ]; hardware = rec { grub.enableMultiBoot = true; sound.enable = true; diff --git a/modules/dev/ide.nix b/modules/dev/ide.nix index 043c2dbd..85f158f6 100644 --- a/modules/dev/ide.nix +++ b/modules/dev/ide.nix @@ -11,13 +11,16 @@ let let mkExtraConfig = ide: mkMerge [ { - home-manager.users.wittano.home.packages = [ ide.package ]; + home-manager.users.wittano.home.packages = mkIf (ide ? package) [ ide.package ]; } (ide.extraConfig or { }) ]; in addProjectDirField (with unstable.jetbrains; rec { - python.package = pycharm-professional; + python = let forkConfig = mkExtraConfig fork; in { + package = pycharm-professional; + extraConfig = forkConfig; + }; cpp.package = clion; zig = cpp; go.package = goland;