add my custom packages

This commit is contained in:
Callum Leslie 2024-09-10 20:51:16 +01:00
parent 2a0849b294
commit 49da33a9d3
Signed by: cleslie
GPG key ID: D382C4AFEECEAA90
4 changed files with 331 additions and 6 deletions

311
flake.lock generated
View file

@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"advisory-db": {
"flake": false,
"locked": {
"lastModified": 1725883717,
"narHash": "sha256-QifFNLfu5bzKPO4iznCj1h+nHhqGZ8NR2Lo7tzh9FRc=",
"owner": "rustsec",
"repo": "advisory-db",
"rev": "7fbf1e630ae52b7b364791a107b5bee5ff929496",
"type": "github"
},
"original": {
"owner": "rustsec",
"repo": "advisory-db",
"type": "github"
}
},
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": [], "darwin": [],
@ -168,6 +184,21 @@
} }
}, },
"crane": { "crane": {
"locked": {
"lastModified": 1725409566,
"narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
"owner": "ipetkov",
"repo": "crane",
"rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"omnix", "omnix",
@ -247,6 +278,29 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"nish",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1725437390,
"narHash": "sha256-W2ZnHE+FkPVap5Em6na4KP8XkhU8kpY07iX0d4+y4uM=",
"owner": "nix-community",
"repo": "fenix",
"rev": "29ad6b2023ccec4d4679244c233f0ea875cdf000",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "pull/163/head",
"repo": "fenix",
"type": "github"
}
},
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -332,6 +386,22 @@
} }
}, },
"flake-compat_5": { "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -347,7 +417,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_6": { "flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -445,6 +515,39 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-root": {
"locked": {
"lastModified": 1692742795,
"narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
"owner": "srid",
"repo": "flake-root",
"rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1719857163, "lastModified": 1719857163,
@ -833,16 +936,51 @@
"type": "github" "type": "github"
} }
}, },
"nish": {
"inputs": {
"advisory-db": "advisory-db",
"crane": "crane",
"fenix": "fenix",
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"unstable"
],
"pre-commit-hooks": [
"pre-commit-hooks"
],
"systems": [
"systems"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1726041657,
"narHash": "sha256-XYRmSQe3pOriVCXVPanYVJLSUbsRdyTLTTBhE8NNgcw=",
"owner": "callumio",
"repo": "nish",
"rev": "1c5a478ad499356e0c6a11eeba02fdd701ee43f1",
"type": "github"
},
"original": {
"owner": "callumio",
"repo": "nish",
"type": "github"
}
},
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_6",
"flake-parts": [ "flake-parts": [
"omnix", "omnix",
"flake-parts" "flake-parts"
], ],
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"libgit2": "libgit2", "libgit2": "libgit2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-regression": "nixpkgs-regression", "nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
@ -884,6 +1022,22 @@
"type": "github" "type": "github"
} }
}, },
"nix-visualize": {
"flake": false,
"locked": {
"lastModified": 1687577587,
"narHash": "sha256-Z1r8XHszoUnQinl63yXvQG6Czp5HnYNG37AY+EEiT4w=",
"owner": "craigmbooth",
"repo": "nix-visualize",
"rev": "cafaba50cd63ba9c759c56af71fd0d22fd60a548",
"type": "github"
},
"original": {
"owner": "craigmbooth",
"repo": "nix-visualize",
"type": "github"
}
},
"nixinate": { "nixinate": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -948,6 +1102,24 @@
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@ -997,6 +1169,22 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1717432640, "lastModified": 1717432640,
"narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
@ -1067,6 +1255,36 @@
"type": "github" "type": "github"
} }
}, },
"nsbm": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"unstable"
],
"sbomnix": "sbomnix",
"systems": [
"systems"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1725996481,
"narHash": "sha256-dDobRr906wky/lH4hKkKAEnxmrnUzOYL0IuuCPv7t6Y=",
"owner": "callumio",
"repo": "nsbm",
"rev": "6146544f3ca96c1d8d27711ee1278d1973031df8",
"type": "github"
},
"original": {
"owner": "callumio",
"repo": "nsbm",
"type": "github"
}
},
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -1212,20 +1430,39 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nish": "nish",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"nsbm": "nsbm",
"omnix": "omnix", "omnix": "omnix",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_4", "systems": "systems_4",
"treefmt-nix": "treefmt-nix_2", "treefmt-nix": "treefmt-nix_3",
"unstable": "unstable" "unstable": "unstable"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1725890120,
"narHash": "sha256-7bsWAKG/otbHj7wmCBrJ9P6ve2MFcoOlIh6wcx6ffKg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "e35227d186acd47d8e5f78cbd792d57ddf47d74b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-flake": { "rust-flake": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane_2",
"nixpkgs": [ "nixpkgs": [
"omnix", "omnix",
"nixpkgs" "nixpkgs"
@ -1263,6 +1500,30 @@
"type": "github" "type": "github"
} }
}, },
"sbomnix": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-parts": "flake-parts_5",
"flake-root": "flake-root",
"nix-visualize": "nix-visualize",
"nixpkgs": "nixpkgs_3",
"treefmt-nix": "treefmt-nix_2",
"vulnix": "vulnix"
},
"locked": {
"lastModified": 1724929558,
"narHash": "sha256-3CkgwrPws+7Z+mEJbq4f8SNo2b4hrta+vdCCGoNrpiU=",
"owner": "tiiuae",
"repo": "sbomnix",
"rev": "444ba45f30dad718e51b7043418cff5ef83583ea",
"type": "github"
},
"original": {
"owner": "tiiuae",
"repo": "sbomnix",
"type": "github"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
@ -1272,7 +1533,7 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
@ -1380,6 +1641,28 @@
} }
}, },
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nsbm",
"sbomnix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -1414,6 +1697,22 @@
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
},
"vulnix": {
"flake": false,
"locked": {
"lastModified": 1676379453,
"narHash": "sha256-KXvmnaMjv//zd4aSwu4qmbon1Iyzdod6CPms7LIxeVU=",
"owner": "henrirosten",
"repo": "vulnix",
"rev": "ad28b2924027a44a9b81493a0f9de1b0e8641005",
"type": "github"
},
"original": {
"owner": "henrirosten",
"repo": "vulnix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -159,5 +159,27 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
# my custom programs
nish = {
url = "github:callumio/nish";
inputs = {
nixpkgs.follows = "unstable";
flake-parts.follows = "flake-parts";
systems.follows = "systems";
treefmt-nix.follows = "treefmt-nix";
pre-commit-hooks.follows = "pre-commit-hooks";
};
};
nsbm = {
url = "github:callumio/nsbm";
inputs = {
nixpkgs.follows = "unstable";
treefmt-nix.follows = "treefmt-nix";
flake-parts.follows = "flake-parts";
systems.follows = "systems";
};
};
}; };
} }

View file

@ -36,6 +36,8 @@
killall killall
gcc gcc
pkg-config pkg-config
nish
nsbm
]; ];
environment = { environment = {

View file

@ -9,6 +9,8 @@
agenix = inputs'.agenix.packages.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 {};
nish = inputs'.nish.packages.default;
nsbm = inputs'.nsbm.packages.default;
jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override { jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
ffmpeg_6-full = pkgs.ffmpeg_6-full.override { ffmpeg_6-full = pkgs.ffmpeg_6-full.override {
withMfx = false; withMfx = false;