refactor

servers/eisen/configuration.nix

@@ -5,47 +5,57 @@ let
   # unstable-pkgs = hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
 in
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+  ];
-    ];
 
-  nix.daemonCPUSchedPolicy = "idle";
+  nix = {
-  nix.daemonIOSchedClass = "idle";
+    daemonCPUSchedPolicy = "idle";
+    daemonIOSchedClass = "idle";
+  };
+
+  networking = {
+    hostName = "eisen";
+    nameservers = ["1.1.1.1"];
+    networkmanager.enable = true;
+  };
 
-  networking.hostName = "eisen";
-  networking.nameservers = ["1.1.1.1"];
-  networking.networkmanager.enable = true;
   time.timeZone = lib.mkForce "Europe/Prague";
   i18n.defaultLocale = "en_US.UTF-8";
 
   services.dnsmasq.enable = true;
-  security.rtkit.enable = true;
-  security.polkit.enable = true;
-  services.localtimed.enable = true;
 
-  services.openssh.enable = true;
+  security = {
-  services.tailscale = {
+    rtkit.enable = true;
-    enable = true;
+    polkit.enable = true;
-    useRoutingFeatures = "both";
-    openFirewall = true;
-    extraUpFlags = [ "--advertise-exit-node" ];
   };
-  virtualisation.docker = {
-    enable = true;
-    enableOnBoot = false;
-  };
-  # hardware.nvidia-container-toolkit.enable = true;
-  services.avahi.enable = true;
 
-  services.syncthing = {
+  services = {
-    enable = true;
+    localtimed.enable = true;
-    openDefaultPorts = true;
+    openssh.enable = true;
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "both";
+      openFirewall = true;
+      extraUpFlags = [ "--advertise-exit-node" ];
+    };
+    avahi.enable = true;
+    lldpd.enable = true;
+    syncthing = {
+      enable = true;
+      openDefaultPorts = true;
+    };
   };
-  services.lldpd.enable = true;
   systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
 
+  virtualisation.docker = {
+    enable = true;
+    enableOnBoot = true;
+  };
+  # hardware.nvidia-container-toolkit.enable = true;
+
   boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
     # Shortcuts for fixing things
     # alt+sysrq (prtsc) + key
     # h: Print help to the system log.
@@ -56,29 +66,17 @@ in
     # b: Reboot the system.
     kernel.sysctl."kernel.sysrq" = 1;
 
-    kernelParams = [
-        "initcall_blacklist=sysfb_init"
-        "boot.shell_on_fail"
-        "loglevel=3"
-        "console=tty1"
-        "console=ttyS0"
-        "nomodeset"
-        "rd.systemd.show_status=false"
-        "rd.udev.log_level=3"
-        "udev.log_priority=3"
-    ];
-
     # zfs.enabled = false;
     swraid.enable = false;
 
     initrd.systemd.enable = true;
 
     loader = {
-      # systemd-boot.enable = true;
+      systemd-boot.enable = true;
-      # efi.canTouchEfiVariables = true;
+      efi.canTouchEfiVariables = true;
       # timeout = 0;
-      grub.enable = true;
+      # grub.enable = true;
-      grub.device = "/dev/disk/by-id/ata-Apacer_AS350_512GB_2021012802000028";
+      # grub.device = "/dev/disk/by-id/ata-Apacer_AS350_512GB_2021012802000028";
       # grub.efiSupport = true;
     };
   };

servers/eisen/hardware-configuration.nix

@@ -14,12 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/fe65265a-b697-465e-adc5-c16fc530120c";
+    { device = "/dev/disk/by-uuid/89a5fec3-ddda-40f7-a7a7-f53cf3202a48";
-      fsType = "btrfs";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5BFE-8E50";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/5b8135fa-a393-433f-818f-4feb018d1080"; }
+    [ { device = "/dev/disk/by-uuid/f26a39ff-50dc-46f7-a0e2-1b7b67525c04"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking