From eb3f9e87435be5941278d819351bac0ece172051 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 20 Apr 2023 22:10:21 -0400 Subject: move to my external lib --- lib/default.nix | 16 ---------------- lib/host.nix | 44 -------------------------------------------- lib/user.nix | 35 ----------------------------------- 3 files changed, 95 deletions(-) delete mode 100644 lib/default.nix delete mode 100644 lib/host.nix delete mode 100644 lib/user.nix (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 94acb96..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{lib}: let - inherit (builtins) readDir; - inherit (lib) filterAttrs mapAttrs; - - my = { - mapFilterDirs = dir: filter: map: let - dirs = filterAttrs filter (readDir dir); - in - mapAttrs map dirs; - }; - - myLib = lib.extend (_: _: {inherit my;}); - common = {lib = myLib;}; -in - (import ./host.nix common) - // (import ./user.nix common) diff --git a/lib/host.nix b/lib/host.nix deleted file mode 100644 index 5b092b4..0000000 --- a/lib/host.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib}: rec { - mkHost = { - name, - modules, - specialArgs ? {}, - system ? "x86_64-linux", - stateVersion ? "22.11", - pkgs, - inputs, - }: - with pkgs.lib; - nixosSystem { - inherit system specialArgs; - modules = - [ - ../modules - ../hosts/${name} - - { - system.stateVersion = stateVersion; - networking.hostName = mkDefault name; - - nixpkgs = { - overlays = with inputs; [nur.overlay getchoo.overlays.default]; - config.allowUnfree = true; - }; - nix.registry.getchoo.flake = inputs.getchoo; - - nixos.enable = true; - } - ] - ++ modules; - }; - - mapHosts = inputs: let - hosts = import ../hosts inputs; - inherit (lib.my) mapFilterDirs; - in - mapFilterDirs ../hosts (n: v: v == "directory" && n != "turret") (name: _: - mkHost ({ - inherit name inputs; - } - // hosts.${name})); -} diff --git a/lib/user.nix b/lib/user.nix deleted file mode 100644 index 88e466f..0000000 --- a/lib/user.nix +++ /dev/null @@ -1,35 +0,0 @@ -{lib}: rec { - mkHMUser = { - username, - pkgs, - stateVersion ? "22.11", - modules ? [], - inputs, - }: - inputs.home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = - [ - ../users/${username}/home.nix - { - home = { - inherit username stateVersion; - homeDirectory = "/home/${username}"; - }; - - programs.home-manager.enable = true; - } - ] - ++ modules; - }; - - mapHMUsers = inputs: system: let - users = import ../users inputs system; - inherit (lib.my) mapFilterDirs; - in - mapFilterDirs ../users (n: v: v == "directory" && n != "secrets") (username: _: - mkHMUser ({ - inherit username inputs; - } - // users.${username})); -} -- cgit v1.2.3