From 1bcf87a248f64d281b49332db35d5ef6f472f7f8 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <Zynh0722@gmail.com>
Date: Wed, 26 Feb 2025 02:42:05 -0800
Subject: [PATCH] welcome flake-parts
---
flake.lock | 49 ++++++++++++++++++++++++++++++++++++--------
flake.nix | 60 +++++++++++++++++++++++++++++-------------------------
2 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/flake.lock b/flake.lock
index b179162..8fe2b07 100644
--- a/flake.lock
+++ b/flake.lock
@@ -168,6 +168,24 @@
}
},
"flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1738453229,
+ "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"neovim-overlay",
@@ -188,7 +206,7 @@
"type": "github"
}
},
- "flake-parts_2": {
+ "flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"neovim-overlay",
@@ -209,9 +227,9 @@
"type": "indirect"
}
},
- "flake-parts_3": {
+ "flake-parts_4": {
"inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
+ "nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1738453229,
@@ -227,9 +245,9 @@
"type": "github"
}
},
- "flake-parts_4": {
+ "flake-parts_5": {
"inputs": {
- "nixpkgs-lib": "nixpkgs-lib_2"
+ "nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1733312601,
@@ -339,7 +357,7 @@
},
"hercules-ci-effects": {
"inputs": {
- "flake-parts": "flake-parts_2",
+ "flake-parts": "flake-parts_3",
"nixpkgs": [
"neovim-overlay",
"nixpkgs"
@@ -460,7 +478,7 @@
"neovim-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts",
+ "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
@@ -599,7 +617,7 @@
},
"nix-gaming": {
"inputs": {
- "flake-parts": "flake-parts_3",
+ "flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_2"
},
"locked": {
@@ -668,6 +686,18 @@
}
},
"nixpkgs-lib_2": {
+ "locked": {
+ "lastModified": 1738452942,
+ "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ }
+ },
+ "nixpkgs-lib_3": {
"locked": {
"lastModified": 1733096140,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
@@ -749,6 +779,7 @@
"deploy-rs": "deploy-rs",
"dunst-theme": "dunst-theme",
"fish_theme": "fish_theme",
+ "flake-parts": "flake-parts",
"home-manager": "home-manager_2",
"lix-module": "lix-module",
"neovim-overlay": "neovim-overlay",
@@ -927,7 +958,7 @@
},
"zdwl": {
"inputs": {
- "flake-parts": "flake-parts_4",
+ "flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
]
diff --git a/flake.nix b/flake.nix
index 6b1b23e..5c62dc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,38 +24,42 @@
umu = { url = "github:Open-Wine-Components/umu-launcher?dir=packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; };
deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
+
+ flake-parts.url = "github:hercules-ci/flake-parts";
};
- outputs =
- { self, nixpkgs, deploy-rs, ... }@inputs:
- let
- builders = import ./builders.nix inputs;
- in
- {
- nixosConfigurations = builders.compileNixosSystems [
- { hostname = "snowhawk"; }
- ];
-
- darwinConfigurations = builders.compileDarwinSystems [
- { hostname = "lynx"; }
- ];
-
- homeConfigurations = builders.compileHomes [
- { user = "zynh"; hostname = "msiserver"; }
- { user = "val"; hostname = "caveserver"; }
- { user = "ravenshade"; hostname = "permafrost"; }
- ];
-
- deploy =
- let homeConfigPath = username: deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.${username};
+ outputs = inputs@{ flake-parts, deploy-rs, nixpkgs, self, ... }:
+ flake-parts.lib.mkFlake { inherit inputs; } {
+ flake =
+ let builders = import ./builders.nix inputs;
in {
- sshUser = "ravenshade";
- nodes.permafrost = {
- hostname = "permafrost";
- profiles.home.path = homeConfigPath "ravenshade@permafrost";
- };
+ nixosConfigurations = builders.compileNixosSystems [
+ { hostname = "snowhawk"; }
+ ];
+
+ darwinConfigurations = builders.compileDarwinSystems [
+ { hostname = "lynx"; }
+ ];
+
+ homeConfigurations = builders.compileHomes [
+ { user = "zynh"; hostname = "msiserver"; }
+ { user = "val"; hostname = "caveserver"; }
+ { user = "ravenshade"; hostname = "permafrost"; }
+ ];
+
+ deploy =
+ let homeConfigPath = username: deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.${username};
+ in {
+ sshUser = "ravenshade";
+ nodes.permafrost = {
+ hostname = "permafrost";
+ profiles.home.path = homeConfigPath "ravenshade@permafrost";
+ };
+ };
+
+ overlays.default = import ./pkgs;
};
- overlays.default = import ./pkgs;
+ systems = [ ];
};
}