Enable defaults.tvb

flake.lock

@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688390516,
-        "narHash": "sha256-KeZ/oIn95nAwC5els+sEC2Xhl71qXmlgfnkjDGZxLOM=",
+        "lastModified": 1690997685,
+        "narHash": "sha256-naQeYVDiLw+w75ODGYrqGG91SEK1yva2uxyyWahflBs=",
         "ref": "refs/heads/master",
-        "rev": "1fc66e814dc01acd06db9476ca7ff26b67816322",
-        "revCount": 21,
+        "rev": "4f8b424416a350b09fd4f512e89b4f4f312a79b6",
+        "revCount": 23,
         "type": "git",
         "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"
       },

flake.nix

@@ -51,6 +51,7 @@
       empyrean = nixpkgs-next.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          self.nixosModules.beatific
           intake.nixosModules.default
           intake-sources.nixosModules.default
           ./machine/empyrean

machine/empyrean/default.nix

@@ -15,6 +15,11 @@
       ./inquisitor.nix
     ];
 
+  beatific.hostName = "empyrean";
+  beatific.defaults = {
+    nebula = false;
+  };
+
   # Use the GRUB 2 boot loader.
   boot.loader.grub = {
     enable = true;
@@ -26,42 +31,20 @@
   nix = {
     package = pkgs.nixFlakes;
     settings.max-jobs = 2;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
   };
 
   swapDevices = [ { device = "/swap"; size = 1024; } ];
 
-  networking.hostName = "empyrean";
-
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
   networking.useDHCP = false;
   networking.interfaces.eth0.useDHCP = true;
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  # Set your time zone.
-  time.timeZone = "UTC";
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim htop git tinc_pre python3
+    tinc_pre
     gitea
   ];
-  environment.variables.EDITOR = "vim";
 
   services.nginx = let
     static-site = srv-dir: {
@@ -102,13 +85,7 @@
     acceptTerms = true;
   };
 
-  services.ntp = {
-    enable = true;
-    servers = ["time.nist.gov"];
-  };
-
   services.openssh = {
-    enable = true;
     settings.PasswordAuthentication = false;
     settings.PermitRootLogin = "prohibit-password";
   };
@@ -151,9 +128,7 @@
 
   networking.firewall = {
     enable = true;
-    allowPing = true;
     allowedTCPPorts = [
-      22  # ssh
       80  # http
       443 # https
       655 # tinc
@@ -164,19 +139,6 @@
     ];
   };
 
-  users.users.tvb = {
-    isNormalUser = true;
-    group = "tvb";
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    openssh.authorizedKeys.keyFiles = [
-      ../../keys/tvb.palamas.pub
-      ../../keys/tvb.stagirite.pub
-      ../../keys/tvb.catacomb.pub
-      ../../keys/tvb.unfolder.pub
-    ];
-  };
-  users.groups.tvb = {};
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave