From fce385129fb4e0430136b038c88ca5da78b00be4 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 20 Jul 2025 12:49:35 +0200 Subject: [PATCH] Old-materusPC: flake update, minecraft update --- .../host/Old-materusPC/configuration.nix | 1 + .../Old-materusPC/hardware-configuration.nix | 197 ++++++++++++------ .../Old-materusPC/home/materus/default.nix | 2 +- flake.lock | 108 +++++----- 4 files changed, 185 insertions(+), 123 deletions(-) diff --git a/configurations/host/Old-materusPC/configuration.nix b/configurations/host/Old-materusPC/configuration.nix index 7586f6c..25c776a 100755 --- a/configurations/host/Old-materusPC/configuration.nix +++ b/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; }; diff --git a/configurations/host/Old-materusPC/hardware-configuration.nix b/configurations/host/Old-materusPC/hardware-configuration.nix index f29f9bc..33a0429 100755 --- a/configurations/host/Old-materusPC/hardware-configuration.nix +++ b/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 diff --git a/configurations/host/Old-materusPC/home/materus/default.nix b/configurations/host/Old-materusPC/home/materus/default.nix index 651ad80..8a1e0d0 100644 --- a/configurations/host/Old-materusPC/home/materus/default.nix +++ b/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]; }) ]; } diff --git a/flake.lock b/flake.lock index f0bf23b..ed9c7c1 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1752164814, - "narHash": "sha256-F2c24r/c1tL0WC2uTUaWKTSuWAAu6Mi9CX8VCnns32g=", + "lastModified": 1753002546, + "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9972974b23747d11421187718a5039bec3b5f675", + "rev": "58dae564cab8143a83cc38672dcf71a1c301443b", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1752164814, - "narHash": "sha256-F2c24r/c1tL0WC2uTUaWKTSuWAAu6Mi9CX8VCnns32g=", + "lastModified": 1753002546, + "narHash": "sha256-eVDmnGUaE8b3dCQc1VwOi3acpkkZ8qDKxcOlUNYMM4A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9972974b23747d11421187718a5039bec3b5f675", + "rev": "58dae564cab8143a83cc38672dcf71a1c301443b", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1751810233, - "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -477,11 +477,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1752093218, - "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "206ed3c71418b52e176f16f58805c96e84555320", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1752113362, - "narHash": "sha256-KWELfQtHJjNG7X485TplXmKSmZIsYXHeruAxxEnsH7M=", + "lastModified": 1752978452, + "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6e1e610de8302bd2b1575c90c73997acd333a311", + "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1752113362, - "narHash": "sha256-KWELfQtHJjNG7X485TplXmKSmZIsYXHeruAxxEnsH7M=", + "lastModified": 1752978452, + "narHash": "sha256-c9nd/+sAz69+zrD5RrS22C91LBlizFRt7YfUY4AST+o=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6e1e610de8302bd2b1575c90c73997acd333a311", + "rev": "49b211b75ccbb9dd32484955a93b4cfe908f64cf", "type": "github" }, "original": { @@ -554,11 +554,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1747602536, - "narHash": "sha256-XpXAp3tgfPWeV+Wq3/iilz4mCgvRD75Q8kvgHKRIJRw=", + "lastModified": 1752226776, + "narHash": "sha256-kuElD5IQ2sTK6/RK5jmUgZphx6PtZuYX6JvR8n5Mjqg=", "owner": "materusPL", "repo": "Nixerus", - "rev": "84d8b84d1e6883d3e393c889ea62cba503c83a1d", + "rev": "4519d5dc831eb1acf63e891d9474ce01ed617136", "type": "github" }, "original": { @@ -581,11 +581,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1747602536, - "narHash": "sha256-XpXAp3tgfPWeV+Wq3/iilz4mCgvRD75Q8kvgHKRIJRw=", + "lastModified": 1752226776, + "narHash": "sha256-kuElD5IQ2sTK6/RK5jmUgZphx6PtZuYX6JvR8n5Mjqg=", "owner": "materusPL", "repo": "Nixerus", - "rev": "84d8b84d1e6883d3e393c889ea62cba503c83a1d", + "rev": "4519d5dc831eb1acf63e891d9474ce01ed617136", "type": "github" }, "original": { @@ -597,11 +597,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -613,11 +613,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -677,11 +677,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -741,11 +741,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1751637120, - "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -757,11 +757,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -773,11 +773,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -871,11 +871,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1752165826, - "narHash": "sha256-oAiIhK1Q8Yp80XYK6zikKoRvKf9sU6M3//IUToQQDSQ=", + "lastModified": 1753005466, + "narHash": "sha256-SCx9sEs6Uk4Va2O5a2++FssgiWWfbZqdPqpIw34xhe8=", "owner": "nix-community", "repo": "NUR", - "rev": "7378170573977f289ae127727e238a74b451afd9", + "rev": "7d214357c94bb34d8e527e78ffe02ce12e01d720", "type": "github" }, "original": { @@ -971,11 +971,11 @@ ] }, "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -993,11 +993,11 @@ ] }, "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": {