From 08f37f5d0f395b84bef635782a8226ab421ff806 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 15 Jan 2023 19:31:14 +0100 Subject: [PATCH] fix unifi --- flake.lock | 133 ++++++-------------- flake.nix | 12 +- flux/olympus/apps/kustomization.yaml | 3 + flux/olympus/base/apps.yaml | 15 +++ nixos/hosts/olympus/unifi/configuration.nix | 6 +- nixos/hosts/thalassa/aoife/home/default.nix | 2 +- nixos/hosts/thalassa/null/home/default.nix | 2 +- 7 files changed, 66 insertions(+), 107 deletions(-) create mode 100644 flux/olympus/apps/kustomization.yaml create mode 100644 flux/olympus/base/apps.yaml diff --git a/flake.lock b/flake.lock index 979cf2c..b81dcc1 100644 --- a/flake.lock +++ b/flake.lock @@ -48,7 +48,7 @@ "nixpkgs" ], "poetry2nix": "poetry2nix", - "utils": "utils_5" + "utils": "utils_4" }, "locked": { "lastModified": 1669854260, @@ -114,11 +114,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670543350, - "narHash": "sha256-JMYwGa2nJPInuVuYbR3XSGUJewTDyeoTDQaALydduko=", + "lastModified": 1673735094, + "narHash": "sha256-eshv1LSazs/RAeEn6AaTr8bMVkNDQa0/q8PWrO/CmOk=", "owner": "nix-community", "repo": "comma", - "rev": "1b07c19774129ebce3af846fb571e1c0b97f24a3", + "rev": "b99c7130d20cdf53a663ffcdd76359c9bec5aecb", "type": "github" }, "original": { @@ -350,21 +350,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -379,7 +364,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1631561581, "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", @@ -449,11 +434,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1673343300, - "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", + "lastModified": 1673737886, + "narHash": "sha256-hNTqD0uIgpbtTI2Nuj/Q1lEFOOdZqqXpxoc8rMno2F0=", "owner": "nix-community", "repo": "home-manager", - "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", + "rev": "2827b5306462d91edec16a3d069b2d6e54c3079f", "type": "github" }, "original": { @@ -470,11 +455,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1673460918, - "narHash": "sha256-vL9AhYPCMP1/8va2pdmLn0vmCdsxbgYSSQHm4kaQjHs=", + "lastModified": 1673725528, + "narHash": "sha256-mgJd3fKzUcO96IcaNpM9WJY60N+2oATp5AqgWFwm3c8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "11afb660102198abb1e74fffdffd00f8c1a11cd9", + "rev": "b5b436e01ddb5d5200f55be3deed8f4fade0574c", "type": "github" }, "original": { @@ -511,11 +496,11 @@ ] }, "locked": { - "lastModified": 1672925969, - "narHash": "sha256-d94BZH6gJ6s3GmudyKc4XleARpLnYkxhxa6YMb7yKAw=", + "lastModified": 1673799209, + "narHash": "sha256-GMRM1IyIuDEzjEw5E4zWI/TCg3zWs65v86NuR+BAtW0=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "50852e531987d20c432122fbec7f1f089bc2dc09", + "rev": "f77a664e9d168fb7b332ede9db4a3e35a46dd6c5", "type": "github" }, "original": { @@ -579,27 +564,6 @@ "type": "gitlab" } }, - "minecraft-servers": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils_4" - }, - "locked": { - "lastModified": 1672621843, - "narHash": "sha256-Bl2yNHv+5s3eSf5i6icb6seKAwk3AV+iXqx1KWFtX0s=", - "owner": "jyooru", - "repo": "nix-minecraft-servers", - "rev": "516bb060d630dc1aff23a6cb9493399a937887af", - "type": "github" - }, - "original": { - "owner": "jyooru", - "repo": "nix-minecraft-servers", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -741,11 +705,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673440569, - "narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=", + "lastModified": 1673803274, + "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6", + "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", "type": "github" }, "original": { @@ -757,11 +721,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672791794, - "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { @@ -806,33 +770,33 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1673435251, - "narHash": "sha256-slcWQtwJBLprSvNODsH/CkpjV7Hx/ByMGkuGmBr65Bw=", + "lastModified": 1673631141, + "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0abc5480edcab69f26e1bdd5f7ee82890cfe273f", + "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_22-11": { "locked": { - "lastModified": 1610695443, - "narHash": "sha256-WYODk5uqLcdyhXHXApJgP5u9oWCqDzB85UNJxwIONcM=", + "lastModified": 1673704454, + "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "872973d7d1a71570dee1e9c1114e13a072bf3ffc", + "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-22.11", "repo": "nixpkgs", - "rev": "872973d7d1a71570dee1e9c1114e13a072bf3ffc", "type": "github" } }, @@ -870,17 +834,17 @@ "nixvim": { "inputs": { "beautysh": "beautysh", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1673442259, - "narHash": "sha256-Ajoab7w4Hu+j9vUUPDmuXJF+7E4hOJqzzTr74tyUm9c=", + "lastModified": 1673606904, + "narHash": "sha256-vK4dCZEwsetub7FLu+IpD2Ro6pMzifPBPPQutfZcxsY=", "owner": "pta2002", "repo": "nixvim", - "rev": "9aec0f9275f1a9d2076d5b97d69358da0bb1c5c9", + "rev": "b9a4f0ca19201cbc2e6c583f3f3a269fe1a6314f", "type": "github" }, "original": { @@ -891,11 +855,11 @@ }, "nur": { "locked": { - "lastModified": 1673500866, - "narHash": "sha256-MrzvPUnCqtt6G43DcBDU0O+cnB0lhH9btZIIZnjYAJ8=", + "lastModified": 1673804748, + "narHash": "sha256-nOoQBoPgqUHLKcrDzAjErPTefelsxW7VRNCdAJ/Lr7s=", "owner": "nix-community", "repo": "NUR", - "rev": "619e73b02a9a539a2449e5384c6d4c5863f3c5aa", + "rev": "4d2c70498900a21eace533a5427191c53963b9d7", "type": "github" }, "original": { @@ -1006,7 +970,6 @@ "hyprland": "hyprland", "hyprpaper": "hyprpaper", "mailserver": "mailserver", - "minecraft-servers": "minecraft-servers", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -1114,24 +1077,6 @@ } }, "utils_4": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -1149,7 +1094,7 @@ "vault-secrets": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix": "nix", "nixpkgs": [ "nixpkgs" @@ -1209,11 +1154,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1671183014, - "narHash": "sha256-oMWT5Zbe/3HFINAk38jNVxiZ4PCYvPJj2Jo4iiyBtm0=", + "lastModified": 1672824257, + "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", "owner": "wlroots", "repo": "wlroots", - "rev": "dc7cc98cf21a8dc19ab8895505500e3700646af0", + "rev": "5f264a7d6c8af27d41ff440c05262b022c055593", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index e58608e..fd406c7 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,12 @@ # * https://github.com/serokell/pegasus-infra/blob/master/flake.nix # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix + # For minecraft use: + # * https://github.com/Infinidoge/nix-minecraft + inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs_22-11.url = "github:nixos/nixpkgs/872973d7d1a71570dee1e9c1114e13a072bf3ffc"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs_22-11.url = "github:nixos/nixpkgs/nixos-22.11"; nur.url = "github:nix-community/NUR"; @@ -17,9 +20,6 @@ vault-secrets.url = "github:serokell/vault-secrets"; vault-secrets.inputs.nixpkgs.follows = "nixpkgs"; - minecraft-servers.url = "github:jyooru/nix-minecraft-servers"; - minecraft-servers.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -55,7 +55,6 @@ , nixpkgs , nixpkgs_22-11 , vault-secrets - , minecraft-servers , colmena , home-manager , hyprpaper @@ -83,7 +82,6 @@ overlays = [ (import ./nixos/pkgs) vault-secrets.overlay - minecraft-servers.overlays.default hyprpaper.overlays.default hyprland.overlays.default nur.overlay diff --git a/flux/olympus/apps/kustomization.yaml b/flux/olympus/apps/kustomization.yaml new file mode 100644 index 0000000..b83b23e --- /dev/null +++ b/flux/olympus/apps/kustomization.yaml @@ -0,0 +1,3 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: [] diff --git a/flux/olympus/base/apps.yaml b/flux/olympus/base/apps.yaml new file mode 100644 index 0000000..ea630d9 --- /dev/null +++ b/flux/olympus/base/apps.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: apps + namespace: flux-system +spec: + interval: 10m0s + dependsOn: + - name: core + path: ./flux/olympus/apps + prune: true + sourceRef: + kind: GitRepository + name: flux-system diff --git a/nixos/hosts/olympus/unifi/configuration.nix b/nixos/hosts/olympus/unifi/configuration.nix index f9d63b5..d68f0f6 100644 --- a/nixos/hosts/olympus/unifi/configuration.nix +++ b/nixos/hosts/olympus/unifi/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, pkgs_22-11, ... }: +{ config, pkgs, lib, ... }: { imports = [ ]; @@ -25,9 +25,7 @@ services.unifi = { enable = true; unifiPackage = pkgs.unifi; - # /nix/store/wlk5idiz9kqkans7j3vxp7bgg03xc2c6-mongodb-3.6.13/bin/mongod --noauth --dbpath /var/lib/unifi/data/db --journal - # https://www.reddit.com/r/UNIFI/comments/lpwpyk/unifi_controller_any_version_mongodb_36_nearing/ - mongodbPackage = pkgs_22-11.mongodb-3_6; # TODO: Upgrade 3.6 to 4.2 + mongodbPackage = pkgs.mongodb-4_2; openFirewall = true; }; } diff --git a/nixos/hosts/thalassa/aoife/home/default.nix b/nixos/hosts/thalassa/aoife/home/default.nix index 394f115..5ddf8b2 100644 --- a/nixos/hosts/thalassa/aoife/home/default.nix +++ b/nixos/hosts/thalassa/aoife/home/default.nix @@ -86,7 +86,7 @@ in { userName = "Victor"; userEmail = "victor@xirion.net"; lfs.enable = true; - delta.enable = true; + # delta.enable = true; extraConfig = { push.autoSetupRemote = true; init.defaultBranch = "main"; diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 1b03ec6..9e9dc39 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -102,7 +102,7 @@ in { userName = "Victor"; userEmail = "victor@xirion.net"; lfs.enable = true; - delta.enable = true; + # delta.enable = true; extraConfig = { push.autoSetupRemote = true; init.defaultBranch = "main";