diff --git a/flake.lock b/flake.lock index b0fc4cb..ec53ba1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1638665590, - "narHash": "sha256-nhtfL3z4TizWHemyZvgLvq11FhYX5Ya4ke+t6Np5PKQ=", + "lastModified": 1648475189, + "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", "owner": "serokell", "repo": "deploy-rs", - "rev": "715e92a13018bc1745fb680b5860af0c5641026a", + "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -180,11 +180,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632086102, - "narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0ce3c683ae677cf5aab597d645520cddd13392b", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { @@ -196,16 +196,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1638918949, - "narHash": "sha256-HDAM4N7dBB0zVgoflnWyVDrGx4oiIUaEjI8YDwk0FFU=", + "lastModified": 1648632716, + "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d07862ea6ed637ee85f868d1bf8a833878bc05e", + "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -285,11 +285,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1638383949, - "narHash": "sha256-k7oMUrp1cMBj59uihyocJVqi4jbU16ycHQqGTJxH1b0=", + "lastModified": 1644387507, + "narHash": "sha256-PX1sWtet0N0s83SKdZVR0zFJ1CiN86Cw/IEeQe1s4MY=", "owner": "serokell", "repo": "serokell.nix", - "rev": "faebe5b14155d045ae5d3f76193c8e99e664af1b", + "rev": "e40718ac932e7c629c5f863ed27c72d516dc1356", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f270ec4..839fd54 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs = { deploy-rs.url = "github:serokell/deploy-rs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; serokell-nix.url = "github:serokell/serokell.nix"; vault-secrets.url = "github:serokell/vault-secrets"; }; diff --git a/hosts.nix b/hosts.nix index a39debd..9e22346 100644 --- a/hosts.nix +++ b/hosts.nix @@ -97,6 +97,12 @@ ip = "10.42.42.20"; mac = "1A:88:A0:B0:65:B4"; } + { + hostname = "zmeura"; + ip = "10.42.42.24"; + mac = "b8:27:eb:d5:e0:f5"; + nix = false; + } { hostname = "nuc"; ip = "10.42.42.42"; diff --git a/nixos/common/default.nix b/nixos/common/default.nix index 6545b53..34a7d23 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -17,20 +17,22 @@ # Nix Settings nix = { package = pkgs.nixUnstable; - autoOptimiseStore = true; - binaryCaches = [ - "https://cachix.cachix.org" - "https://nix-community.cachix.org" - "https://nixpkgs-review-bot.cachix.org" - ]; - binaryCachePublicKeys = [ - "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" - ]; - trustedUsers = [ "root" "victor" ]; + settings = { + auto-optimise-store = true; + trusted-users = [ "root" "victor" ]; + substituters = [ + "https://cachix.cachix.org" + "https://nix-community.cachix.org" + "https://nixpkgs-review-bot.cachix.org" + ]; + trusted-public-keys = [ + "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" + ]; + }; extraOptions = '' - experimental-features = nix-command flakes ca-references + experimental-features = nix-command flakes ''; }; diff --git a/nixos/hosts/nginx/configuration.nix b/nixos/hosts/nginx/configuration.nix index 81f8937..78676bc 100644 --- a/nixos/hosts/nginx/configuration.nix +++ b/nixos/hosts/nginx/configuration.nix @@ -8,7 +8,7 @@ let proxyWebsockets = true; }; }; - k8s_proxy = proxy "http://10.42.42.10:8000/"; + k8s_proxy = proxy "http://10.42.42.150:8000/"; in { networking.hostName = "nginx"; @@ -42,7 +42,7 @@ in { virtualHosts."whoami.wooloofan.club" = k8s_proxy; }; - security.acme.email = "victorheld12@gmail.com"; + security.acme.defaults.email = "victorheld12@gmail.com"; security.acme.acceptTerms = true; security.acme.preliminarySelfsigned = true; } diff --git a/nixos/hosts/unifi/configuration.nix b/nixos/hosts/unifi/configuration.nix index 22701eb..c2e6d5d 100644 --- a/nixos/hosts/unifi/configuration.nix +++ b/nixos/hosts/unifi/configuration.nix @@ -26,7 +26,7 @@ services.unifi = { enable = true; - openPorts = true; unifiPackage = pkgs.unifi; + openFirewall = true; }; }