From 59e69924bb18acd396a15bb166743c037d4df756 Mon Sep 17 00:00:00 2001 From: materus Date: Sat, 10 Feb 2024 12:29:42 +0100 Subject: [PATCH] update --- .../host/flamaster/configuration.nix | 2 +- .../host/flamaster/hardware-configuration.nix | 19 ++++++++++++++++--- configurations/host/materusPC/extraHome.nix | 2 +- configurations/profile/os/games/steam.nix | 4 ++++ flake.lock | 12 ++++++------ 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix index 3530fd5..c330338 100644 --- a/configurations/host/flamaster/configuration.nix +++ b/configurations/host/flamaster/configuration.nix @@ -135,7 +135,7 @@ lshw steamcmd distrobox - steamcmd + config.materus.profile.packages.firefox config.programs.java.package diff --git a/configurations/host/flamaster/hardware-configuration.nix b/configurations/host/flamaster/hardware-configuration.nix index 9b4d342..8182fb8 100644 --- a/configurations/host/flamaster/hardware-configuration.nix +++ b/configurations/host/flamaster/hardware-configuration.nix @@ -16,13 +16,26 @@ fileSystems."/" = { - device = "/dev/disk/by-label/NixOS_Root"; - fsType = "ext4"; + device = "/dev/disk/by-label/NixOS_Root_Laptop"; + fsType = "btrfs"; + options = [ "subvol=@" "noatime" "ssd" "space_cache=v2" "compress=zstd" ]; + }; + fileSystems."/nix" = + { + device = "/dev/disk/by-label/NixOS_Root_Laptop"; + fsType = "btrfs"; + options = [ "subvol=@nix" "noatime" "compress=zstd" "ssd" "space_cache=v2" ]; + }; + fileSystems."/boot" = + { + device = "/dev/disk/by-label/NixOS_Root_Laptop"; + fsType = "btrfs"; + options = [ "subvol=@boot" "ssd" ]; }; fileSystems."/boot/efi" = { - device = "/dev/disk/by-label/NixOS_EFI"; + device = "/dev/disk/by-label/NixOS_EFI_L"; fsType = "vfat"; }; diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix index 1acf90d..91e73c7 100644 --- a/configurations/host/materusPC/extraHome.nix +++ b/configurations/host/materusPC/extraHome.nix @@ -22,7 +22,7 @@ llvmpkgs.libllvm llvmpkgs.libllvm.dev - + raylib gcc gdb nil diff --git a/configurations/profile/os/games/steam.nix b/configurations/profile/os/games/steam.nix index d6bf07c..4205cdd 100644 --- a/configurations/profile/os/games/steam.nix +++ b/configurations/profile/os/games/steam.nix @@ -72,6 +72,8 @@ let pkgs.x264.lib pkgs.steamtinkerlaunch pkgs.pipewire + pkgs.gitFull + pkgs.git-lfs ] ++ config.materus.profile.packages.list.fonts ++ config.materus.profile.steam.extraPkgs; @@ -86,6 +88,8 @@ let pkgs.gnutls pkgs.samba pkgs.tdb + pkgs.jemalloc + pkgs.gperftools ] ++ (with config.hardware.opengl; if pkgs.hostPlatform.is64bit then [ package ] ++ extraPackages diff --git a/flake.lock b/flake.lock index c1c698c..232c87a 100644 --- a/flake.lock +++ b/flake.lock @@ -211,11 +211,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1703084866, - "narHash": "sha256-tuJS6LFveE9ZU32TtHRnaMzQ/5Jo+XTTJxniHVFDi1E=", + "lastModified": 1706212521, + "narHash": "sha256-HBPSlLngxSjrWBzVsno3vL50hl5JLxfFfo+gMgYdIac=", "owner": "materusPL", "repo": "Nixerus", - "rev": "ae5af742820306b2e25134b73f2952d6f62606b7", + "rev": "f2175b39f181d2303f265661b43fcf1f1dba4e7e", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nur": { "locked": { - "lastModified": 1702770334, - "narHash": "sha256-MVILxIF9ZVIk0f9w3yYZpy8auwxgey0MFzdoIFFvQNU=", + "lastModified": 1706211899, + "narHash": "sha256-gedJjTowTi71oxbYiMXRvzlbMthu2knSmvpuqe7QO4Y=", "owner": "nix-community", "repo": "NUR", - "rev": "1d37444620523278aa163bb9e30104f5d1152061", + "rev": "61c04b2e2cc15d505cab5c959df9388fde20525f", "type": "github" }, "original": {