refactor user import

This commit is contained in:
Julien Malka 2024-03-30 21:36:12 +01:00
parent 76487f4e42
commit cc5eb4946c
Signed by: Luj
GPG key ID: 6FC74C847011FD83
9 changed files with 17 additions and 31 deletions

View file

@ -2,6 +2,11 @@
{ {
imports = [
../users/default.nix
../users/julien.nix
];
luj.nix.enable = true; luj.nix.enable = true;
#luj.secrets.enable = true; #luj.secrets.enable = true;
luj.ssh-server.enable = true; luj.ssh-server.enable = true;
@ -17,7 +22,6 @@
keyMap = lib.mkForce "fr"; keyMap = lib.mkForce "fr";
}; };
programs.gnupg.agent.enable = true; programs.gnupg.agent.enable = true;
networking.firewall.enable = true; networking.firewall.enable = true;
@ -68,5 +72,4 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ=
]; ];
} }

View file

@ -4,8 +4,6 @@
imports = imports =
[ [
./hardware.nix ./hardware.nix
../../users/default.nix
../../users/julien.nix
./home-julien.nix ./home-julien.nix
]; ];

View file

@ -4,8 +4,6 @@
imports = imports =
[ [
./hardware.nix ./hardware.nix
../../users/default.nix
../../users/julien.nix
./home-julien.nix ./home-julien.nix
]; ];

View file

@ -5,8 +5,6 @@
[ [
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
]; ];
networking.hostName = "enigma"; networking.hostName = "enigma";

View file

@ -3,8 +3,6 @@
imports = [ imports = [
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
]; ];
# Boot stuff # Boot stuff

View file

@ -5,8 +5,6 @@
[ [
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

View file

@ -5,8 +5,6 @@
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
]; ];

View file

@ -3,11 +3,8 @@
{ {
imports = imports =
[ [
# Include the results of the hardware scan.
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
]; ];
# Bootloader. # Bootloader.

View file

@ -5,8 +5,6 @@
[ [
./hardware.nix ./hardware.nix
./home-julien.nix ./home-julien.nix
../../users/julien.nix
../../users/default.nix
../../share.nix ../../share.nix
]; ];
@ -99,26 +97,26 @@
]; ];
networking.wireguard.interfaces.rezo = { networking.wireguard.interfaces.rezo = {
ips = [ "fd81:fb3a:50cc::200/128" ]; ips = [ "fd81:fb3a:50cc::200/128" ];
privateKeyFile = "/root/wg-private"; privateKeyFile = "/root/wg-private";
peers = [ peers = [
{ {
publicKey = "srQPT9ZjXBKyJ7R1mvXYMZNy+NcnHMy5qE1WGZDfmnc="; publicKey = "srQPT9ZjXBKyJ7R1mvXYMZNy+NcnHMy5qE1WGZDfmnc=";
allowedIPs = [ "fd81:fb3a:50cc::/48" ]; allowedIPs = [ "fd81:fb3a:50cc::/48" ];
endpoint = "129.199.146.230:25351"; endpoint = "129.199.146.230:25351";
} }
]; ];
}; };
services.hash-collection = { services.hash-collection = {
enable = true; enable = true;
retries = 1; retries = 1;
collection-url = "http://localhost:8000"; collection-url = "http://localhost:8000";
tokenFile = "/home/julien/token"; tokenFile = "/home/julien/token";
}; };
services.printing.enable = true; services.printing.enable = true;
services.avahi.enable = true; services.avahi.enable = true;