cleslie/nixfiles
1
0
Fork 0
mirror of https://github.com/callumio/nixfiles.git synced 2025-12-17 03:29:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use custom nixinate and remove ${system} references

Browse source
This commit is contained in:
Callum Leslie 2024-09-06 20:50:05 +01:00
parent abf3edb061
commit 9b4606d05f
Signed by: cleslie
GPG key ID: D382C4AFEECEAA90
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -256,11 +256,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1725467431, "lastModified": 1725628712,
"narHash": "sha256-eQLdO69XeRTLbUE00Zy2B1vOfclvo0+MPjMoyRQ2nbU=", "narHash": "sha256-0MVA1HCOxNjSYqzPZiFyPqJVi0wTbwSHsWzuy/bcubs=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "7386e62c38ffe9669431ec2addcb0f591b66a62f", "rev": "a312b75b0168b891d84af5c1766257b03cddbee7",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -891,11 +891,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724970318, "lastModified": 1725650864,
"narHash": "sha256-LGsZmI5LcyjAcjiKU/LztUf2206OWGR5O03OAEzhP4Y=", "narHash": "sha256-+Vd9SZlyET951VVK64Z7uiiAd5P4pMaHUVYL3wEWAC8=",
"owner": "callumio", "owner": "callumio",
"repo": "nixinate", "repo": "nixinate",
"rev": "8bcfff29a6ae466100c64bec22cb7d8215eaa3a5", "rev": "b68598c21f0720788fa2e26adf46f805725d141e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1401,11 +1401,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1725432240,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -48,13 +48,11 @@
config, config,
pkgs, pkgs,
final, final,
system,
inputs', inputs',
#self',
... ...
}: { }: {
_module.args.pkgs = inputs'.nixpkgs.legacyPackages.extend self.overlays.default; _module.args.pkgs = inputs'.nixpkgs.legacyPackages.extend self.overlays.default;
overlayAttrs = config.packages // {unstable = inputs.unstable.legacyPackages.${system};}; overlayAttrs = config.packages // {unstable = inputs'.unstable.legacyPackages;};
pre-commit = { pre-commit = {
check.enable = false; check.enable = false;
@ -74,12 +72,12 @@
packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix]; packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix];
}; };
apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs.nixinate.nixinate.${system} self).nixinate; apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self);
packages = { packages = {
om = inputs.omnix.packages.${system}.default; om = inputs'.omnix.packages.default;
nixvim = inputs.nixvim.packages.${system}.default; nixvim = inputs'.nixvim.packages.default;
agenix = inputs.agenix.packages.${system}.default; agenix = inputs'.agenix.packages.default;
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
devour-flake = pkgs.callPackage inputs.devour-flake {}; devour-flake = pkgs.callPackage inputs.devour-flake {};
jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override { jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
@ -90,6 +88,8 @@
}; };
}; };
}; };
debug = false;
}; };
inputs = { inputs = {