diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2023-05-16 06:55:24 -0400 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2023-05-16 06:55:24 -0400 |
commit | dc3b68387864e6af9038c704d4b229d3533005ca (patch) | |
tree | cd41c005dacfb9c869cd29cc6080d915925e2130 | |
parent | 397acb309c245c52064eb2500c3ee3df2bbfc97f (diff) |
config changes
-rw-r--r-- | machines/dragon.nix | 32 | ||||
-rw-r--r-- | modules/nextcloud.nix | 1 |
2 files changed, 11 insertions, 22 deletions
diff --git a/machines/dragon.nix b/machines/dragon.nix index bc585ec..3a5e8ba 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -105,18 +105,6 @@ in { ''; }; - fileSystems = { - "/storage" = { - device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3"; - fsType = "btrfs"; - options = [ "subvol=storage" ]; - }; - "/staging" = { - device = "/dev/sda3"; - fsType = "btrfs"; - options = [ "subvol=staging" ]; - }; - }; users.users.breakds = { uid = 1101; @@ -135,24 +123,24 @@ in { [ "ehci_pci" "ahci" "uhci_hcd" "xhci_pci" "usb_storage" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.tmpOnTmpfs = true; fileSystems."/" = { + device = "/dev/disk/by-label/nixos-ssd"; + fsType = "ext4"; + options = [ + "noatime,discard" + ]; + }; + fileSystems."/storage" = { device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3"; fsType = "btrfs"; options = [ - "subvol=system/dragon-nixos,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,degraded" + "subvol=storage,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part3,device=/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part3,noatime,discard" ]; }; - fileSystems."/mnt/boot1" = { - device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X-part4"; - options = ["nofail"]; - }; - fileSystems."/mnt/boot2" = { - device = "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKHV0LS-part4"; - options = ["nofail"]; - }; - swapDevices = [ ]; + swapDevices = [ { label = "swap"; } ]; nix.settings.trusted-users = [ "builder" ]; nix.settings.max-jobs = lib.mkDefault 8; diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index 1f6bde3..4c3ed17 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -14,6 +14,7 @@ in enable = true; package = pkgs.nextcloud25; hostName = "nextcloud.orbekk.com"; + home = "/storage/nextcloud"; enableBrokenCiphersForSSE = false; config = { dbtype = "pgsql"; |