restructure and rename directories

This commit is contained in:
Pim Kunis 2023-10-22 22:30:51 +02:00
parent 81313d1d5d
commit 36b2ded537
23 changed files with 29 additions and 20 deletions

View file

@ -25,7 +25,7 @@
system = "x86_64-linux";
modules = [
{ nixpkgs.overlays = [ nur.overlay ]; }
./configuration.nix
./nixos
agenix.nixosModules.default
nixos-hardware.nixosModules.lenovo-thinkpad-x260
home-manager.nixosModules.home-manager {
@ -33,7 +33,7 @@
home-manager.useUserPackages = true;
home-manager.users.pim = {
imports = [
./home
./home-manager
homeage.homeManagerModules.homeage
];
};

View file

@ -1,24 +1,29 @@
{ pkgs, config, ... }: {
imports =
[
./hardware-configuration.nix
];
imports = [
./hardware-configuration.nix
];
boot = {
loader.systemd-boot.enable = true;
};
networking.hostName = "x260";
time.timeZone = "Europe/Amsterdam";
i18n.defaultLocale = "en_US.UTF-8";
services.xserver = {
enable = true;
displayManager.gdm = {
services = {
xserver = {
enable = true;
displayManager.gdm = {
enable = true;
};
desktopManager.gnome.enable = true;
excludePackages = with pkgs; [ xterm ];
};
printing = {
enable = true;
drivers = [ pkgs.hplip pkgs.gutenprint ];
};
desktopManager.gnome.enable = true;
excludePackages = with pkgs; [ xterm ];
};
users = {
@ -84,12 +89,19 @@
};
};
age.secrets.wg-quick-home-privkey.file = ./secrets/wg-quick-home-privkey.age;
age.secrets.wg-quick-home-preshared-key.file = ./secrets/wg-quick-home-preshared-key.age;
age.identityPaths = [ "/home/pim/.ssh/age_ed25519" ];
age = {
identityPaths = [ "/home/pim/.ssh/age_ed25519" ];
networking.wg-quick = {
interfaces.home = {
secrets = {
wg-quick-home-privkey.file = ../secrets/wg-quick-home-privkey.age;
wg-quick-home-preshared-key.file = ../secrets/wg-quick-home-preshared-key.age;
};
};
networking = {
hostName = "x260";
wg-quick.interfaces.home = {
privateKeyFile = config.age.secrets.wg-quick-home-privkey.path;
address = [
"10.225.191.4/24"
@ -115,7 +127,4 @@
setSocketVariable = true;
};
};
services.printing.enable = true;
services.printing.drivers = [ pkgs.hplip pkgs.gutenprint ];
}