commit 6249b9920aabd295071fe7806c82930191db2d12
parent 6ed54d0d80e4d1ef70496d2a5004832244c29a7d
Author: Leah (ctucx) <leah@ctu.cx>
Date: Thu, 9 Jun 2022 21:18:27 +0200
parent 6ed54d0d80e4d1ef70496d2a5004832244c29a7d
Author: Leah (ctucx) <leah@ctu.cx>
Date: Thu, 9 Jun 2022 21:18:27 +0200
update to nixos 22.05
5 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/configurations/common.nix b/configurations/common.nix @@ -21,6 +21,7 @@ nix = { trustedUsers = [ "@wheel" ]; + extraOptions = "experimental-features = nix-command"; autoOptimiseStore = true; optimise = { automatic = true; @@ -66,8 +67,8 @@ }; security = { - acme.acceptTerms = true; - acme.email = "letsencrypt@ctu.cx"; + acme.acceptTerms = true; + acme.defaults.email = "letsencrypt@ctu.cx"; }; environment.systemPackages = with pkgs; [
diff --git a/configurations/gtk.nix b/configurations/gtk.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, home-manager, ... }: { - services.dbus.packages = with pkgs; [ gnome3.dconf ]; + services.dbus.packages = with pkgs; [ dconf ]; home-manager.users.leah = { gtk = {
diff --git a/configurations/services/gvfs.nix b/configurations/services/gvfs.nix @@ -7,7 +7,6 @@ mesonFlags = (old.mesonFlags or []) ++ [ "-Dafp=false" "-Dgphoto2=false" - "-Dblueray=false" ]; })).override { gnomeSupport = false;
diff --git a/machines/osterei/matrix-synapse.nix b/machines/osterei/matrix-synapse.nix @@ -30,28 +30,29 @@ in { }; matrix-synapse = { - enable = true; - withJemalloc = true; - server_name = "ctu.cx"; - no_tls = false; - public_baseurl = "https://matrix.ctu.cx/"; - max_upload_size = "100M"; - dynamic_thumbnails = true; - enable_registration = false; - registration_shared_secret = secrets.hosts.osterei.matrix.registration_shared_secret; - url_preview_enabled = true; - url_preview_ip_range_blacklist = ["127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "100.64.0.0/10" "169.254.0.0/16" "::1/128" "fe80::/64" "fc00::/7"]; - listeners = [{ - bind_address = "127.0.0.1"; - port = 8008; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { names = [ "client" ]; compress = true; } - { names = [ "federation" ]; compress = false; } - ]; - }]; + enable = true; + withJemalloc = true; + settings = { + server_name = "ctu.cx"; + public_baseurl = "https://matrix.ctu.cx/"; + max_upload_size = "100M"; + dynamic_thumbnails = true; + enable_registration = false; + registration_shared_secret = secrets.hosts.osterei.matrix.registration_shared_secret; + url_preview_enabled = true; + url_preview_ip_range_blacklist = ["127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "100.64.0.0/10" "169.254.0.0/16" "::1/128" "fe80::/64" "fc00::/7"]; + listeners = [{ + bind_addresses = [ "127.0.0.1" ]; + port = 8008; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ + { names = [ "client" ]; compress = true; } + { names = [ "federation" ]; compress = false; } + ]; + }]; + }; }; nginx = {
diff --git a/nix/sources.json b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "home-manager": { - "branch": "release-21.11", + "branch": "release-22.05", "description": "Manage a user environment using Nix [maintainer=@rycee] ", "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", - "sha256": "1fi27zabvqlyc2ggg7wr01j813gs46rswg1i897h9hqkbgqsjkny", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", + "sha256": "1bn5m4qlzxc5c264hwyy9n8f7m1pzc79fd0xh18n46wn0v8vx4jn", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/d93d56ab8c1c6aa575854a79b9d2f69d491db7d0.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "niv": { @@ -48,15 +48,15 @@ "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { - "branch": "release-21.11", + "branch": "release-22.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3", - "sha256": "1saxvyrcb976hhfbx8ybmgirk6ysfggjmm62cn3lvgkkl8nfgqap", + "rev": "41f240fe872329b53bbdc8c7687d633842394788", + "sha256": "1f1jzkh0zkhnj4hi9cwdsxqbdgwqxlxgx00805cs0yiicfr08rfx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc257c49c495b2d0d7d40c5753a452d0abc8adf3.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/41f240fe872329b53bbdc8c7687d633842394788.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgsUnstable": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", - "sha256": "1yzbc85m9vbhsfprljzjkkskh9sxchid9m28wkgwsckqnf47r911", + "rev": "43ecbe7840d155fa933ee8a500fb00dbbc651fc8", + "sha256": "1js0cbzy8xfp1wbshsaxjd45xzm3w8fvlf5z573fw4hrzajlkfgd", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/17b62c338f2a0862a58bb6951556beecd98ccda9.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/43ecbe7840d155fa933ee8a500fb00dbbc651fc8.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } }