diff --git a/flake.lock b/flake.lock index 304a564..7b23fbd 100644 --- a/flake.lock +++ b/flake.lock @@ -52,6 +52,25 @@ "type": "github" } }, + "davinci": { + "inputs": { + "nixpkgs": "nixpkgs", + "nixpkgs-pinned": "nixpkgs-pinned" + }, + "locked": { + "lastModified": 1782405315, + "narHash": "sha256-pZKG7KOr1NPtWwzfEnRZvAi7Uvndd4LiC0OVHjf5IPE=", + "ref": "refs/heads/main", + "rev": "c9859df9bd3781c63d838a1a90d22129885a910b", + "revCount": 5, + "type": "git", + "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci" + }, + "original": { + "type": "git", + "url": "https://git.voidarc.co.uk/voidarc/nixos.davinci" + } + }, "flake-compat": { "flake": false, "locked": { @@ -407,7 +426,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" @@ -620,16 +639,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782467914, - "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", + "lastModified": 1782233679, + "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "rev": "667d5cf1c59585031d743c78b394b0a647537c35", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -679,55 +698,23 @@ "type": "github" } }, + "nixpkgs-pinned": { + "locked": { + "lastModified": 1772567409, + "narHash": "sha256-qspxGige37s/66q9sptyG5VA/l2IOmMMZVJ4Xhta2wU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4ec59bc1152b09a4843702e4a49381194f065a2", + "type": "github" + } + }, "nixpkgs_2": { - "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1783148766, - "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1782467914, "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", @@ -743,7 +730,71 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1782175435, + "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1783148766, + "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_6": { + "locked": { + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -759,7 +810,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1783224372, "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", @@ -775,7 +826,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -793,7 +844,7 @@ }, "nvim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "wrappers": "wrappers_2" }, "locked": { @@ -883,11 +934,12 @@ }, "root": { "inputs": { + "davinci": "davinci", "flake-parts": "flake-parts", "gotify-desktop": "gotify-desktop", "hyprland": "hyprland", "import-tree": "import-tree", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim": "nvim", "otter-launcher": "otter-launcher_2", "sls-steam": "sls-steam", @@ -896,7 +948,7 @@ }, "sls-steam": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1783322884, @@ -1023,7 +1075,7 @@ "woomer": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_4" }, "locked": { @@ -1042,7 +1094,7 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1782375095, @@ -1060,7 +1112,7 @@ }, "wrappers_2": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1782135443, @@ -1078,7 +1130,7 @@ }, "wrappers_3": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1782135443, diff --git a/flake.nix b/flake.nix index 08a56e1..5ce755c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; sls-steam.url = "github:AceSLS/SLSsteam"; + davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci"; # Flake parts flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/features/davinci/default.nix b/modules/features/davinci/default.nix new file mode 100644 index 0000000..706a27f --- /dev/null +++ b/modules/features/davinci/default.nix @@ -0,0 +1,14 @@ +{ + moduleWithSystem, + self, + ... +}: { + flake.nixosModules.davinci = moduleWithSystem ({self', ...}: { + environment.systemPackages = with self'.packages; [ + davinci-resolve + ]; + }); + perSystem = {inputs', ...}: { + packages.davinci-resolve = inputs'.davinci.packages.default; + }; +}