feat: upgrade from thinkpad x1 9th-gen to 12th-gen
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
This commit is contained in:
parent
37a10b7fe2
commit
381924aee1
10
flake.nix
10
flake.nix
@ -19,14 +19,14 @@
|
|||||||
|
|
||||||
systems.modules.nixos = with inputs; [
|
systems.modules.nixos = with inputs; [
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
|
chaotic.nixosModules.default
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
nur.nixosModules.nur
|
|
||||||
srvos.nixosModules.common
|
srvos.nixosModules.common
|
||||||
srvos.nixosModules.mixins-systemd-boot
|
srvos.nixosModules.mixins-systemd-boot
|
||||||
];
|
];
|
||||||
|
|
||||||
systems.hosts.thonkpad.modules = [
|
systems.hosts.thonkpad.modules = [
|
||||||
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-9th-gen
|
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen
|
||||||
inputs.lanzaboote.nixosModules.lanzaboote
|
inputs.lanzaboote.nixosModules.lanzaboote
|
||||||
];
|
];
|
||||||
systems.hosts.thonkpad.specialArgs = {
|
systems.hosts.thonkpad.specialArgs = {
|
||||||
@ -39,6 +39,10 @@
|
|||||||
};
|
};
|
||||||
systems.hosts.smolboye.modules = [inputs.srvos.nixosModules.server];
|
systems.hosts.smolboye.modules = [inputs.srvos.nixosModules.server];
|
||||||
|
|
||||||
|
homes.modules = with inputs; [
|
||||||
|
nur.hmModules.nur
|
||||||
|
];
|
||||||
|
|
||||||
overlays = [(_: prev: {inherit (inputs.maych-in.packages.${prev.system}) maych-in;})];
|
overlays = [(_: prev: {inherit (inputs.maych-in.packages.${prev.system}) maych-in;})];
|
||||||
|
|
||||||
channels-config.allowUnfree = true;
|
channels-config.allowUnfree = true;
|
||||||
@ -70,6 +74,8 @@
|
|||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
agenix.inputs.home-manager.follows = "nixpkgs";
|
agenix.inputs.home-manager.follows = "nixpkgs";
|
||||||
|
|
||||||
|
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||||
|
|
||||||
deploy-rs.url = "github:serokell/deploy-rs";
|
deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
|
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
inputs,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
@ -31,100 +31,170 @@
|
|||||||
|
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin.override {
|
policies = {
|
||||||
cfg = {
|
DisableFirefoxStudies = true;
|
||||||
pipewireSupport = true;
|
EnableTrackingProtection = {
|
||||||
|
Value = true;
|
||||||
|
Locked = true;
|
||||||
|
Cryptomining = true;
|
||||||
|
Fingerprinting = true;
|
||||||
|
};
|
||||||
|
OfferToSaveLoginsDefault = false;
|
||||||
|
DisableTelemetry = true;
|
||||||
|
DisablePocket = true;
|
||||||
|
DisableFirefoxAccounts = true;
|
||||||
|
OverrideFirstRunPage = "";
|
||||||
|
OverridePostUpdatePage = "";
|
||||||
|
DontCheckDefaultBrowser = true;
|
||||||
|
DisplayMenuBar = "default-off";
|
||||||
|
SearchBar = "unified";
|
||||||
|
NoDefaultBookmarks = true;
|
||||||
|
DisplayBookmarksToolbar = "never";
|
||||||
|
Preferences = let
|
||||||
|
lock-false = {
|
||||||
|
Value = false;
|
||||||
|
Status = "locked";
|
||||||
|
};
|
||||||
|
lock-true = {
|
||||||
|
Value = false;
|
||||||
|
Status = "locked";
|
||||||
|
};
|
||||||
|
lock-empty-string = {
|
||||||
|
Value = false;
|
||||||
|
Status = "locked";
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true;
|
||||||
|
|
||||||
|
# Remove poluting defaults
|
||||||
|
"extensions.pocket.enabled" = lock-false;
|
||||||
|
|
||||||
|
# Remove default top sites
|
||||||
|
"browser.topsites.contile.enabled" = lock-false;
|
||||||
|
"browser.urlbar.suggest.topsites" = lock-false;
|
||||||
|
|
||||||
|
# Remove sponsored sites
|
||||||
|
"browser.newtabpage.pinned" = lock-empty-string;
|
||||||
|
"browser.newtabpage.activity-stream.showSponsored" = lock-false;
|
||||||
|
"browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
|
||||||
|
"browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
|
||||||
|
|
||||||
|
# Remove firefox shiny buttons
|
||||||
|
"browser.tabs.firefox-view" = false;
|
||||||
|
"browser.tabs.firefox-view-next" = false;
|
||||||
|
# Style
|
||||||
|
"browser.compactmode.show" = lock-true;
|
||||||
|
"browser.uidensity" = {
|
||||||
|
Value = 1;
|
||||||
|
Status = "locked";
|
||||||
|
};
|
||||||
|
# Fonts - make web pages follow system font
|
||||||
|
"browser.display.use_document_fonts" = {
|
||||||
|
Value = 0;
|
||||||
|
Status = "locked";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# extensions = with config.nur.repos.rycee.firefox-addons; [
|
};
|
||||||
# bitwarden
|
profiles.ff = {
|
||||||
# clearurls
|
extensions = with config.nur.repos.rycee.firefox-addons; [
|
||||||
# duckduckgo-privacy-essentials
|
bitwarden
|
||||||
# reddit-enhancement-suite
|
clearurls
|
||||||
# sponsorblock
|
duckduckgo-privacy-essentials
|
||||||
# ublock-origin
|
reddit-enhancement-suite
|
||||||
# ];
|
sponsorblock
|
||||||
# policies = {
|
ublock-origin
|
||||||
# DisableFirefoxStudies = true;
|
];
|
||||||
# EnableTrackingProtection = {
|
bookmarks = {};
|
||||||
# Value = true;
|
settings = {
|
||||||
# Locked = true;
|
"browser.startup.homepage" = "about:home";
|
||||||
# Cryptomining = true;
|
|
||||||
# Fingerprinting = true;
|
|
||||||
# };
|
|
||||||
# OfferToSaveLoginsDefault = false;
|
|
||||||
|
|
||||||
# DisableTelemetry = true;
|
# Disable irritating first-run stuff
|
||||||
# DisablePocket = true;
|
"browser.disableResetPrompt" = true;
|
||||||
# DisableFirefoxAccounts = true;
|
"browser.download.panel.shown" = true;
|
||||||
# OverrideFirstRunPage = "";
|
"browser.feeds.showFirstRunUI" = false;
|
||||||
# OverridePostUpdatePage = "";
|
"browser.messaging-system.whatsNewPanel.enabled" = false;
|
||||||
# DontCheckDefaultBrowser = true;
|
"browser.rights.3.shown" = true;
|
||||||
# DisplayMenuBar = "default-off";
|
"browser.shell.checkDefaultBrowser" = false;
|
||||||
# SearchBar = "unified";
|
"browser.shell.defaultBrowserCheckCount" = 1;
|
||||||
# NoDefaultBookmarks = true;
|
"browser.startup.homepage_override.mstone" = "ignore";
|
||||||
# DisplayBookmarksToolbar = "never";
|
"browser.uitour.enabled" = false;
|
||||||
# Preferences = let
|
"startup.homepage_override_url" = "";
|
||||||
# lock-false = {
|
"trailhead.firstrun.didSeeAboutWelcome" = true;
|
||||||
# Value = false;
|
"browser.bookmarks.restore_default_bookmarks" = false;
|
||||||
# Status = "locked";
|
"browser.bookmarks.addedImportButton" = true;
|
||||||
# };
|
|
||||||
# lock-true = {
|
|
||||||
# Value = false;
|
|
||||||
# Status = "locked";
|
|
||||||
# };
|
|
||||||
# lock-empty-string = {
|
|
||||||
# Value = false;
|
|
||||||
# Status = "locked";
|
|
||||||
# };
|
|
||||||
# in {
|
|
||||||
# "toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true;
|
|
||||||
|
|
||||||
# # Remove poluting defaults
|
# Don't ask for download dir
|
||||||
# "extensions.pocket.enabled" = lock-false;
|
"browser.download.useDownloadDir" = false;
|
||||||
|
|
||||||
# # Remove default top sites
|
# Disable crappy home activity stream page
|
||||||
# "browser.topsites.contile.enabled" = lock-false;
|
"browser.newtabpage.activity-stream.feeds.topsites" = false;
|
||||||
# "browser.urlbar.suggest.topsites" = lock-false;
|
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
|
||||||
|
"browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts" = false;
|
||||||
|
"browser.newtabpage.blocked" = lib.genAttrs [
|
||||||
|
# Youtube
|
||||||
|
"26UbzFJ7qT9/4DhodHKA1Q=="
|
||||||
|
# Facebook
|
||||||
|
"4gPpjkxgZzXPVtuEoAL9Ig=="
|
||||||
|
# Wikipedia
|
||||||
|
"eV8/WsSLxHadrTL1gAxhug=="
|
||||||
|
# Reddit
|
||||||
|
"gLv0ja2RYVgxKdp0I5qwvA=="
|
||||||
|
# Amazon
|
||||||
|
"K00ILysCaEq8+bEqV/3nuw=="
|
||||||
|
# Twitter
|
||||||
|
"T9nJot5PurhJSy8n038xGA=="
|
||||||
|
] (_: 1);
|
||||||
|
|
||||||
# # Remove sponsored sites
|
# Disable some telemetry
|
||||||
# "browser.newtabpage.pinned" = lock-empty-string;
|
"app.shield.optoutstudies.enabled" = false;
|
||||||
# "browser.newtabpage.activity-stream.showSponsored" = lock-false;
|
"browser.discovery.enabled" = false;
|
||||||
# "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
|
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||||
# "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
|
"browser.newtabpage.activity-stream.telemetry" = false;
|
||||||
|
"browser.ping-centre.telemetry" = false;
|
||||||
|
"datareporting.healthreport.service.enabled" = false;
|
||||||
|
"datareporting.healthreport.uploadEnabled" = false;
|
||||||
|
"datareporting.policy.dataSubmissionEnabled" = false;
|
||||||
|
"datareporting.sessions.current.clean" = true;
|
||||||
|
"devtools.onboarding.telemetry.logged" = false;
|
||||||
|
"toolkit.telemetry.archive.enabled" = false;
|
||||||
|
"toolkit.telemetry.bhrPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.enabled" = false;
|
||||||
|
"toolkit.telemetry.firstShutdownPing.enabled" = false;
|
||||||
|
"toolkit.telemetry.hybridContent.enabled" = false;
|
||||||
|
"toolkit.telemetry.newProfilePing.enabled" = false;
|
||||||
|
"toolkit.telemetry.prompted" = 2;
|
||||||
|
"toolkit.telemetry.rejected" = true;
|
||||||
|
"toolkit.telemetry.reportingpolicy.firstRun" = false;
|
||||||
|
"toolkit.telemetry.server" = "";
|
||||||
|
"toolkit.telemetry.shutdownPingSender.enabled" = false;
|
||||||
|
"toolkit.telemetry.unified" = false;
|
||||||
|
"toolkit.telemetry.unifiedIsOptIn" = false;
|
||||||
|
"toolkit.telemetry.updatePing.enabled" = false;
|
||||||
|
|
||||||
# # Remove firefox shiny buttons
|
# Disable fx accounts
|
||||||
# "browser.tabs.firefox-view" = false;
|
"identity.fxaccounts.enabled" = false;
|
||||||
# "browser.tabs.firefox-view-next" = false;
|
# Disable "save password" prompt
|
||||||
# # Style
|
"signon.rememberSignons" = false;
|
||||||
# "browser.compactmode.show" = lock-true;
|
# Harden
|
||||||
# "browser.uidensity" = {
|
"privacy.trackingprotection.enabled" = true;
|
||||||
# Value = 1;
|
"dom.security.https_only_mode" = true;
|
||||||
# Status = "locked";
|
"browser.tabs.loadInBackground" = true;
|
||||||
# };
|
"gfx.canvas.accelerated" = true;
|
||||||
# # Fonts - make web pages follow system font
|
"gfx.webrender.enabled" = true;
|
||||||
# "browser.display.use_document_fonts" = {
|
"gfx.x11-egl.force-enabled" = true;
|
||||||
# Value = 0;
|
"layers.acceleration.force-enabled" = true;
|
||||||
# Status = "locked";
|
"media.av1.enabled" = false;
|
||||||
# };
|
"media.ffmpeg.vaapi.enabled" = true;
|
||||||
|
"media.hardware-video-decoding.force-enabled" = true;
|
||||||
# "browser.tabs.loadInBackground" = true;
|
"media.rdd-ffmpeg.enabled" = true;
|
||||||
# "gfx.canvas.accelerated" = true;
|
"widget.dmabuf.force-enabled" = true;
|
||||||
# "gfx.webrender.enabled" = true;
|
"svg.context-properties.content.enabled" = true;
|
||||||
# "gfx.x11-egl.force-enabled" = true;
|
"gnomeTheme.hideSingleTab" = true;
|
||||||
# "layers.acceleration.force-enabled" = true;
|
"gnomeTheme.bookmarksToolbarUnderTabs" = true;
|
||||||
# "media.av1.enabled" = false;
|
"gnomeTheme.normalWidthTabs" = false;
|
||||||
# "media.ffmpeg.vaapi.enabled" = true;
|
"gnomeTheme.tabsAsHeaderbar" = false;
|
||||||
# "media.hardware-video-decoding.force-enabled" = true;
|
};
|
||||||
# "media.rdd-ffmpeg.enabled" = true;
|
};
|
||||||
# "widget.dmabuf.force-enabled" = true;
|
|
||||||
# "svg.context-properties.content.enabled" = true;
|
|
||||||
# "gnomeTheme.hideSingleTab" = true;
|
|
||||||
# "gnomeTheme.bookmarksToolbarUnderTabs" = true;
|
|
||||||
# "gnomeTheme.normalWidthTabs" = false;
|
|
||||||
# "gnomeTheme.tabsAsHeaderbar" = false;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
|
@ -3,58 +3,60 @@ _: {
|
|||||||
initrd = {
|
initrd = {
|
||||||
availableKernelModules = [
|
availableKernelModules = [
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
"xhci_hcd"
|
"thunderbolt"
|
||||||
"nvme"
|
"nvme"
|
||||||
"usb_storage"
|
"usb_storage"
|
||||||
"sd_mod"
|
"sd_mod"
|
||||||
];
|
];
|
||||||
luks.devices."cryptroot".device = "/dev/disk/by-uuid/312b4d84-64dc-4721-9be3-bb0148199b16";
|
luks.devices."cryptroot".device = "/dev/disk/by-uuid/9de352ea-128f-4d56-a720-36d81dfd9b92";
|
||||||
luks.devices."cryptroot".preLVM = true;
|
|
||||||
};
|
};
|
||||||
kernelModules = [
|
kernelModules = [
|
||||||
"kvm-intel"
|
"kvm-intel"
|
||||||
"thinkpad_acpi"
|
"thinkpad_acpi"
|
||||||
"iwlwifi"
|
# "iwlwifi"
|
||||||
"i915"
|
"xe"
|
||||||
];
|
];
|
||||||
blacklistedKernelModules = [
|
kernelParams = [
|
||||||
"iTCO_wdt"
|
"quiet"
|
||||||
|
"xe.force_probe=7d55"
|
||||||
|
"i915.force_probe=!7d55"
|
||||||
|
# "resume_offset=2465529"
|
||||||
|
"intel_pstate=active"
|
||||||
|
"thinkpad_acpi.fan_control=1"
|
||||||
];
|
];
|
||||||
kernelParams = ["resume_offset=2465529" "intel_pstate=active" "i915.enable_gvt=1" "i915.enable_guc=3" "thinkpad_acpi.fan_control=1"];
|
# resumeDevice = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
resumeDevice = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
|
||||||
supportedFilesystems = ["btrfs"];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
"/" = {
|
"/" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"autodefrag"
|
||||||
"compress-force=zstd"
|
"compress-force=zstd"
|
||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@"
|
"subvol=@"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
neededForBoot = true;
|
neededForBoot = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
"/home" = {
|
"/home" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"autodefrag"
|
||||||
"compress-force=zstd"
|
"compress-force=zstd"
|
||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@home"
|
"subvol=@home"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"/.snapshots" = {
|
"/.snapshots" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
@ -62,38 +64,37 @@ _: {
|
|||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@snapshots"
|
"subvol=@snapshots"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"/var/log" = {
|
"/var/log" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"autodefrag"
|
||||||
"compress-force=zstd"
|
"compress-force=zstd"
|
||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@log"
|
"subvol=@log"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"/var/cache" = {
|
"/var/cache" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"autodefrag"
|
||||||
"compress-force=zstd"
|
"compress-force=zstd"
|
||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@cache"
|
"subvol=@cache"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"/etc/nixos" = {
|
"/etc/nixos" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
@ -105,32 +106,34 @@ _: {
|
|||||||
};
|
};
|
||||||
|
|
||||||
"/nix" = {
|
"/nix" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
|
"autodefrag"
|
||||||
"compress-force=zstd"
|
"compress-force=zstd"
|
||||||
"noatime"
|
"noatime"
|
||||||
"ssd"
|
"ssd"
|
||||||
"subvol=@nix-store"
|
"subvol=@nix-store"
|
||||||
"discard=async"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# TODO: setup swap
|
||||||
# ref: https://sawyershepherd.org/post/hibernating-to-an-encrypted-swapfile-on-btrfs-with-nixos/
|
# ref: https://sawyershepherd.org/post/hibernating-to-an-encrypted-swapfile-on-btrfs-with-nixos/
|
||||||
"/swap" = {
|
# "/swap" = {
|
||||||
device = "/dev/disk/by-uuid/d5c21883-f0e6-4e7a-b9a5-ee0bf4780ec5";
|
# device = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
fsType = "btrfs";
|
# fsType = "btrfs";
|
||||||
options = [
|
# options = [
|
||||||
"subvol=@swap"
|
# "subvol=@swap"
|
||||||
"noatime"
|
# "noatime"
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
|
|
||||||
"/boot" = {
|
"/boot" = {
|
||||||
device = "/dev/disk/by-uuid/90A5-35FF";
|
device = "/dev/disk/by-uuid/7FBB-9E80";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
swapDevices = [{device = "/swap/swapfile";}];
|
swapDevices = [];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user