From d0c36ab44271ec51c5fb46661773cab7d8cc76f0 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Fri, 6 Jun 2025 21:38:16 +0000 Subject: [PATCH] remove disko --- disk-config.nix | 63 ------------------------------------------------- flake.nix | 8 +------ 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 disk-config.nix diff --git a/disk-config.nix b/disk-config.nix deleted file mode 100644 index e0561dc..0000000 --- a/disk-config.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - disko.devices = { - disk = { - x = { - device = "/dev/nvme0n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - # boot - ESP = { - size = "64M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - # root - zfs = { - size = "100%"; - content = { - type = "zfs"; - pool = "zroot"; - }; - }; - }; - }; - }; - }; - zpool = { - zroot = { - type = "zpool"; - # options.cachefile = "none"; - rootFsOptions = { - compression = "zstd"; - "com.sun:auto-snapshot" = "false"; - }; - - datasets = { - "root" = { - type = "zfs_fs"; - options.mountpoint = "/"; - mountpoint = "/"; - postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/root@blank$' || zfs snapshot zroot/root@blank"; - }; - "nix" = { - type = "zfs_fs"; - options.mountpoint = "/nix"; - mountpoint = "/nix"; - }; - "persist" = { - type = "zfs_fs"; - options.mountpoint = "/persist"; - mountpoint = "/persist"; - }; - }; - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index b740fd1..88fe231 100755 --- a/flake.nix +++ b/flake.nix @@ -16,23 +16,17 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, nixvim, home-manager, impermanence, sops-nix, disko }@inputs: { + outputs = { self, nixpkgs, nixvim, home-manager, impermanence, sops-nix }@inputs: { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix ./hardware-configuration.nix - ./disk-config.nix impermanence.nixosModules.impermanence sops-nix.nixosModules.sops - disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;