lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: compatibility with NixOS 22.05

Browse source
This commit is contained in:
Luke Granger-Brown 2021-12-07 19:13:04 +00:00
parent b9675abb90
commit 29f7073384
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ops/nixos/lib/common.nix
View file

@ -63,6 +63,7 @@ in
nix = { nix = {
nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/third_party/nixpkgs/" ]; nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/third_party/nixpkgs/" ];
package = pkgs.nix_2_3; # Use a working nix.
trustedUsers = [ "root" "@wheel" "deployer" ]; trustedUsers = [ "root" "@wheel" "deployer" ];
binaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ]; binaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ]; trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
@ -73,6 +74,8 @@ in
}; };
nixpkgs.config = depot.third_party.nixpkgsConfig; nixpkgs.config = depot.third_party.nixpkgsConfig;
documentation.nixos.enable = false; # I just use the website.
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
console.keyMap = "us"; console.keyMap = "us";

1
ops/nixos/porcorosso/default.nix
View file

@ -166,6 +166,7 @@ in {
services.xserver.displayManager.gdm = { services.xserver.displayManager.gdm = {
enable = true; enable = true;
wayland = false; wayland = false;
nvidiaWayland = false;
}; };
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;

2
ops/nixos/swann/default.nix
View file

@ -391,7 +391,7 @@ in {
protocol = "cloudflare"; protocol = "cloudflare";
domains = ["home.lukegb.com"]; domains = ["home.lukegb.com"];
zone = "lukegb.com"; zone = "lukegb.com";
password = secrets.cloudflareCredentials.token; passwordFile = pkgs.writeText "cloudflare-token" secrets.cloudflareCredentials.token;
use = "if"; use = "if";
extraConfig = '' extraConfig = ''
if=en-virginmedia if=en-virginmedia