null2264/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Add nix-srisum and nix-srisum-unzip for recursive

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-11-10 11:51:45 +07:00
parent 213f3dd883
commit ad34feaa04
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
4 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/flake.lock generated
View file

@ -227,17 +227,17 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1731133565, "lastModified": 1730940508,
"narHash": "sha256-tCErjTdCUWK06LzkcvwUM+3pyrrmdf8e0VDBBTgqznE=", "narHash": "sha256-sXS72AYXN/V1Ehp82/46Rqjw5Q6ayCy28ku3980+LSM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11f65b4b0405cff5b54c813626bddcf5435d7ad2", "rev": "f39f1d2a8fe191e442ce641a6dc1320f6aa17d04",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f39f1d2a8fe191e442ce641a6dc1320f6aa17d04",
"type": "github" "type": "github"
} }
}, },

3
nix/flake.nix
View file

@ -37,7 +37,8 @@
}; };
inputs = { inputs = {
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.05"; # nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.05"; # FIXME: p11-kit failed to build
nixpkgs-stable.url = "github:NixOS/nixpkgs/f39f1d2a8fe191e442ce641a6dc1320f6aa17d04";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";

12
nix/lib/mkCommon.nix
View file

@ -8,7 +8,16 @@ let
py.dnspython py.dnspython
])); ]));
}; };
custom.inkscape = if pkgs.stdenv.isDarwin then pkgs.casks.inkscape else (pkgs.inkscape.override { python3 = custom.python; }); custom.inkscape =
if pkgs.stdenv.isDarwin then
pkgs.casks.inkscape
else
(pkgs.inkscape.override { python3 = custom.python; });
custom.fastfetch =
if pkgs.stdenv.isDarwin then
pkgs.fastfetch.override { imagemagick_light = pkgs.imagemagick; }
else
pkgs.fastfetch;
in { in {
inherit custom; inherit custom;
packages = [ packages = [
@ -17,6 +26,7 @@ in {
pkgs.zoxide pkgs.zoxide
pkgs.ruby pkgs.ruby
pkgs._7zz pkgs._7zz
custom.fastfetch
pkgs.enchive pkgs.enchive
(pkgs.pass.withExtensions (exts: [ exts.pass-otp ])) (pkgs.pass.withExtensions (exts: [ exts.pass-otp ]))

21
nix/systems/darwin/configuration.nix
View file

@ -2,6 +2,24 @@
let let
libFixup = import ../../lib/darwin/libFixup.nix; libFixup = import ../../lib/darwin/libFixup.nix;
nix-srisum = pkgs.writeShellScriptBin "nix-srisum" ''
nix-hash --to-sri --type sha256 $(nix-prefetch-url ''$1)
'';
nix-srisum-unzip = pkgs.writeShellScriptBin "nix-srisum-unzip" ''
FILES_TO_DOWNLOAD=($@)
mkdir -p /tmp/nix-srisum-unzip-files
for i in "''${FILES_TO_DOWNLOAD[@]}"; do
filename="''$(uuidgen):archive.zip"
wget -q -O /tmp/nix-srisum-unzip-files/$filename ''$i
dirname="$(uuidgen):extract"
mkdir -p /tmp/nix-srisum-unzip-files/$dirname
unzip -qq -d /tmp/nix-srisum-unzip-files/$dirname /tmp/nix-srisum-unzip-files/$filename
hash=$(nix-hash --to-sri --type sha256 $(nix-hash --type sha256 /tmp/nix-srisum-unzip-files/$dirname))
echo "''$hash - ''$i"
done
'';
in { in {
# I don't want to risk breaking my hackintosh setup in case Apple decided to # I don't want to risk breaking my hackintosh setup in case Apple decided to
# turn on auto install by default. # turn on auto install by default.
@ -19,7 +37,6 @@ in {
pkgs.eza pkgs.eza
pkgs.coreutils-full pkgs.coreutils-full
pkgs.rclone pkgs.rclone
pkgs.fastfetch
pkgs.casks.iterm2 pkgs.casks.iterm2
pkgs.nmap pkgs.nmap
pkgs.cargo pkgs.cargo
@ -28,6 +45,8 @@ in {
pkgs.undmg pkgs.undmg
pkgs.mkalias pkgs.mkalias
pkgs.jq pkgs.jq
nix-srisum
nix-srisum-unzip
# lan-mouse deps # lan-mouse deps
# FIXME: Find a better way to link <packages>/lib to /usr/local/opt/<lib>/lib # FIXME: Find a better way to link <packages>/lib to /usr/local/opt/<lib>/lib