emelie/nix-deploy
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Wiki Activity

Upgrade nixpkgs to 24.05

Browse source
This commit is contained in:
Amanda Graven 2024-08-03 20:40:14 +02:00
parent aa404c2de6
commit b1ff58b3d9
Signed by: amanda
GPG key ID: F747582C5608F4CB
4 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -18,3 +18,10 @@ Deploy by running the generated executable.
```sh ```sh
$ ./result $ ./result
``` ```
## Switching nixpkgs branch
```sh
cd config/sources
niv modify nixpkgs -b nixos-xx.yy
```

7
config/hosts/rudiger/services/nextcloud.nix
View file

@ -4,7 +4,7 @@
enable = true; enable = true;
hostName = "cloud.graven.dev"; hostName = "cloud.graven.dev";
https = true; https = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud29;
autoUpdateApps.enable = true; autoUpdateApps.enable = true;
maxUploadSize = "10G"; maxUploadSize = "10G";
webfinger = true; webfinger = true;
@ -14,9 +14,12 @@
dbuser = "nextcloud"; dbuser = "nextcloud";
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
dbname = "nextcloud"; dbname = "nextcloud";
defaultPhoneRegion = "DK";
adminpassFile = builtins.toString config.secrets.files.nc_admin_pass.file; adminpassFile = builtins.toString config.secrets.files.nc_admin_pass.file;
adminuser = "root"; adminuser = "root";
}; };
settings = {
default_phone_region = "DK";
};
phpOptions."opcache.interned_strings_buffer" = "23";
}; };
} }

10
config/hosts/wind/services/synapse.nix
View file

@ -5,11 +5,6 @@
enable = true; enable = true;
withJemalloc = true; withJemalloc = true;
extraConfigFiles = [ config.secrets.files.synapse_extra_config.file ]; extraConfigFiles = [ config.secrets.files.synapse_extra_config.file ];
sliding-sync = {
enable = true;
settings.SYNCV3_SERVER = "https://graven.dev";
environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file;
};
settings = { settings = {
server_name = "graven.dev"; server_name = "graven.dev";
enable_registration = false; enable_registration = false;
@ -71,5 +66,10 @@
]; ];
}; };
}; };
services.matrix-sliding-sync = {
enable = true;
settings.SYNCV3_SERVER = "https://graven.dev";
environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file;
};
} }

20
config/sources/nix/sources.json
View file

@ -17,22 +17,22 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"sha256": "1v8lddagjyjy4xm9l103qbqplh13hblkf030yc9r8760d1wzdibv", "sha256": "0598kqgr03zk3i6bzqsphs7l2vav83901h2gs7i1fh1rqzicq4nv",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixos-hardware/archive/7b49d3967613d9aacac5b340ef158d493906ba79.tar.gz", "url": "https://github.com/NixOS/nixos-hardware/archive/14c333162ba53c02853add87a0000cbd7aa230c2.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
"branch": "nixos-23.11", "branch": "nixos-24.05",
"description": "Nix Packages collection", "description": "Nix Packages collection",
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
"sha256": "1j5vs24bgy2arl342lrh3znc1pdz68kcjp2rpgy3sccpd9sibqqn", "sha256": "06490pn22x9xl4chfx12iwdgx7nlbn14v8x05rnv2y1nancljisl",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/25cf937a30bf0801447f6bf544fc7486c6309234.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/05405724efa137a0b899cce5ab4dde463b4fd30b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixus": { "nixus": {
@ -41,10 +41,10 @@
"homepage": "", "homepage": "",
"owner": "Infinisil", "owner": "Infinisil",
"repo": "nixus", "repo": "nixus",
"rev": "9becb43c79661b3f407c2fdb90e2ae1bc64b8c95", "rev": "0aa59229988b741006743de6a64952bda85a3905",
"sha256": "1q34x4wsrd4g1h6vikrj1pqzv0gq2yr2kqiqvdy6bqr4pqffvdxj", "sha256": "129pvwr38vadwnd70mzp2lyavr7h1yh8jjk347lqqchsl4107zjb",
"type": "tarball", "type": "tarball",
"url": "https://github.com/Infinisil/nixus/archive/9becb43c79661b3f407c2fdb90e2ae1bc64b8c95.tar.gz", "url": "https://github.com/Infinisil/nixus/archive/0aa59229988b741006743de6a64952bda85a3905.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }