Old-materusPC: flake update, minecraft update

configurations/host/Old-materusPC/configuration.nix

@@ -304,6 +304,7 @@ in
     };
     fish.enable = true;
     java.enable = true;
+    java.package = pkgs.graalvmPackages.graalvm-oracle;
     command-not-found.enable = false;
     dconf.enable = true;
   };

configurations/host/Old-materusPC/hardware-configuration.nix

@@ -1,82 +1,143 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ehci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "vfio-pci" ];
+  boot.kernelModules = [
+    "kvm-intel"
+    "vfio-pci"
+  ];
   boot.extraModulePackages = [ ];
-  boot.kernel.sysctl = { "vm.swappiness" = 10; };
-  boot.kernelParams = [ "ibt=off" "intel_iommu=on" "iommu=pt" "pcie_acs_override=downstream,multifunction" ];
-  fileSystems."/" =
+  boot.kernel.sysctl = {
+    "vm.swappiness" = 10;
+  };
+  boot.kernelParams = [
+    "ibt=off"
+    "intel_iommu=on"
+    "iommu=pt"
+    "pcie_acs_override=downstream,multifunction"
+  ];
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/NixOS_Root";
+    fsType = "btrfs";
+    options = [
+      "subvol=@"
+      "noatime"
+      "ssd"
+      "space_cache=v2"
+    ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NixOS_Root";
+    fsType = "btrfs";
+    options = [
+      "subvol=@boot"
+      "ssd"
+    ];
+  };
+
+  fileSystems."/materus" = {
+    device = "/dev/disk/by-label/NixOS_Root";
+    fsType = "btrfs";
+    options = [
+      "subvol=@materus"
+      "noatime"
+      "compress=zstd"
+      "ssd"
+      "space_cache=v2"
+    ];
+    neededForBoot = true;
+
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-label/NixOS_Root";
+    fsType = "btrfs";
+    options = [
+      "subvol=@nix"
+      "noatime"
+      "compress=zstd"
+      "ssd"
+      "space_cache=v2"
+    ];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-label/NixOS_Home";
+    fsType = "btrfs";
+    options = [
+      "subvol=@home"
+      "nossd"
+      "noatime"
+      "compress=zstd"
+      "space_cache=v2"
+      "autodefrag"
+    ];
+  };
+
+  fileSystems."/materus/data" = {
+    device = "/dev/disk/by-label/NixOS_Home";
+    fsType = "btrfs";
+    options = [
+      "subvol=@data"
+      "nossd"
+      "noatime"
+      "compress=zstd"
+      "space_cache=v2"
+      "autodefrag"
+    ];
+  };
+
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/A5C2-31D1";
+    fsType = "vfat";
+  };
+
+  zramSwap = {
+    enable = true;
+    memoryPercent = 50;
+    priority = 10;
+  };
+
+  swapDevices = [
     {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@" "noatime" "ssd" "space_cache=v2" ];
-    };
-
-  fileSystems."/boot" =
+      device = "/var/lib/swapfile";
+      size = 32 * 1024;
+      priority = 5;
+    }
     {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@boot" "ssd" ];
-    };
-
-  fileSystems."/materus" =
-    {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
-      neededForBoot = true;
-
-    };
-
-  fileSystems."/nix" =
-    {
-      device = "/dev/disk/by-label/NixOS_Root";
-      fsType = "btrfs";
-      options = [ "subvol=@nix" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
-    };
-
-  fileSystems."/home" =
-    {
-      device = "/dev/disk/by-label/NixOS_Home";
-      fsType = "btrfs";
-      options = [ "subvol=@home" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
-    };
-
-  fileSystems."/materus/data" =
-    {
-      device = "/dev/disk/by-label/NixOS_Home";
-      fsType = "btrfs";
-      options = [ "subvol=@data" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
-    };
-
-  fileSystems."/boot/efi" =
-    {
-      device = "/dev/disk/by-uuid/A5C2-31D1";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-label/NixOS_Swap"; }];
-
-  fileSystems."/etc/nixos" =
-    {
-      device = "/materus/config/nixos-config";
-      fsType = "none";
-      options = [ "bind" ];
-      depends = [ "/materus" ];
-    };
-
+      device = "/dev/disk/by-label/NixOS_Swap";
+      priority = 0;
+    }
+  ];
 
+  fileSystems."/etc/nixos" = {
+    device = "/materus/config/nixos-config";
+    fsType = "none";
+    options = [ "bind" ];
+    depends = [ "/materus" ];
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

configurations/host/Old-materusPC/home/materus/default.nix

@@ -152,7 +152,7 @@
     };
   home.packages = [
     pkgs.papirus-icon-theme
-    (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; })
+    (materusArg.pkgs.polymc.wrap { extraJDKs = [ pkgs.graalvmPackages.graalvm-oracle pkgs.graalvmPackages.graalvm-oracle_17]; })
   ];
 
 }