From 1e3a1e097700333e4dcd9fc18c62393404565d35 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 28 Jun 2025 17:34:02 -0500 Subject: [PATCH] Reset protostar --- linux/protostar/default.nix | 1 - linux/protostar/disko.nix | 48 +++-------------------------------- linux/protostar/gui.nix | 3 --- linux/protostar/syncthing.nix | 4 +-- linux/quasar/gui.nix | 1 - 5 files changed, 6 insertions(+), 51 deletions(-) diff --git a/linux/protostar/default.nix b/linux/protostar/default.nix index 1e51006..fc223c1 100644 --- a/linux/protostar/default.nix +++ b/linux/protostar/default.nix @@ -10,6 +10,5 @@ ./network.nix ./syncthing.nix ./tailscale.nix - ./zfs.nix ]; } diff --git a/linux/protostar/disko.nix b/linux/protostar/disko.nix index 296335d..6b2fd49 100644 --- a/linux/protostar/disko.nix +++ b/linux/protostar/disko.nix @@ -15,56 +15,16 @@ mountpoint = "/boot"; }; }; - zfs = { + root = { size = "100%"; content = { - type = "zfs"; - pool = "zroot"; + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; }; }; }; }; }; - - # Construct the primary zfs pool for this system. - zpool.zroot = { - type = "zpool"; - options = { - ashift = "12"; - autotrim = "on"; - listsnapshots = "on"; - }; - rootFsOptions = { - acltype = "posix"; - atime = "off"; - compression = "zstd"; - dnodesize = "auto"; - mountpoint = "none"; - normalization = "formD"; - xattr = "sa"; - }; - datasets = { - # Create dataset for home - home = { - type = "zfs_fs"; - mountpoint = "/home"; - }; - # Create dataset for nix store - nix = { - type = "zfs_fs"; - mountpoint = "/nix"; - }; - # Create dataset for root - root = { - type = "zfs_fs"; - mountpoint = "/"; - }; - # Reserve space for performance - reservation = { - type = "zfs_fs"; - options.refreservation = "128G"; - }; - }; - }; }; } diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index ce423af..6a2214b 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -11,11 +11,8 @@ in { home = { file.".local/share/fonts".source = config.lib.file.mkOutOfStoreSymlink "/run/current-system/sw/share/X11/fonts"; packages = with jovianPkgs; [ - feishin lutris - maliit-keyboard retroarchFull - ryujinx winetricks wineWowPackages.stagingFull ]; diff --git a/linux/protostar/syncthing.nix b/linux/protostar/syncthing.nix index 74b600d..47fdb33 100644 --- a/linux/protostar/syncthing.nix +++ b/linux/protostar/syncthing.nix @@ -4,12 +4,12 @@ settings.folders = { game-data = { devices = ["quasar"]; - path = "~/Game/data"; + path = "~/游戏/data"; type = "receiveonly"; }; game-save = { devices = ["quasar"]; - path = "~/Game/save"; + path = "~/游戏/save"; }; }; }; diff --git a/linux/quasar/gui.nix b/linux/quasar/gui.nix index 779af25..edba961 100644 --- a/linux/quasar/gui.nix +++ b/linux/quasar/gui.nix @@ -23,7 +23,6 @@ in { picard qbittorrent retroarchFull - ryujinx telegram-desktop thunderbird via