diff --git a/flake.lock b/flake.lock index d43ad0e..ba9b229 100644 --- a/flake.lock +++ b/flake.lock @@ -36,10 +36,138 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pydev": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix" + }, + "locked": { + "path": "./system/extras/pydev/", + "type": "path" + }, + "original": { + "path": "./system/extras/pydev/", + "type": "path" + }, + "parent": [] + }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "pydev", + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix", + "uv2nix": [ + "pydev", + "uv2nix" + ] + }, + "locked": { + "lastModified": 1756087852, + "narHash": "sha256-4jc3JDQt75fYXFrglgqyzF6C6zLU0QGLymzian4aP+U=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "6edb3ae27395cd88be3d64b732d1539957dad59c", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "pydev", + "pyproject-build-systems", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755886095, + "narHash": "sha256-oMQ1YERKqiac28LB1cKjl4d0gjvK98SbGejFMfK0WGE=", + "owner": "nix-community", + "repo": "pyproject.nix", + "rev": "7ea903d50c20d4d3ea45ccaad7ee0d21996780c9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_2": { + "inputs": { + "nixpkgs": [ + "pydev", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756395552, + "narHash": "sha256-5aJM14MpoLk2cdZAetu60OkLQrtFLWTICAyn1EP7ZpM=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "030dffc235dcf240d918c651c78dc5f158067b51", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "pydev": "pydev" + } + }, + "uv2nix": { + "inputs": { + "nixpkgs": [ + "pydev", + "nixpkgs" + ], + "pyproject-nix": [ + "pydev", + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1756466761, + "narHash": "sha256-ALXRHIMXQ4qVNfCbcWykC23MjMwUoHn9BreoBfqmq0Y=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "0529e6d8227517205afcd1b37eee3088db745730", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 8af9c00..0fa3add 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,13 @@ description = "Autumn's multi-system configs"; inputs = { - pydev.url ="./system/extras/pydev/flake.nix"; + pydev.url ="./system/extras/pydev/"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager }@inputs: + outputs = { self, nixpkgs, home-manager, pydev }@inputs: let system = "x86_64-linux"; diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix index f159b54..598ebc6 100644 --- a/home-manager/autumn/home.nix +++ b/home-manager/autumn/home.nix @@ -32,6 +32,7 @@ felix kdlfmt swaybg + uv ]; sessionVariables = { EDITOR = "helix"; diff --git a/system/extras/pydev/flake.lock b/system/extras/pydev/flake.lock new file mode 100644 index 0000000..361f49d --- /dev/null +++ b/system/extras/pydev/flake.lock @@ -0,0 +1,118 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix", + "uv2nix": [ + "uv2nix" + ] + }, + "locked": { + "lastModified": 1756087852, + "narHash": "sha256-4jc3JDQt75fYXFrglgqyzF6C6zLU0QGLymzian4aP+U=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "6edb3ae27395cd88be3d64b732d1539957dad59c", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "pyproject-build-systems", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755886095, + "narHash": "sha256-oMQ1YERKqiac28LB1cKjl4d0gjvK98SbGejFMfK0WGE=", + "owner": "nix-community", + "repo": "pyproject.nix", + "rev": "7ea903d50c20d4d3ea45ccaad7ee0d21996780c9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756395552, + "narHash": "sha256-5aJM14MpoLk2cdZAetu60OkLQrtFLWTICAyn1EP7ZpM=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "030dffc235dcf240d918c651c78dc5f158067b51", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix" + } + }, + "uv2nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "pyproject-nix": [ + "pyproject-nix" + ] + }, + "locked": { + "lastModified": 1756466761, + "narHash": "sha256-ALXRHIMXQ4qVNfCbcWykC23MjMwUoHn9BreoBfqmq0Y=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "0529e6d8227517205afcd1b37eee3088db745730", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/system/extras/pydev/flake.nix b/system/extras/pydev/flake.nix index e632c2c..13a2a89 100644 --- a/system/extras/pydev/flake.nix +++ b/system/extras/pydev/flake.nix @@ -8,13 +8,13 @@ }; uv2nix = { url = "github:pyproject-nix/uv2nix"; - inputs.pyproject-nix.folows = "pyproject-nix"; + inputs.pyproject-nix.follows = "pyproject-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; pyproject-build-systems = { url = "github:pyproject-nix/build-system-pkgs"; inputs.pyproject-nex.follows = "pyproject-nix"; - inputs.uv2nix.follow = "uv2nix"; + inputs.uv2nix.follows = "uv2nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -36,7 +36,7 @@ }; pyprojectOverrides = _final: _prev: {}; - pkgs = nixpkgs.legacyPackages.x86-64-linux; + pkgs = nixpkgs.legacyPackages.x86_64-linux; python = pkgs.python314; @@ -67,7 +67,7 @@ let editableOverlay = workspace.mkEditablePyprojectOverlay { root = "$REPO_ROOT"; - } + }; editablePythonSet = pythonSet.overrideScope ( lib.composeManyExtensions [ editableOverlay