From 06c534aa420da1f9113de403d4308f93ec4e8ba0 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 10 Mar 2024 20:34:30 +0000 Subject: [PATCH] add badssd to starlight, set luks performance options --- flake.lock | 20 ++++++++++---------- system/mistmane/boot-config.nix | 1 + system/rainbowdash/boot-config.nix | 1 + system/smolder/boot-config.nix | 1 + system/starlight/boot-config.nix | 8 ++++++++ system/starlight/hardware-configuration.nix | 7 ++++++- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index c2c4cc3..6849bfb 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1709611503, - "narHash": "sha256-zfvuqmScw007m69hy3U09FUjLSoYrTiRiHy7x7IdvZU=", + "lastModified": 1710113982, + "narHash": "sha256-6AGBWiDVVcnL2qPaPaf+iDYf0kEwsjB3bElslvhzJdA=", "ref": "refs/heads/canon", - "rev": "3b75fafa0dd1b9d6b0e59bcf29bf4d9d39cd2d87", - "revCount": 40, + "rev": "9a965cb5a3cc4184e7944d0ce88fe22a5e42d30f", + "revCount": 41, "type": "git", "url": "https://git.mildlyfunctional.gay/artemist/packages.git" }, @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1710055150, - "narHash": "sha256-Nc8ojxTO2a70qnU8f6bVRs4WhuoFQL74gMTkRaCjg5M=", + "lastModified": 1710062421, + "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fe4180ad3f07a2064fed7875183509e7e0eb07cd", + "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { diff --git a/system/mistmane/boot-config.nix b/system/mistmane/boot-config.nix index 7972b3a..89b01b7 100644 --- a/system/mistmane/boot-config.nix +++ b/system/mistmane/boot-config.nix @@ -18,6 +18,7 @@ device = "/dev/disk/by-uuid/74b7cded-e9f8-432f-b694-5bea09635168"; preLVM = true; allowDiscards = true; + bypassWorkqueues = true; }; }; diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix index 0e7a64f..56eafaf 100644 --- a/system/rainbowdash/boot-config.nix +++ b/system/rainbowdash/boot-config.nix @@ -12,6 +12,7 @@ device = "/dev/disk/by-uuid/e8a47693-e6d9-4d66-ac8a-13633e606f3d"; preLVM = true; allowDiscards = true; + bypassWorkqueues = true; }; }; }; diff --git a/system/smolder/boot-config.nix b/system/smolder/boot-config.nix index c29a472..27cd222 100644 --- a/system/smolder/boot-config.nix +++ b/system/smolder/boot-config.nix @@ -13,6 +13,7 @@ device = "/dev/disk/by-uuid/b6b4bd3d-d7e1-463e-9a73-6d0f620e914a"; preLVM = true; allowDiscards = true; + bypassWorkqueues = true; }; }; } diff --git a/system/starlight/boot-config.nix b/system/starlight/boot-config.nix index a8d13a7..2ee9349 100644 --- a/system/starlight/boot-config.nix +++ b/system/starlight/boot-config.nix @@ -22,11 +22,19 @@ in device = "/dev/disk/by-uuid/274ec302-20b7-43bf-aa72-895ffdd96919"; preLVM = true; allowDiscards = true; + bypassWorkqueues = true; }; glimmer = { device = "/dev/disk/by-uuid/43220fc3-2f33-4915-9365-59eb27b21719"; preLVM = true; allowDiscards = true; + bypassWorkqueues = true; + }; + badssd = { + device = "/dev/disk/by-uuid/e1ce7879-a6e3-4f9a-bac9-186206060f83"; + preLVM = true; + allowDiscards = true; + bypassWorkqueues = true; }; }; }; diff --git a/system/starlight/hardware-configuration.nix b/system/starlight/hardware-configuration.nix index 0ebac23..171bd93 100644 --- a/system/starlight/hardware-configuration.nix +++ b/system/starlight/hardware-configuration.nix @@ -88,5 +88,10 @@ fsType = "nfs4"; }; - swapDevices = [ { device = "/dev/disk/by-uuid/b134fecf-719f-45af-b317-001e413f06c4"; } ]; + swapDevices = [ + { + device = "/dev/disk/by-uuid/b134fecf-719f-45af-b317-001e413f06c4"; + discardPolicy = "both"; + } + ]; }