diff --git a/flake.nix b/flake.nix index 86bd699..132dc2f 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,13 @@ url = "github:nix-community/NixOS-WSL/2311.5.3"; inputs.nixpkgs.follows = "nixpkgs"; }; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, home-manager, nixos-wsl }: + outputs = { self, nixpkgs, home-manager, nixos-wsl, disko }: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -32,6 +36,8 @@ ./src/system/machines/desktop home-manager.nixosModules.home-manager (import ./src/system/machines/desktop/modules/home-manager) + disko.nixosModules.disko + (import ./src/system/machines/desktop/modules/disko) ]; }; @@ -55,6 +61,7 @@ ]; }; }; + homeConfigurations."work" = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ diff --git a/src/system/machines/desktop/modules/disko/default.nix b/src/system/machines/desktop/modules/disko/default.nix index dcf22de..3dc5c09 100644 --- a/src/system/machines/desktop/modules/disko/default.nix +++ b/src/system/machines/desktop/modules/disko/default.nix @@ -1,4 +1,4 @@ -{ disks ? [ "/dev/nvme0n1" "/dev/sda" ], ... }: +{ disks ? [ "/dev/nvme0n1" "/dev/sdb" ], ... }: { disko.devices = { @@ -23,8 +23,8 @@ }; } { - start = "100M"; - end = "150G"; + start = "200M"; + end = "100%FREE"; content = { type = "lvm_pv"; vg = "stick"; @@ -44,7 +44,7 @@ partitions = [ { start = "0"; - end = "200G"; + end = "100%FREE"; content = { type = "lvm_pv"; vg = "ssd"; @@ -91,7 +91,7 @@ size = "1M"; }; home = { - size = "100%"; + size = "200G"; content = { name = "home"; type = "filesystem";