From e837aaa8755d45028ba48b12bbac3231e86bf39b Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sat, 1 May 2021 17:47:43 -0700 Subject: [PATCH] lib: remove devos section --- lib/devos/default.nix | 30 ------------------- lib/devos/devosSystem.nix | 40 ------------------------- lib/devos/mkHosts.nix | 57 ------------------------------------ lib/devos/mkNodes.nix | 16 ---------- lib/devos/mkPackages.nix | 17 ----------- lib/devos/mkPkgs.nix | 25 ---------------- lib/devos/mkProfileAttrs.nix | 35 ---------------------- lib/devos/mkSuites.nix | 20 ------------- lib/devos/recImport.nix | 12 -------- 9 files changed, 252 deletions(-) delete mode 100644 lib/devos/default.nix delete mode 100644 lib/devos/devosSystem.nix delete mode 100644 lib/devos/mkHosts.nix delete mode 100644 lib/devos/mkNodes.nix delete mode 100644 lib/devos/mkPackages.nix delete mode 100644 lib/devos/mkPkgs.nix delete mode 100644 lib/devos/mkProfileAttrs.nix delete mode 100644 lib/devos/mkSuites.nix delete mode 100644 lib/devos/recImport.nix diff --git a/lib/devos/default.nix b/lib/devos/default.nix deleted file mode 100644 index 9a3118f5..00000000 --- a/lib/devos/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, utils }: -{ - # pkgImport :: Nixpkgs -> Overlays -> System -> Pkgs - pkgImport = nixpkgs: overlays: system: - import nixpkgs { - inherit system overlays; - config = { allowUnfree = true; }; - }; - - profileMap = list: map (profile: profile.default) (lib.flatten list); - - mkNodes = import ./mkNodes.nix { inherit lib; }; - - mkHosts = import ./mkHosts.nix { inherit lib; }; - - mkSuites = import ./mkSuites.nix { inherit lib; }; - - mkProfileAttrs = import ./mkProfileAttrs.nix { inherit lib; }; - - mkPkgs = import ./mkPkgs.nix { inherit lib utils; }; - - recImport = import ./recImport.nix { inherit lib; }; - - devosSystem = import ./devosSystem.nix { inherit lib; }; - - mkHomeConfigurations = import ./mkHomeConfigurations.nix { inherit lib; }; - - mkPackages = import ./mkPackages.nix { inherit lib; }; -} - diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix deleted file mode 100644 index c48f68a5..00000000 --- a/lib/devos/devosSystem.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib }: - -# dependencies to return a builder -{ self, inputs }: - -{ modules, specialArgs, ... } @ args: -let inherit (specialArgs.channel.input.lib) nixosSystem; in -nixosSystem - (args // { - modules = - let - fullHostConfig = (nixosSystem (args // { inherit modules; })).config; - - isoConfig = (nixosSystem - (args // { - modules = modules ++ [ - (lib.modules.iso { inherit self inputs fullHostConfig; }) - ]; - })).config; - - hmConfig = (nixosSystem - (args // { - modules = modules ++ [ - (lib.modules.hmConfig) - ]; - })).config; - in - modules ++ [{ - system.build = { - iso = isoConfig.system.build.isoImage; - homes = hmConfig.home-manager.users; - }; - lib = { - inherit specialArgs; - testModule = { - imports = modules; - }; - }; - }]; - }) diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix deleted file mode 100644 index 2fe4ed36..00000000 --- a/lib/devos/mkHosts.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib }: - -{ self, nixos, inputs, dir, extern, suites, overrides, multiPkgs }: -let - defaultSystem = "x86_64-linux"; - - modules = with lib.modules; { - modOverrides = modOverrides { inherit overrides; }; - hmDefaults = hmDefaults { - inherit extern; - inherit (self) homeModules; - userSuites = suites.user; - }; - globalDefaults = globalDefaults { - inherit self nixos inputs multiPkgs; - }; - cachix = cachix { inherit self; }; - flakeModules = flakeModules { inherit self extern; }; - }; - - specialArgs = extern.specialArgs // { suites = suites.system; }; - - mkHostConfig = hostName: - let - local = { - require = [ - "${dir}/${hostName}.nix" - ]; - - networking = { inherit hostName; }; - - _module.args = { - self = self; - hosts = builtins.mapAttrs (_: host: host.config) - (removeAttrs hosts [ hostName ]); - }; - - lib = { inherit specialArgs; }; - lib.testModule = { - imports = builtins.attrValues modules; - }; - - }; - in - lib.os.devosSystem { - inherit self nixos inputs specialArgs; - system = defaultSystem; - modules = modules // { inherit local; }; - }; - - hosts = lib.os.recImport - { - inherit dir; - _import = mkHostConfig; - }; -in -hosts diff --git a/lib/devos/mkNodes.nix b/lib/devos/mkNodes.nix deleted file mode 100644 index 83906ce8..00000000 --- a/lib/devos/mkNodes.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib }: - -/** - Synopsis: mkNodes _nixosConfigurations_ - - Generate the `nodes` attribute expected by deploy-rs - where _nixosConfigurations_ are `nodes`. - **/ -deploy: lib.mapAttrs (_: config: { - hostname = config.config.networking.hostName; - - profiles.system = { - user = "root"; - path = deploy.lib.x86_64-linux.activate.nixos config; - }; -}) diff --git a/lib/devos/mkPackages.nix b/lib/devos/mkPackages.nix deleted file mode 100644 index d8992685..00000000 --- a/lib/devos/mkPackages.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib }: - -{ overlay, overlays, pkgs }: -let - packagesNames = lib.attrNames (overlay null null) - ++ lib.attrNames (lib.concatAttrs - (lib.attrValues - (lib.mapAttrs (_: v: v null null) overlays) - ) - ); -in -lib.fold - (key: sum: lib.recursiveUpdate sum { - ${key} = pkgs.${key}; - }) -{ } - packagesNames diff --git a/lib/devos/mkPkgs.nix b/lib/devos/mkPkgs.nix deleted file mode 100644 index a7cf2366..00000000 --- a/lib/devos/mkPkgs.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, utils }: - -{ self, nixos, inputs, extern, overrides }: -(utils.lib.eachDefaultSystem - (system: - let - overridePkgs = lib.os.pkgImport inputs.override [ ] system; - overridesOverlay = overrides.packages; - - overlays = [ - (final: prev: { - lib = prev.lib.extend (lfinal: lprev: { - inherit lib; - inherit (lib) nixosSystem; - }); - }) - (overridesOverlay overridePkgs) - self.overlay - ] - ++ extern.overlays - ++ (lib.attrValues self.overlays); - in - { pkgs = lib.os.pkgImport nixos overlays system; } - ) -).pkgs diff --git a/lib/devos/mkProfileAttrs.nix b/lib/devos/mkProfileAttrs.nix deleted file mode 100644 index cdfc32e7..00000000 --- a/lib/devos/mkProfileAttrs.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib }: - -let mkProfileAttrs = - /** - Synopsis: mkProfileAttrs _path_ - - Recursively collect the subdirs of _path_ containing a default.nix into attrs. - This sets a contract, eliminating ambiguity for _default.nix_ living under the - profile directory. - - Example: - let profiles = mkProfileAttrs ./profiles; in - assert profiles ? core.default; 0 - **/ - dir: - let - imports = - let - files = lib.safeReadDir dir; - - p = n: v: - v == "directory" - && n != "profiles"; - in - lib.filterAttrs p files; - - f = n: _: - lib.optionalAttrs - (lib.pathExists "${dir}/${n}/default.nix") - { default = "${dir}/${n}"; } - // mkProfileAttrs "${dir}/${n}"; - in - lib.mapAttrs f imports; -in mkProfileAttrs - diff --git a/lib/devos/mkSuites.nix b/lib/devos/mkSuites.nix deleted file mode 100644 index 45d8a10f..00000000 --- a/lib/devos/mkSuites.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib }: - -{ suites, profiles } @ args: -let - inherit (lib) os; - - profileSet = lib.genAttrs' profiles (path: { - name = baseNameOf path; - value = os.mkProfileAttrs (toString path); - }); - - definedSuites = suites profileSet; - - allProfiles = lib.collectProfiles profileSet; -in -lib.mapAttrs (_: v: os.profileMap v) definedSuites // { - inherit allProfiles; -} - - diff --git a/lib/devos/recImport.nix b/lib/devos/recImport.nix deleted file mode 100644 index c96c9352..00000000 --- a/lib/devos/recImport.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib }: - -{ dir, _import ? base: import "${dir}/${base}.nix" }: -lib.mapFilterAttrs - (_: v: v != null) - (n: v: - if n != "default.nix" && lib.hasSuffix ".nix" n && v == "regular" - then - let name = lib.removeSuffix ".nix" n; in lib.nameValuePair (name) (_import name) - else - lib.nameValuePair ("") (null)) - (lib.safeReadDir dir)