zuckerberg/nix-config
zuckerberg/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Activity

Update nixpkgs
All checks were successful
Check Flake / check-flake (push) Successful in 53s
Details

Browse Source
This commit is contained in:
Zuckerberg 2024-03-16 11:30:31 -06:00
parent 99904d0066
commit efe50be604
6 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitea/workflows/check-flake.yaml
View File

@ -15,10 +15,5 @@ jobs:
with:
fetch-depth: 0
- run: |
pwd
ls -lah .
whoami
- name: Check Flake
run: nix flake check --show-trace
run: nix flake check --print-build-logs --log-format raw --show-trace

7
Makefile
View File

@ -1,15 +1,22 @@
# Lockfile utils
.PHONY: update-lockfile
update-lockfile:
nix flake update --commit-lock-file
.PHONY: update-lockfile-without-commit
update-lockfile-without-commit:
nix flake update
# Agenix utils
.PHONY: edit-secret
edit-secret:
cd secrets && agenix -e $(filter-out $@,$(MAKECMDGOALS))
.PHONY: rekey-secrets
rekey-secrets:
cd secrets && agenix -r
# NixOS utils
.PHONY: clean-old-nixos-profiles
clean-old-nixos-profiles:
doas nix-collect-garbage -d

1
common/flakes.nix
View File

@ -10,7 +10,6 @@ in
config = mkIf cfg.enable {
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';

1
common/pc/default.nix
View File

@ -57,7 +57,6 @@ in
# For Nix IDE
nixpkgs-fmt
rnix-lsp
];
# Networking

56
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1703433843,
"narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm",
"repo": "agenix",
"rev": "417caa847f9383e111d1397039c9d4337d024bf0",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github"
},
"original": {
@ -96,11 +96,11 @@
]
},
"locked": {
"lastModified": 1704875591,
"narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
"lastModified": 1708091384,
"narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
"rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
"type": "github"
},
"original": {
@ -109,18 +109,6 @@
"type": "github"
}
},
"fix-nvidia-x11-latest": {
"flake": false,
"locked": {
"narHash": "sha256-fLopADeWElHn3zRLJxyRZf2pjXsPQL4K1NaZ9Dmaj3E=",
"type": "file",
"url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
},
"original": {
"type": "file",
"url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -142,11 +130,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -183,11 +171,11 @@
]
},
"locked": {
"lastModified": 1707016097,
"narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=",
"lastModified": 1710120787,
"narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "3e3dad2808379c522138e2e8b0eb73500721a237",
"rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
"type": "github"
},
"original": {
@ -198,11 +186,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1706826059,
"narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
"lastModified": 1710420202,
"narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
"rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
"type": "github"
},
"original": {
@ -227,6 +215,18 @@
"type": "indirect"
}
},
"nixpkgs-xone-fix": {
"flake": false,
"locked": {
"narHash": "sha256-nP+aGV0wrdRcOSlxlr2XaUczHeAHtLVpn2pefn5nhQE=",
"type": "file",
"url": "https://github.com/NixOS/nixpkgs/pull/296470.diff"
},
"original": {
"type": "file",
"url": "https://github.com/NixOS/nixpkgs/pull/296470.diff"
}
},
"radio": {
"inputs": {
"flake-utils": [
@ -273,10 +273,10 @@
"agenix": "agenix",
"dailybuild_modules": "dailybuild_modules",
"deploy-rs": "deploy-rs",
"fix-nvidia-x11-latest": "fix-nvidia-x11-latest",
"flake-utils": "flake-utils",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs-xone-fix": "nixpkgs-xone-fix",
"radio": "radio",
"radio-web": "radio-web",
"simple-nixos-mailserver": "simple-nixos-mailserver"

7
flake.nix
View File

@ -33,9 +33,8 @@
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# https://github.com/NixOS/nixpkgs/issues/286313
fix-nvidia-x11-latest.url = "https://github.com/NixOS/nixpkgs/pull/286084.diff";
fix-nvidia-x11-latest.flake = false;
nixpkgs-xone-fix.url = "https://github.com/NixOS/nixpkgs/pull/296470.diff";
nixpkgs-xone-fix.flake = false;
};
outputs = { self, nixpkgs, ... }@inputs:
@ -83,7 +82,7 @@
src = nixpkgs;
patches = [
./patches/gamepadui.patch
inputs.fix-nvidia-x11-latest
inputs.nixpkgs-xone-fix
];
};
patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });