aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Revert to Nixpkgs per https://forum.aux.computer/t/on-the-future-of-our-nixpkgs-fork/529

Browse source
This commit is contained in:
Aires 2024-05-06 23:52:55 -04:00
parent ff53505cb5
commit f0ddde868d
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock
View file

@ -218,11 +218,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714868057, "lastModified": 1715038983,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=", "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314", "rev": "aaf759cd93d1946336247808e7551df714cfd332",
"revCount": 62, "revCount": 70,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -296,15 +296,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714930819, "lastModified": 1714906307,
"narHash": "sha256-A+XeHE/YbsDV5fEROEiQDLCnHojdSwkvK1iv6vdy1o8=", "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"owner": "auxolotl", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "39c77ffe3193820e988d9551e390295d181a09c1", "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "auxolotl", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"

2
flake.nix
View file

@ -5,7 +5,7 @@
inputs = { inputs = {
# Track base packages against unstable # Track base packages against unstable
nixpkgs.url = "github:auxolotl/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# Replace Nix with Lix: https://lix.systems/ # Replace Nix with Lix: https://lix.systems/
lix = { lix = {

4
modules/base/nix.nix
View file

@ -1,9 +1,5 @@
# Nix configuration # Nix configuration
{ pkgs, config, lib, inputs, ... }: { { pkgs, config, lib, inputs, ... }: {
# Disable local documentation
# This is a temporary workaround to get Auxolotl to build. See https://forum.aux.computer/t/rebuild-is-failing/497/30
documentation.nixos.enable = false;
nix = { nix = {
settings = { settings = {
# Enable Flakes # Enable Flakes