From 147ca052d4651d9ca16fe3bf18b6b911d68b85ef Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 1 Jul 2023 16:46:53 +0200 Subject: [PATCH] import ssh-cursed module --- configurations.nix | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/configurations.nix b/configurations.nix index 6c2e8c5..8441d78 100644 --- a/configurations.nix +++ b/configurations.nix @@ -34,6 +34,7 @@ let ./modules/hosts.nix ./modules/network.nix ./modules/zsh.nix + ./modules/ssh-cursed.nix disko.nixosModules.disko @@ -50,38 +51,41 @@ let , config , lib , ... - }: let - sopsFile = ./. + "/hosts/${config.networking.hostName}.yml"; - in { - nix.nixPath = [ - "home-manager=${home-manager}" - "nixpkgs=${pkgs.path}" - "nur=${nur}" - ]; - # TODO: share nixpkgs for each machine to speed up local evaluation. - #nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.${system}; + }: + let + sopsFile = ./. + "/hosts/${config.networking.hostName}.yml"; + in + { + nix.nixPath = [ + "home-manager=${home-manager}" + "nixpkgs=${pkgs.path}" + "nur=${nur}" + ]; + # TODO: share nixpkgs for each machine to speed up local evaluation. + #nixpkgs.pkgs = self.inputs.nixpkgs.legacyPackages.${system}; - #users.withSops = builtins.pathExists sopsFile; - #sops.secrets = lib.mkIf (config.users.withSops) { - # root-password-hash.neededForUsers = true; - #}; - # sops.defaultSopsFile = lib.mkIf (builtins.pathExists sopsFile) sopsFile; + #users.withSops = builtins.pathExists sopsFile; + #sops.secrets = lib.mkIf (config.users.withSops) { + # root-password-hash.neededForUsers = true; + #}; + # sops.defaultSopsFile = lib.mkIf (builtins.pathExists sopsFile) sopsFile; - nix.extraOptions = '' - flake-registry = ${flake-registry}/flake-registry.json - ''; + nix.extraOptions = '' + flake-registry = ${flake-registry}/flake-registry.json + builders-use-substitutes = true + ''; - nix.registry = { - home-manager.flake = home-manager; - nixpkgs.flake = nixpkgs; - nur.flake = nur; - }; - time.timeZone = "UTC"; + nix.registry = { + home-manager.flake = home-manager; + nixpkgs.flake = nixpkgs; + nur.flake = nur; + }; + time.timeZone = "UTC"; - environment.systemPackages = [ - pkgs.kitty.terminfo - ]; - }) + environment.systemPackages = [ + pkgs.kitty.terminfo + ]; + }) ]; in { @@ -94,8 +98,8 @@ in ++ [ ./hosts/epyc.nix ]; - }; }; + }; flake.colmena = { meta.nixpkgs = import nixpkgs { @@ -107,6 +111,6 @@ in ++ [ ./hosts/epyc.nix ]; - }; + }; }; }