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

View file

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