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

chore(nix/nixpkgs): 24.05 -> 24.11

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2025-02-06 15:26:12 +07:00
parent 25cbec88a9
commit 6a92f88958
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
5 changed files with 43 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

85
nix/flake.lock generated
View file

@ -3,11 +3,11 @@
"brew-api": { "brew-api": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1738221534, "lastModified": 1738824458,
"narHash": "sha256-BjDXLV+Wfwzu1t5kiocX1/p1/CkCLf5DNCZJKjp+fMU=", "narHash": "sha256-4xeDtpgp42QDPqI4+hQGWX9dxkiWVEAsVOMVKbYD5io=",
"owner": "null2264", "owner": "null2264",
"repo": "brew-api", "repo": "brew-api",
"rev": "36c66514c5abba55f76882a69a706db291415d8b", "rev": "c069d969e5aaac32d6bc2989f961500aa0c6edc5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738223503, "lastModified": 1738806281,
"narHash": "sha256-lhAdz9m/zaMQB9fpaos4cwHqnr5S+ps3llEe2IgQhVE=", "narHash": "sha256-sBWyOVCQDqbouMbfzC/0IIDJKPKiHey6knLBolAu1MI=",
"owner": "null2264", "owner": "null2264",
"repo": "nixpkgs-firefox-darwin", "repo": "nixpkgs-firefox-darwin",
"rev": "44fa96f2084d5d1d8bd210fa639e9c1a8c3109bf", "rev": "8633d01e966e8e15f60937f3929b12ac3275a318",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,22 +73,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -186,21 +170,21 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-stable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1728791962, "lastModified": 1736373539,
"narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184",
"type": "github" "type": "github"
} }
}, },
@ -211,17 +195,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730698801, "lastModified": 1737421067,
"narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=", "narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0", "rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "LnL7",
"ref": "nix-darwin-24.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0",
"type": "github" "type": "github"
} }
}, },
@ -248,11 +232,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1738680400,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "rev": "799ba5bffed04ced7067a91798353d360788b30d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,17 +248,17 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730959824, "lastModified": 1738788816,
"narHash": "sha256-1hxkBxrroNZ6KM4xnFt8HIdQfzLswug2FOUfb84SfcE=", "narHash": "sha256-0RNNX7izll0vpuJ6+ej6IGfnCIvkOHGkZIw9uoBlVBY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3efbba06438ad7962122a725b316bc7c7a72981b", "rev": "b12d0c98b3eb7e358199c9887226d351264e013d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3efbba06438ad7962122a725b316bc7c7a72981b",
"type": "github" "type": "github"
} }
}, },
@ -296,17 +280,17 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1730272153, "lastModified": 1738824222,
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
"type": "github" "type": "github"
} }
}, },
@ -317,11 +301,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738214380, "lastModified": 1738825090,
"narHash": "sha256-Pl3KhEDxIoyWjeNHudGufRxxtlFpRa2xJirfWkAmhSg=", "narHash": "sha256-nUWPx3ipabOIjsIApx+teOR7M2lM2vfuUMqTxrwHfr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "426905c68424d40a05f96282dd515769e09745c3", "rev": "29fbc8ada53bb90b8d12ba77f3913eff4dde210c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,7 +316,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"system-manager", "system-manager",
@ -391,18 +375,17 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-stable"
], ],
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1738099675, "lastModified": 1738725875,
"narHash": "sha256-q1oixDeEvoKm8t7Fr6vEGnv4sb8vRXCa6rF6YWIbGmk=", "narHash": "sha256-KJeErSFeuVVo+EOgoZoAKAbh9jOxgd7g/ldgUjbHvOA=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "2f0cc0c110c25804cd2f6c167ab66f567941452c", "rev": "0be8bb03478dad374659369be3b2a5017c63fa61",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
nix/flake.nix
View file

@ -40,25 +40,24 @@
# FIXME: p11-kit failed to build. Probably due to them focusing on Linux for iteration 6. # FIXME: p11-kit failed to build. Probably due to them focusing on Linux for iteration 6.
# #
# REF: https://github.com/NixOS/nixpkgs/pull/352800 -> "Let's consider this one Linux-only." # REF: https://github.com/NixOS/nixpkgs/pull/352800 -> "Let's consider this one Linux-only."
# nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.05"; nixpkgs-stable.url = "github:NixOS/nixpkgs/release-24.11";
nixpkgs-stable.url = "github:NixOS/nixpkgs/3efbba06438ad7962122a725b316bc7c7a72981b"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
spicetify-nix = { spicetify-nix = {
url = "github:Gerg-L/spicetify-nix"; url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/64c6325b28ebd708653dd41d88f306023f296184"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs-unstable"; # we need unstable (24.11) for programs.floorp. FIXME: switch to stable once 24.11 become stable inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin/189d2d422c773fa065cc9c72e6806f007ebb9be0"; url = "github:LnL7/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
firefox-darwin = { firefox-darwin = {

7
nix/lib/mkCommon.nix
View file

@ -13,11 +13,6 @@ let
pkgs.casks.inkscape pkgs.casks.inkscape
else else
(pkgs.inkscape.override { python3 = custom.python; }); (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 = [
@ -26,7 +21,7 @@ in {
pkgs.zoxide pkgs.zoxide
pkgs.ruby pkgs.ruby
pkgs._7zz pkgs._7zz
custom.fastfetch pkgs.fastfetch
pkgs.enchive pkgs.enchive
(pkgs.pass.withExtensions (exts: [ exts.pass-otp ])) (pkgs.pass.withExtensions (exts: [ exts.pass-otp ]))

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

@ -126,7 +126,7 @@ in {
rm -rf "/Applications/Nix Apps" rm -rf "/Applications/Nix Apps"
mkdir -p "/Applications/Nix Apps" mkdir -p "/Applications/Nix Apps"
find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + | find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
while read src; do while read -r src; do
app_name=$(basename "$src") app_name=$(basename "$src")
echo "copying $src" >&2 echo "copying $src" >&2
${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name" ${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"

2
nix/users/ziro/darwin.nix
View file

@ -41,7 +41,7 @@
rm -rf "${config.home.homeDirectory}/Applications/Nix Home Manager Apps" rm -rf "${config.home.homeDirectory}/Applications/Nix Home Manager Apps"
mkdir -p "${config.home.homeDirectory}/Applications/Nix Home Manager Apps" mkdir -p "${config.home.homeDirectory}/Applications/Nix Home Manager Apps"
find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + | find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
while read src; do while read -r src; do
app_name=$(basename "$src") app_name=$(basename "$src")
echo "copying $src" >&2 echo "copying $src" >&2
${pkgs.mkalias}/bin/mkalias "$src" "${config.home.homeDirectory}/Applications/Nix Home Manager Apps/$app_name" ${pkgs.mkalias}/bin/mkalias "$src" "${config.home.homeDirectory}/Applications/Nix Home Manager Apps/$app_name"