From 7a0f467c507d0cacc6959b1daf20b3016682101d Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Sat, 28 Dec 2024 15:16:39 +0100 Subject: [PATCH] Added new disco config --- flake.nix | 2 +- nixos/hosts/kylekrein-homepc/default.nix | 2 +- ...nence-disko.nix => impermanence-btrfs.nix} | 0 nixos/modules/disko/impermanence-tmpfs.nix | 51 +++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) rename nixos/modules/disko/{impermanence-disko.nix => impermanence-btrfs.nix} (100%) create mode 100644 nixos/modules/disko/impermanence-tmpfs.nix diff --git a/flake.nix b/flake.nix index c011a92..74cc5fb 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ pkgs = import nixpkgs { }; }; modules = [ - (import ./nixos/modules/disko/impermanence-disko.nix { device = "/dev/nvme0n1"; } ) + (import ./nixos/modules/disko/impermanence-btrfs.nix { device = "/dev/nvme0n1"; } ) ./nixos/configuration.nix #nix-flatpak.nixosModules.default ]; diff --git a/nixos/hosts/kylekrein-homepc/default.nix b/nixos/hosts/kylekrein-homepc/default.nix index 594ccd2..263391d 100644 --- a/nixos/hosts/kylekrein-homepc/default.nix +++ b/nixos/hosts/kylekrein-homepc/default.nix @@ -13,7 +13,7 @@ ../../users/tania ]; - environment.systemPackages = [ + environment.systemPackages = with pkgs;[ blender #inputs.nix-gaming.packages.${pkgs.system}.star-citizen diff --git a/nixos/modules/disko/impermanence-disko.nix b/nixos/modules/disko/impermanence-btrfs.nix similarity index 100% rename from nixos/modules/disko/impermanence-disko.nix rename to nixos/modules/disko/impermanence-btrfs.nix diff --git a/nixos/modules/disko/impermanence-tmpfs.nix b/nixos/modules/disko/impermanence-tmpfs.nix new file mode 100644 index 0000000..325e529 --- /dev/null +++ b/nixos/modules/disko/impermanence-tmpfs.nix @@ -0,0 +1,51 @@ +{ + device ? throw "Set this to your disk device, e.g. /dev/sda", + ... +}: { + disko.devices = { + disk.main = { + inherit device; + type = "disk"; + content = { + type = "gpt"; + partitions = { + boot = { + name = "boot"; + size = "1M"; + type = "EF02"; + }; + esp = { + name = "ESP"; + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + root = { + name = "root"; + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/persist"; + }; + }; + }; + }; + }; + nodev = { + "/" = { + fsType = "tmpfs"; + }; + "/nix" = { + device = "/persist/nix"; + }; + "/tmp" = { + device = "/persist/tmp"; + }; + }; + }; +}