diff --git a/] b/] deleted file mode 100644 index 683e050..0000000 --- a/] +++ /dev/null @@ -1,88 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./data/secrets/secrets.nix - ../../common/services/ssh.nix - ../../common/services/tailscale.nix - ../../common/users.nix - ./services/acme.nix - ./services/coturn.nix - ./services/nginx.nix - ./services/restic.nix - ./services/synapse.nix - ./services/postgres.nix - #./services/mail.nix - #./services/containers.nix - #./services/redis.nix - ]; - - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/vda"; - boot.kernelPackages = pkgs.linuxPackages_5_10; - networking = { - hostName = "grondahl"; - useDHCP = false; - interfaces = { - "ens3" = { - ipv4.addresses = [ { - address = "107.189.30.157"; - prefixLength = 24; - } ]; - ipv6.addresses = [ { - address = "2605:6400:30:ef32::1"; - prefixLength = 48; - } ]; - }; - }; - defaultGateway = "107.189.30.1"; - defaultGateway6 = { - address = "2605:6400:30::1"; - interface = "ens3"; - }; - nameservers = [ "1.1.1.1" "1.0.0.1" "2606:4700:4700::1111" "2606:4700:4700::1001" ]; - }; - - time.timeZone = "Europe/Copenhagen"; - - security.sudo.wheelNeedsPassword = false; - - nix.settings = { - auto-optimise-store = true; - trusted-users = [ - "root" - "@wheel" - ]; - }; - - - - users.groups.acme.members = [ "nginx" "turnserver" ]; - users.groups.backup.members = [ "matrix-synapse" "postgres" ]; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - vim - wget - htop - iotop - dig - ]; - - networking.firewall = { - enable = true; - checkReversePaths = "loose"; - trustedInterfaces = [ "tailscale0" ]; - allowedUDPPorts = [ config.services.tailscale.port ]; - allowedTCPPorts = [ 22 80 443 ]; - allowedTCPPortRanges = [ { from = 3478; to = 3479; } { from = 5349; to = 5350; } ]; - allowedUDPPortRanges = [ { from = 3478; to = 3479; } { from = 5349; to = 5350; } { from = 49152; to = 49999; } ]; - }; - - system.stateVersion = "21.05"; - -} diff --git a/config/hosts/rudiger/services/nextcloud.nix b/config/hosts/rudiger/services/nextcloud.nix index b81b53e..07a1b93 100644 --- a/config/hosts/rudiger/services/nextcloud.nix +++ b/config/hosts/rudiger/services/nextcloud.nix @@ -4,7 +4,7 @@ enable = true; hostName = "cloud.graven.dev"; https = true; - package = pkgs.nextcloud24; + package = pkgs.nextcloud25; autoUpdateApps.enable = true; maxUploadSize = "10G"; webfinger = true; diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json index 098e2b1..0450f1e 100644 --- a/config/sources/nix/sources.json +++ b/config/sources/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "351d8bc316bf901a81885bab5f52687ec8ccab6e", - "sha256": "1yzhz7ihkh6p2sxhp3amqfbmm2yqzaadqqii1xijymvl8alw5rrr", + "rev": "689d0e5539eddd0b0f566aee7bb18629eee7df74", + "sha256": "1rld3lk42l6b01f2gcrhq8qm9vry1awmfl29zmpiqda9dy89vbx0", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/351d8bc316bf901a81885bab5f52687ec8ccab6e.tar.gz", + "url": "https://github.com/nmattia/niv/archive/689d0e5539eddd0b0f566aee7bb18629eee7df74.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-hardware": { @@ -17,22 +17,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0e6593630071440eb89cd97a52921497482b22c6", - "sha256": "01rnzb4qv53q7rf0vw2mxybryl5xgad26ww73fgsg2nihhhmmy9j", + "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", + "sha256": "0yz1xzwdq72avic7s6569i23xwbha75788jb57w08yspf6a478nd", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/0e6593630071440eb89cd97a52921497482b22c6.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/7bd6b87b3712e68007823e8dd5c37ee9b114fee3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "release-22.05", + "branch": "release-22.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b8ce46f34a9b3db1267f615463cd27548889ec2", - "sha256": "1minhg4q7vgbf69lf85blmamjxl1r7c1j26n7f80as9b0dn4aj7a", + "rev": "fc5b90fd72177d9bcf435b10c12bb943549748c6", + "sha256": "1nhfvc1d4dk4pp4i5f5ivjsnqkdq7kc1g1cpqmwjrmj5x8l4pf3q", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6b8ce46f34a9b3db1267f615463cd27548889ec2.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/fc5b90fd72177d9bcf435b10c12bb943549748c6.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "Infinisil", "repo": "nixus", - "rev": "329bf6bae94f54d5e4cac35253b1359f7b4f997a", - "sha256": "0g6k2r446a8vcqzab76qzvfw5k1kzk6i8m4032jmkdr1w5rhlg4b", + "rev": "16be55591873689dd9422143d3cc456b4bb97dfc", + "sha256": "0zfj4kr92bz0dajgqi3hy477jx58qr26qwdy1f76w5gk9y4kas4f", "type": "tarball", - "url": "https://github.com/Infinisil/nixus/archive/329bf6bae94f54d5e4cac35253b1359f7b4f997a.tar.gz", + "url": "https://github.com/Infinisil/nixus/archive/16be55591873689dd9422143d3cc456b4bb97dfc.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }