diff options
| -rw-r--r-- | flake.lock | 50 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hosts/dishwasher/configuration.nix | 26 | ||||
| -rw-r--r-- | hosts/dishwasher/hardware-configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/dishwasher/mcvm-network.nix | 2 | ||||
| -rw-r--r-- | microvms/nextcloud/default.nix | 3 |
6 files changed, 49 insertions, 38 deletions
@@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1669443859, - "narHash": "sha256-LwFb2WmvGE+gwI2DBNNjNB/9xbrvXlfTMsVsrFaxB5U=", + "lastModified": 1671171782, + "narHash": "sha256-G7FNiYVl/jOkvNEhLO8O7uq0MuhFLKGMsCxFjqATVc0=", "owner": "nix-community", "repo": "fenix", - "rev": "684adee4d90fdd48994fd52a6ce145f89411173f", + "rev": "d3eaf97d81161bea9177cc80e07d26ba2d96569f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1669306943, - "narHash": "sha256-F6xVWFJkcCXp5IcnpRlECT10H2ps8RO1yM4W0OXiXPs=", + "lastModified": 1670897870, + "narHash": "sha256-nWLU48WlhVYm53cTUEDX8mZwZqdzObO6299hrCmdYcU=", "owner": "astro", "repo": "microvm.nix", - "rev": "c21a70fe1ac05ccdfceff6506625e9d44cd91da5", + "rev": "b12b4d426e1050479e9d571c81cda2b7ae0256da", "type": "github" }, "original": { @@ -74,43 +74,43 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669378442, - "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", + "lastModified": 1671122953, + "narHash": "sha256-SVWmiyX2wx6BAxo4zMfRqDgFoWf4d3Vx1MgG/Vo4jL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", + "rev": "0152de25d49dc16883b65f3e29cfea8d32f68956", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-22_05": { + "nixpkgs-stable": { "locked": { - "lastModified": 1668908668, - "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", + "lastModified": 1670146390, + "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", + "rev": "86370507cb20c905800527539fc049a2bf09c667", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1669320964, - "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", + "lastModified": 1671108576, + "narHash": "sha256-6ggOL6KoaELNA1562tnPjtAnQ9SwsKRTgeuaXvPzCwI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", + "rev": "0f5996b524c91677891a432cc99c7567c7c402b1", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1669415612, - "narHash": "sha256-LLsbCxUf36eyF3R8ulN0eqKj6ixfaLdBtetR8TdUAOo=", + "lastModified": 1671029659, + "narHash": "sha256-2sqAgHcLWpNGVHG2LQIXgRMuqgCArOD9frQSrrXrwSA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d2281f0367ba85c34ee9bce07d3cca40e1424721", + "rev": "95671d53ea3063da5316784af9ef69c71219f320", "type": "github" }, "original": { @@ -152,14 +152,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1668915833, - "narHash": "sha256-7VYPiDJZdGct8Nl3kKhg580XZfoRcViO+zUGPkfBsqM=", + "lastModified": 1670149631, + "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f72e050c3ef148b1131a0d2df55385c045e4166b", + "rev": "da98a111623101c64474a14983d83dad8f09f93d", "type": "github" }, "original": { @@ -2,7 +2,7 @@ inputs = { nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable; - nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; flake-utils.url = github:numtide/flake-utils; @@ -57,7 +57,7 @@ ./hosts/microwave ./modules/basic-tools.nix ./modules/binary-caches.nix - ./modules/chromium.nix + # ./modules/chromium.nix ./modules/devtools.nix ./modules/gnupg.nix ./modules/sway.nix diff --git a/hosts/dishwasher/configuration.nix b/hosts/dishwasher/configuration.nix index 0556748..5b4a138 100644 --- a/hosts/dishwasher/configuration.nix +++ b/hosts/dishwasher/configuration.nix @@ -21,6 +21,7 @@ hostName = "dishwasher"; # Define your hostname. useNetworkd = true; firewall.enable = true; + wireless.iwd.enable = true; }; time.timeZone = "Europe/Amsterdam"; @@ -35,15 +36,22 @@ Name = "enp1s0"; }; networkConfig = { - DHCP = "yes"; - LinkLocalAddressing = "ipv6"; - IPv6AcceptRA = "yes"; - }; - dhcpV6Config = { - WithoutRA = "solicit"; + # DHCP = "yes"; + # LinkLocalAddressing = "ipv6"; + # IPv6AcceptRA = "yes"; + Address = "10.1.1.50/24"; }; - ipv6AcceptRAConfig = { - DHCPv6Client = "yes"; + # dhcpV6Config = { + # WithoutRA = "solicit"; + # }; + # ipv6AcceptRAConfig = { + # DHCPv6Client = "yes"; + # }; + }; + networks."aer" = { + matchConfig.name = "wlan0"; + networkConfig = { + DHCP = "yes"; }; }; }; @@ -59,7 +67,7 @@ i18n = { defaultLocale = "en_US.UTF-8"; - supportedLocales = [ "en_US.UTF-8" "nl_NL.UTF-8" "ru_RU.UTF-8" ]; + supportedLocales = [ "all" ]; }; # List services that you want to enable: diff --git a/hosts/dishwasher/hardware-configuration.nix b/hosts/dishwasher/hardware-configuration.nix index f9735fb..1a340f3 100644 --- a/hosts/dishwasher/hardware-configuration.nix +++ b/hosts/dishwasher/hardware-configuration.nix @@ -59,5 +59,7 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + networking.interfaces.wlan0.useDHCP = true; + networking.interfaces.enp1s0.useDHCP = true; services.logind.lidSwitch = "ignore"; } diff --git a/hosts/dishwasher/mcvm-network.nix b/hosts/dishwasher/mcvm-network.nix index bd7c1b9..1e59d3f 100644 --- a/hosts/dishwasher/mcvm-network.nix +++ b/hosts/dishwasher/mcvm-network.nix @@ -45,7 +45,7 @@ networking.nat = { enable = true; enableIPv6 = true; - externalInterface = "enp1s0"; + externalInterface = "wlan0"; internalInterfaces = [ "microvm-bridge" ]; }; diff --git a/microvms/nextcloud/default.nix b/microvms/nextcloud/default.nix index 819bf66..e86ab53 100644 --- a/microvms/nextcloud/default.nix +++ b/microvms/nextcloud/default.nix @@ -51,7 +51,7 @@ enable = true; hostName = "nc.oxapentane.com"; home = "/var/lib/nextcloud-oxa"; - package = pkgs.nextcloud24; + package = pkgs.nextcloud25; maxUploadSize = "5000M"; caching.redis = true; autoUpdateApps = { @@ -69,6 +69,7 @@ adminuser = "admin"; adminpassFile = config.sops.secrets."nextcloud/adminpass".path; }; + enableBrokenCiphersForSSE = false; }; systemd.services."nextcloud-setup" = { |