chore: switch to upstream disko again, PR is merged

This commit is contained in:
oddlama 2023-04-29 23:03:43 +02:00
parent a90a8ee678
commit f62b01f206
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
3 changed files with 7 additions and 9 deletions

View file

@ -23,7 +23,7 @@ This is my personal nix config.
- `ward/` - ODROID H3, energy efficient SBC. Used as a firewall betwenn my ISP and internal home network. Hosts some lightweight services using full KVM virtual machines. - `ward/` - ODROID H3, energy efficient SBC. Used as a firewall betwenn my ISP and internal home network. Hosts some lightweight services using full KVM virtual machines.
- `envoy/` - Hetzner Cloud server. Primarily used as my mailserver and VPN provider. - `envoy/` - Hetzner Cloud server. Primarily used as my mailserver and VPN provider.
- `zackbiene/` - ODROID N2+. Hosts IoT and Home Automation stuff and fully isolates that stuff from my internal network. - `zackbiene/` - ODROID N2+. Hosts IoT and Home Automation stuff and fully isolates that stuff from my internal network.
- not yet ready for publicized: my main development machine, the powerful home server, some services ... (still in transition from gentoo :/) - not yet ready to be publicized: my main development machine, the powerful home server, some services ... (still in transition from gentoo :/)
- `modules/` additional NixOS modules that are not yet upstreamed. - `modules/` additional NixOS modules that are not yet upstreamed.
- `nix/` library functions and plumbing - `nix/` library functions and plumbing
- `apps/` Additional runnable actions for this flake - `apps/` Additional runnable actions for this flake

10
flake.lock generated
View file

@ -116,15 +116,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682795657, "lastModified": 1682802069,
"narHash": "sha256-tLZV918KDU8GrucWqliAwO87mqWJhIrvaF17LU51UjE=", "narHash": "sha256-hctikxnF3AvHckQqzNa/4YLHbNNrdC733VsTZPWeyTo=",
"owner": "oddlama", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3a952244d422ea0e25b0e53c1fe2798605a59434", "rev": "c917cb9cdb621f3b60a7ccc77729cab52250da81",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "oddlama", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"type": "github" "type": "github"
} }

View file

@ -9,9 +9,7 @@
}; };
disko = { disko = {
# TODO temporary until reimport PR merged url = "github:nix-community/disko";
#url = "github:nix-community/disko";
url = "github:oddlama/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };