Remove meta folder

defaults/base/default.nix

@@ -1,6 +1,29 @@
 { config, lib, pkgs, ... }:
 
-let metausers = (import ../../meta).users;
+let users = {
+    fhauser = {
+      uid = 1000;
+      isNormalUser = true;
+      description = "Fabian Hauser";
+      group = "fhauser";
+      extraGroups = [ "wheel" "video" "docker" "networkmanager" "libvirtd" "adbusers" ];
+      hashedPassword =
+        "$6$rounds=20000$TYZ8CojfBLwejcwn$smEJe6/anL9NGf.Ytfny14nBfhr4TRPv2XK1lgHz7yg.zQow1HACePirEjsjxzFC6vTHGaT8t2NxobUsHbWLg1";
+      openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIPF8ZV7vhpbVvLxiKq8ANVusNUHMbtii5MuvjxCbVz7vSNVPo9OOLvYyDqhbRAWMTdQeGZVAaALBufKKmprDTRFMpnA7Ut4TFrdz/5DTaR2KEjJ7P75moH+0xooR/GsbzFGsNBSQSXK3u1igndPYEC/PqCHN++32kDo2wLqTB4VLrEovU3iq8BMckn329Bu1fGbXKTgDpEvUEEwFO2brQZLMmzILGF/v4B9ImEGtinAUNgDSfEpgPN23sdWQH9rwEClGv95JmWNf05tuVomhZzOBtCFoAno3XB1nj16avjsqJ3aGFY2CCcfsNrwKzhIotmm82bcI4BJuJIVRIKbZ1 cardno:000603507108"
+      ];
+    };
+
+    empty0 = {
+      uid = 1003;
+      isNormalUser = true;
+      description = "Testuser empty0";
+      group = "empty0";
+      extraGroups = [ "video" ];
+      hashedPassword =
+        "$6$mlI7Au.EzmrL9uJj$vz8ujechSkx83tsFcRA8D04vh5.3ZwPlPmE.wsf2CTKvLio48a1eXtRxUHkkDfPlLAjqyJ55bSSw2lLazH9Ip/";
+    };
+  };
 in {
   imports = [ ../../modules ./unfree.nix ./applications.nix ./overlays.nix ];
 
@@ -12,14 +35,17 @@ in {
   i18n.defaultLocale = "en_US.UTF-8";
 
   users.mutableUsers = false;
-  users.groups = metausers.groups;
+  users.groups = {
-  users.users = metausers.users // {
+    fhauser.gid = 1000;
+    empty0.gid = 1003;
+  };
+  users.users = users // {
     root.openssh.authorizedKeys.keys = with lib;
       concatLists (mapAttrsToList (name: user:
         if elem "wheel" user.extraGroups then
           user.openssh.authorizedKeys.keys
         else
-          [ ]) metausers.users);
+          [ ]) users);
   };
 
   # Package management

meta/default.nix

@@ -1,4 +0,0 @@
-{
-  network = import ./network.nix;
-  users = import ./users.nix;
-}

meta/network.nix

@@ -1,92 +0,0 @@
-{
-  physical-networks = {
-    plessur.ext = { # INIT 7
-      v4 = {
-        id = "85.195.200.253";
-        bitmask = 24;
-      };
-      hosts = { calanda = { v4.ip = "85.195.200.253"; }; };
-    };
-
-    plessur.dmz = {
-      v4 = {
-        id = "10.1.2.0";
-        bitmask = 24;
-        gateway = "10.1.2.1";
-        nameservers = [ "10.1.2.1" ];
-      };
-
-      hosts = {
-        calanda.v4.ip = "10.1.2.1";
-        montalin.v4.ip = "10.1.2.2";
-      };
-    };
-
-    plessur.lan = {
-      v4 = {
-        id = "10.1.1.0";
-        bitmask = 24;
-      };
-
-      hosts = { calanda.v4.ip = "10.1.1.1"; };
-    };
-
-    jona.lan = {
-      v4 = {
-        id = "10.2.1.0";
-        bitmask = 24;
-      };
-    };
-
-    eem.lan = {
-      #TODO
-      hosts = {
-        stompert.v4.ip = ""; # TODO
-      };
-    };
-  };
-
-  virtual = {
-    mgmt = rec {
-      # TODO: Introduce virtual network type
-      v4 = {
-        id = "10.249.0.0";
-        bitmask = 23;
-      };
-      server = {
-        hostname = "montalin";
-        port = 51820;
-      };
-
-      hosts = {
-        montalin = {
-          v4.ip = "10.249.0.1";
-          endpoint = "calanda.plessur.net.qo.is:${toString server.port}";
-          publicKey = "76nV1jgexHJ898hTLbMRz1BjguFp6YCHpoV52GuNDzc=";
-          persistentKeepalive = null;
-        };
-        #calanda.v4.ip    = "10.249.0.2";
-        #cavistrau.v4.ip  = "10.249.0.3";
-        #stompert.v4.ip   = "10.249.0.4";
-        hummelberg = {
-          v4.ip = "10.249.0.5";
-          endpoint = null;
-          publicKey = "dvv3ad9mWU9opTa8R9yPN4l1xfwdcMH0e/Rrv0GXPS4=";
-          persistentKeepalive = 25; # Might be behind NAT
-        };
-      };
-    };
-
-    montalin-stompert = {
-      v4 = {
-        id = "10.249.2.0";
-        bitmask = 24;
-      };
-
-      hosts = {
-        montalin.v4.ip = "10.249.2.1";
-        stompert.v4.ip = "10.249.2.2";
-      };
-    };
-  };
-}

meta/users.nix

@@ -1,31 +0,0 @@
-{
-  groups = {
-    fhauser.gid = 1000;
-    empty0.gid = 1003;
-  };
-
-  users = rec {
-    fhauser = {
-      uid = 1000;
-      isNormalUser = true;
-      description = "Fabian Hauser";
-      group = "fhauser";
-      extraGroups = [ "wheel" "video" "docker" "networkmanager" "libvirtd" "adbusers" ];
-      hashedPassword =
-        "$6$rounds=20000$TYZ8CojfBLwejcwn$smEJe6/anL9NGf.Ytfny14nBfhr4TRPv2XK1lgHz7yg.zQow1HACePirEjsjxzFC6vTHGaT8t2NxobUsHbWLg1";
-      openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIPF8ZV7vhpbVvLxiKq8ANVusNUHMbtii5MuvjxCbVz7vSNVPo9OOLvYyDqhbRAWMTdQeGZVAaALBufKKmprDTRFMpnA7Ut4TFrdz/5DTaR2KEjJ7P75moH+0xooR/GsbzFGsNBSQSXK3u1igndPYEC/PqCHN++32kDo2wLqTB4VLrEovU3iq8BMckn329Bu1fGbXKTgDpEvUEEwFO2brQZLMmzILGF/v4B9ImEGtinAUNgDSfEpgPN23sdWQH9rwEClGv95JmWNf05tuVomhZzOBtCFoAno3XB1nj16avjsqJ3aGFY2CCcfsNrwKzhIotmm82bcI4BJuJIVRIKbZ1 cardno:000603507108"
-      ];
-    };
-
-    empty0 = {
-      uid = 1003;
-      isNormalUser = true;
-      description = "Testuser empty0";
-      group = "empty0";
-      extraGroups = [ "video" ];
-      hashedPassword =
-        "$6$mlI7Au.EzmrL9uJj$vz8ujechSkx83tsFcRA8D04vh5.3ZwPlPmE.wsf2CTKvLio48a1eXtRxUHkkDfPlLAjqyJ55bSSw2lLazH9Ip/";
-    };
-  };
-}