nolan/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: nolan:c23fb20676d392b19c6001af65cddb894fefce39
Branches Tags
nolan:main
..
compare: nolan:9fdb77bf79bf34f4f859691e336e83547edf0877
Branches Tags
nolan:main

No commits in common. "c23fb20676d392b19c6001af65cddb894fefce39" and "9fdb77bf79bf34f4f859691e336e83547edf0877" have entirely different histories.
c23fb20676 ... 9fdb77bf79

3 changed files with 33 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -151,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752544374, "lastModified": 1749154018,
"narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1752048960, "lastModified": 1750083401,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1752480373, "lastModified": 1750134718,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1752436162, "lastModified": 1750133334,
"narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "rev": "36ab78dab7da2e4e27911007033713bab534187b",
"type": "github" "type": "github"
}, },
"original": { "original": {

36
hosts/hub/apps/nextcloud.nix
View file

@ -28,7 +28,7 @@
nextcloud = { nextcloud = {
enable = true; enable = true;
hostName = "nextcloud.thewordnerd.info"; hostName = "nextcloud.thewordnerd.info";
package = pkgs.nextcloud31; package = pkgs.nextcloud30;
configureRedis = true; configureRedis = true;
maxUploadSize = "16G"; maxUploadSize = "16G";
# autoUpdateApps.enable = true; # autoUpdateApps.enable = true;
@ -54,43 +54,27 @@
}; };
resolved.enable = true; resolved.enable = true;
}; };
# IMPORTANT: Nextcloud container startup workaround
# The nextcloud-setup service blocks container startup when it needs to perform upgrades,
# creating a circular dependency: the network can't be configured until the container is ready,
# but the container can't be ready without network access for the upgrade.
#
# To upgrade Nextcloud when changing major versions:
# 1. Uncomment the lines below to disable nextcloud-setup
# 2. Run: nixos-rebuild switch
# 3. Run: nixos-container run nextcloud -- nextcloud-occ upgrade
# 4. Run: nixos-container run nextcloud -- nextcloud-occ maintenance:mode --off
# 5. Comment out the lines below again
# 6. Run: nixos-rebuild switch
#
# systemd.services.nextcloud-setup = {
# enable = false;
# };
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
networking = { networking = {
firewall.allowedTCPPorts = [ 80 ]; firewall.allowedTCPPorts = [ 80 ];
useHostResolvConf = lib.mkForce false; useHostResolvConf = lib.mkForce false;
}; };
# virtualisation.docker.enable = true; virtualisation.docker.enable = true;
# users.users.nextcloud.extraGroups = [ "docker" ]; users.users.nextcloud.extraGroups = [ "docker" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
poppler_utils poppler_utils
# (pkgs.writeScriptBin "occ" '' (pkgs.writeScriptBin "occ" ''
# #!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
# exec nextcloud-occ "$@" exec nextcloud-occ "$@"
# '') '')
]; ];
programs.java.binfmt = true; programs.java.binfmt = true;
system.stateVersion = "24.11"; system.stateVersion = "24.11";
}; };
# https://discourse.nixos.org/t/podman-docker-in-nixos-container-ideally-in-unprivileged-one/22909/12 # https://discourse.nixos.org/t/podman-docker-in-nixos-container-ideally-in-unprivileged-one/22909/12
# additionalCapabilities = [ additionalCapabilities = [
# ''all" --system-call-filter="add_key keyctl bpf" --capability="all'' ''all" --system-call-filter="add_key keyctl bpf" --capability="all''
# ]; ];
bindMounts = { bindMounts = {
"/run/postgresql" = { "/run/postgresql" = {
hostPath = "/run/postgresql"; hostPath = "/run/postgresql";

17
hosts/hub/default.nix
View file

@ -37,12 +37,17 @@
./apps/open-webui.nix ./apps/open-webui.nix
]; ];
boot = { boot.loader.grub = {
loader = { enable = true;
efi.canTouchEfiVariables = true; zfsSupport = true;
systemd-boot.enable = true; efiSupport = true;
}; efiInstallAsRemovable = true;
supportedFilesystems = [ "zfs" ]; mirroredBoots = [
{
devices = [ "nodev" ];
path = "/boot";
}
];
}; };
networking = { networking = {