From 67768361c2b0b6fe4c187523675c4196fea87c8a Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Sun, 18 May 2025 14:18:33 +0800 Subject: [PATCH] feat(flake.nix): convert flake to snowfall-lib --- device.txt | 1 - flake.lock | 93 ++++++++++++++++++- flake.nix | 20 ++-- .../x86_64-linux/nemesis/default.nix | 0 .../x86_64-linux/nemesis/disko.nix | 2 +- 5 files changed, 104 insertions(+), 12 deletions(-) delete mode 100644 device.txt rename configuration.nix => systems/x86_64-linux/nemesis/default.nix (100%) rename disko.nix => systems/x86_64-linux/nemesis/disko.nix (98%) diff --git a/device.txt b/device.txt deleted file mode 100644 index 46b2b36..0000000 --- a/device.txt +++ /dev/null @@ -1 +0,0 @@ -/dev/disk/by-id/nvme-CT2000P3SSD8_2325E6E77434 diff --git a/flake.lock b/flake.lock index 62198bc..23476ee 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,59 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1747327360, @@ -39,7 +92,45 @@ "root": { "inputs": { "disko": "disko", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "snowfall-lib": "snowfall-lib" + } + }, + "snowfall-lib": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils-plus": "flake-utils-plus", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736130495, + "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 31265ae..d8f2c11 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,17 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; + snowfall-lib.url = "github:snowfallorg/lib"; + snowfall-lib.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs: { - nixosConfigurations.nemesis = inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - inputs.disko.nixosModules.disko - ./configuration.nix - ]; - }; - }; + outputs = inputs: + inputs.snowfall-lib.mkFlake { + inherit inputs; + src = ./.; + snowfall.namespace = "pantheon"; + systems.modules.nixos = with inputs; [ + inputs.disko.nixosModules.disko + ]; + }; } diff --git a/configuration.nix b/systems/x86_64-linux/nemesis/default.nix similarity index 100% rename from configuration.nix rename to systems/x86_64-linux/nemesis/default.nix diff --git a/disko.nix b/systems/x86_64-linux/nemesis/disko.nix similarity index 98% rename from disko.nix rename to systems/x86_64-linux/nemesis/disko.nix index 7233e13..8be163a 100644 --- a/disko.nix +++ b/systems/x86_64-linux/nemesis/disko.nix @@ -1,4 +1,4 @@ -{lib, device,...}: +{lib, device, ...}: { boot.initrd.postDeviceCommands = lib.mkAfter '' mkdir /btrfs_tmp