Compare commits
No commits in common. "147ca052d4651d9ca16fe3bf18b6b911d68b85ef" and "5e9b7b77327fc1af9969da8d09ff1027fac9608c" have entirely different histories.
147ca052d4
...
5e9b7b7732
2 changed files with 30 additions and 70 deletions
|
@ -34,7 +34,6 @@ let
|
|||
./modules/hosts.nix
|
||||
./modules/network.nix
|
||||
./modules/zsh.nix
|
||||
./modules/ssh-cursed.nix
|
||||
|
||||
|
||||
disko.nixosModules.disko
|
||||
|
@ -51,41 +50,38 @@ 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
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
nix.extraOptions = ''
|
||||
flake-registry = ${flake-registry}/flake-registry.json
|
||||
'';
|
||||
|
||||
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
|
||||
{
|
||||
|
@ -98,8 +94,8 @@ in
|
|||
++ [
|
||||
./hosts/epyc.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
flake.colmena = {
|
||||
meta.nixpkgs = import nixpkgs {
|
||||
|
@ -111,6 +107,6 @@ in
|
|||
++ [
|
||||
./hosts/epyc.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
{
|
||||
programs.ssh.extraConfig = ''
|
||||
Host telecom-bastion
|
||||
HostName ssh.enst.fr
|
||||
User jmalka
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
|
||||
Host lame11
|
||||
Hostname lame11.enst.fr
|
||||
User nix-remote-builder
|
||||
ProxyJump telecom-bastion
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
Host lame10
|
||||
Hostname lame10.enst.fr
|
||||
User nix-remote-builder
|
||||
ProxyJump telecom-bastion
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
Host lame12
|
||||
Hostname lame12.enst.fr
|
||||
User nix-remote-builder
|
||||
ProxyJump telecom-bastion
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
Host lame16
|
||||
Hostname lame16.enst.fr
|
||||
User nix-remote-builder
|
||||
ProxyJump telecom-bastion
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
Host lame17
|
||||
Hostname lame17.enst.fr
|
||||
User nix-remote-builder
|
||||
ProxyJump telecom-bastion
|
||||
IdentityFile /home/luj/.ssh/id_ed25519
|
||||
|
||||
'';
|
||||
|
||||
}
|
Reference in a new issue