diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2023-02-18 11:33:51 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2023-02-19 10:56:40 -0500 |
commit | d44eb92d194479c6ec6065f25bb3ae5693bc2858 (patch) | |
tree | e80c06ec2e8cf940eec897a71a8daed1e78ac4cd | |
parent | a6cd73f727a2a8667c790710019b4aab5ae02e79 (diff) |
formatting
-rw-r--r-- | flake.nix | 70 |
1 files changed, 35 insertions, 35 deletions
@@ -10,25 +10,25 @@ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, emacs-overlay, agenix }: let pkgs-module = { config, ... }: - let - cfg = config.nixpkgs; + let + cfg = config.nixpkgs; - extra-packages = final: prev: { - agenix = agenix.packages.${final.system}.default; - }; + extra-packages = final: prev: { + agenix = agenix.packages.${final.system}.default; + }; - unstable-overlay = final: prev: rec { - unstable = import nixpkgs-unstable { - inherit (cfg) config localSystem crossSystem; - }; - }; - in { - nixpkgs.pkgs = import nixpkgs { + unstable-overlay = final: prev: rec { + unstable = import nixpkgs-unstable { inherit (cfg) config localSystem crossSystem; - overlays = cfg.overlays - ++ [ unstable-overlay extra-packages emacs-overlay.overlay ]; }; }; + in { + nixpkgs.pkgs = import nixpkgs { + inherit (cfg) config localSystem crossSystem; + overlays = cfg.overlays + ++ [ unstable-overlay extra-packages emacs-overlay.overlay ]; + }; + }; registry-module = { ... }: { nix.registry.nixpkgs.flake = nixpkgs; @@ -39,8 +39,8 @@ orbekk-modules = let moduleFiles = lib.attrNames - (lib.filterAttrs (n: v: lib.hasSuffix ".nix" n && v == "regular") - (builtins.readDir ./modules)); + (lib.filterAttrs (n: v: lib.hasSuffix ".nix" n && v == "regular") + (builtins.readDir ./modules)); moduleNames = map (lib.removeSuffix ".nix") moduleFiles; @@ -57,8 +57,8 @@ let pkgs = import nixpkgs { system = "x86_64-linux"; }; in { }; - nixosConfigurations = let - mkConfig = { hostName, module ? (./. + "/machines/${hostName}.nix") + nixosConfigurations = let + mkConfig = { hostName, module ? (./. + "/machines/${hostName}.nix") , system ? "x86_64-linux" }: { name = hostName; value = lib.nixosSystem { @@ -75,27 +75,27 @@ # of this flake. system.configurationRevision = let lastModified = pkgs.lib.substring 0 8 - (self.lastModifiedDate or self.lastModified or "19700101"); + (self.lastModifiedDate or self.lastModified or "19700101"); in "${lastModified}.${self.shortRev or "dirty"}"; }) ]; }; }; - myMachines = [ - { - hostName = "pincer"; - module = ./machines/x1-pincer.nix; - } - { hostName = "dragon"; } - { hostName = "firelink"; } - { hostName = "tiny1"; } - { - hostName = "minideck"; - } - # { hostName = "testvm"; module = { - # users.users.orbekk.initialHashedPassword = ""; - # }; } - ]; - in builtins.listToAttrs (map mkConfig myMachines); + myMachines = [ + { + hostName = "pincer"; + module = ./machines/x1-pincer.nix; + } + { hostName = "dragon"; } + { hostName = "firelink"; } + { hostName = "tiny1"; } + { + hostName = "minideck"; + } + # { hostName = "testvm"; module = { + # users.users.orbekk.initialHashedPassword = ""; + # }; } + ]; + in builtins.listToAttrs (map mkConfig myMachines); }; } |