From 9889a415dfa9c5c93949651c691bc2e247a0c110 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Wed, 29 Dec 2021 16:41:31 +0100
Subject: [PATCH] Merged utils with lib
---
flake.nix | 4 ++--
lib/default.nix | 12 +++++++-----
utils.nix | 38 --------------------------------------
3 files changed, 9 insertions(+), 45 deletions(-)
delete mode 100644 utils.nix
diff --git a/flake.nix b/flake.nix
index 043750f..b489496 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,10 +30,10 @@
outputs = { self, home-manager, nixpkgs, unstable, sops-nix, neovim-nightly-overlay, nur, ... }@inputs:
let
- utils = import ./utils.nix { inherit nixpkgs sops-nix home-manager inputs; nixpkgs-unstable = unstable; };
pkgs = import nixpkgs { system = "x86_64-linux"; };
+ lib = nixpkgs.lib.extend (import ./lib inputs);
in
- with utils;
+ with lib;
{
nixosModules = builtins.listToAttrs (map
(x: {
diff --git a/lib/default.nix b/lib/default.nix
index 490c652..982f4c7 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,6 @@
-{ nixpkgs, home-manager, sops-nix, nixpkgs-unstable, inputs }:
-with builtins;
+inputs: final: prev:
+
+with builtins; with inputs;
let
overlay-unstable = final: prev: {
@@ -14,7 +15,7 @@ in
inherit inputs;
};
modules = builtins.attrValues modules ++ [
- ./base.nix
+ ../base.nix
sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
@@ -25,8 +26,8 @@ in
overlay-unstable
(final: prev:
{
- tinystatus = prev.pkgs.callPackage ./packages/tinystatus {};
- mosh = prev.pkgs.callPackage ./packages/mosh {};
+ tinystatus = prev.pkgs.callPackage ../packages/tinystatus {};
+ mosh = prev.pkgs.callPackage ../packages/mosh {};
})
];
}
@@ -36,3 +37,4 @@ in
importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
}
+
diff --git a/utils.nix b/utils.nix
deleted file mode 100644
index 490c652..0000000
--- a/utils.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ nixpkgs, home-manager, sops-nix, nixpkgs-unstable, inputs }:
-with builtins;
-
-let
- overlay-unstable = final: prev: {
- unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
- };
-in
-{
-
- mkMachine = host: host-config: modules: nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- specialArgs = {
- inherit inputs;
- };
- modules = builtins.attrValues modules ++ [
- ./base.nix
- sops-nix.nixosModules.sops
- host-config
- home-manager.nixosModules.home-manager
- {
- home-manager.useUserPackages = true;
- nixpkgs.overlays = [
- inputs.neovim-nightly-overlay.overlay
- overlay-unstable
- (final: prev:
- {
- tinystatus = prev.pkgs.callPackage ./packages/tinystatus {};
- mosh = prev.pkgs.callPackage ./packages/mosh {};
- })
- ];
- }
- ];
- };
-
- importConfig = with builtins; path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
-
-}