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

Switch nixos-hardware back to upstream

Browse source
This commit is contained in:
Aires 2024-05-28 11:34:36 -04:00
parent 77cc01fdd7
commit c85cd1a0c8
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -218,11 +218,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716506851, "lastModified": 1716856858,
"narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=", "narHash": "sha256-dfNGs2AW/V31nMVeEBSUJCMfT6bZAKJ5qsWgFHWhvUc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d", "rev": "38f31ee7c1a60adae58833789dd855c128b056c6",
"revCount": 83, "revCount": 85,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -265,18 +265,18 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1716588418, "lastModified": 1716881121,
"narHash": "sha256-3EpFUFlZjE+UkBlSXp2lC65ysgUmpAHl13kjh45+et0=", "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=",
"ref": "master", "ref": "master",
"rev": "80736f76ded618a54dce2db319247aeb902ce795", "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf",
"revCount": 1683, "revCount": 1694,
"type": "git", "type": "git",
"url": "https://code.8bitbuddhism.com/aires/nixos-hardware" "url": "https://github.com/NixOS/nixos-hardware"
}, },
"original": { "original": {
"ref": "master", "ref": "master",
"type": "git", "type": "git",
"url": "https://code.8bitbuddhism.com/aires/nixos-hardware" "url": "https://github.com/NixOS/nixos-hardware"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -313,11 +313,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716542732, "lastModified": 1716793392,
"narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -25,7 +25,8 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1";
# Hardware configurations # Hardware configurations
nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master"; #nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master";
nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master";
# Home-manager # Home-manager
home-manager = { home-manager = {
@ -98,6 +99,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = defaultModules ++ [
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-intel
./hosts/Dimaga ./hosts/Dimaga
]; ];
}; };
@ -106,6 +108,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = defaultModules ++ [
nixos-hardware.nixosModules.common-cpu-amd-pstate nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-gpu-amd
./hosts/Haven ./hosts/Haven
]; ];
}; };

1
modules/services/forgejo.nix
View file

@ -72,6 +72,7 @@ in
labels = [ labels = [
"nix:docker://nixos/nix" # Shoutout to Icewind 1991 for this syntax: https://icewind.nl/entry/gitea-actions-nix/ "nix:docker://nixos/nix" # Shoutout to Icewind 1991 for this syntax: https://icewind.nl/entry/gitea-actions-nix/
"debian:docker://node:20-bullseye" "debian:docker://node:20-bullseye"
"ubuntu-latest:docker://ubuntu:latest"
]; ];
settings = { settings = {
# For an example of configuring in Nix: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix # For an example of configuring in Nix: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix