diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7c11697..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/davids-dotfiles-private"] - path = vendor/davids-dotfiles-private - url = git@github.com:dszakallas/davids-dotfiles-private.git diff --git a/README.md b/README.md index dd682e0..cc30748 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ Structure: │   ├── nixos # reusable modules for nixOS │   ├── system # reusable modules for unix-like systems (nixOS, darwin, etc.) │   └── home # reusable modules for home manager -├── users # user configurations (can be shared across hosts) -└── vendor # vendored flake dependencies in git submodules +└── users # user configurations (can be shared across hosts) ``` Some configurations are not publicly shared, so you need to adjust the flake to your needs. diff --git a/flake.lock b/flake.lock index 4a36a92..fa1a9ce 100644 --- a/flake.lock +++ b/flake.lock @@ -7,20 +7,22 @@ "nixpkgs": [ "nixpkgs" ], - "poetry2nix": "poetry2nix" + "poetry2nix": [ + "poetry2nix" + ] }, "locked": { - "lastModified": 1734523316, - "narHash": "sha256-hEEIWZ18NS8ZXx6i9VmlGKIaY1biCEVLgc1F/r5OJiE=", - "ref": "refs/heads/main", - "rev": "4a357d90b3d4b525c7eee68f51502f259290126e", - "revCount": 47, - "type": "git", - "url": "file:vendor/davids-dotfiles-private" + "lastModified": 1734528465, + "narHash": "sha256-XBq+YI6GpRnohjzgOlaSh2OHQSB/RMKrDyIMs8Fre2s=", + "owner": "dszakallas", + "repo": "davids-dotfiles-private", + "rev": "ae7572e77b50f668f167d050d6b22a6ec62f2616", + "type": "github" }, "original": { - "type": "git", - "url": "file:vendor/davids-dotfiles-private" + "owner": "dszakallas", + "repo": "davids-dotfiles-private", + "type": "github" } }, "flake-utils": { @@ -28,11 +30,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -59,24 +61,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -85,11 +69,11 @@ ] }, "locked": { - "lastModified": 1729171802, - "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -105,11 +89,11 @@ ] }, "locked": { - "lastModified": 1729171802, - "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -141,38 +125,16 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "davids-dotfiles-private", "poetry2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -183,11 +145,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728979988, - "narHash": "sha256-GBJRnbFLDg0y7ridWJHAP4Nn7oss50/VNgqoXaf/RVk=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7881fbfd2e3ed1dfa315fca889b2cfd94be39337", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { @@ -197,39 +159,22 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1730642263, - "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ - "davids-dotfiles-private", "nixpkgs" ], "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729173771, - "narHash": "sha256-rT2Vz1kFSj+NKHetVY7PJUACX+qBETdnuPSklzFKCsc=", + "lastModified": 1731205797, + "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "e67cc181b5bdf5aa46f1340fa9acd3910f6fb122", + "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", "type": "github" }, "original": { @@ -238,34 +183,13 @@ "type": "github" } }, - "poetry2nix_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2", - "systems": "systems_5", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1730284601, - "narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e", - "type": "github" - }, - "original": { - "id": "poetry2nix", - "type": "indirect" - } - }, "root": { "inputs": { "davids-dotfiles-private": "davids-dotfiles-private", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix_2" + "poetry2nix": "poetry2nix" } }, "systems": { @@ -312,58 +236,7 @@ "type": "indirect" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "davids-dotfiles-private", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "poetry2nix", @@ -371,11 +244,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c85934..35745f7 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,11 @@ rec { nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - davids-dotfiles-private.url = "git+file:vendor/davids-dotfiles-private"; + poetry2nix.url = "github:nix-community/poetry2nix"; + poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; + davids-dotfiles-private.url = "github:dszakallas/davids-dotfiles-private"; davids-dotfiles-private.inputs.nixpkgs.follows = "nixpkgs"; + davids-dotfiles-private.inputs.poetry2nix.follows = "poetry2nix"; }; nixConfig = { diff --git a/vendor/davids-dotfiles-private b/vendor/davids-dotfiles-private deleted file mode 160000 index 4a357d9..0000000 --- a/vendor/davids-dotfiles-private +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a357d90b3d4b525c7eee68f51502f259290126e