Migrate left hosts and homes configurations
This commit is contained in:
@ -4,7 +4,11 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
../common/global
|
||||
];
|
||||
|
||||
# hardware.graphics = {
|
||||
# enable = true;
|
||||
|
@ -18,5 +18,8 @@ in
|
||||
keyFile = "/home/julian/.config/sops/age/keys.txt";
|
||||
# Generate key if none of the above worked. With this, building will still work, just without secrets
|
||||
generateKey = true;
|
||||
|
||||
};
|
||||
|
||||
sops.defaultSopsFile = ../secrets.yaml;
|
||||
}
|
||||
|
@ -11,38 +11,35 @@
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
imports = [
|
||||
# inputs.hardware.nixosModules.common-cpu-amd # TODO something useful for me?
|
||||
|
||||
./hardware-configuration.nix
|
||||
|
||||
../common/global
|
||||
../common/users/julian
|
||||
|
||||
# ../common/optional/openssh.nix
|
||||
# ../common/optional/greetd.nix
|
||||
../common/optional/pipewire.nix
|
||||
../common/optional/remote-builder.nix
|
||||
../common/optional/boot-efi.nix
|
||||
../common/optional/pcmanfm.nix
|
||||
../common/optional/i3.nix
|
||||
../common/optional/gdm.nix
|
||||
../common/optional/redshift.nix
|
||||
../common/optional/virtualbox.nix
|
||||
../common/optional/xdg-portal.nix
|
||||
../common/optional/polkit.nix # TODO: maybe not needed!
|
||||
../common/optional/keyring.nix # TODO: maybe not needed!
|
||||
];
|
||||
|
||||
networking.hostName = "kardorf"; # Define your hostname.
|
||||
networking.networkmanager.enable = true;
|
||||
services.resolved.enable = true;
|
||||
|
||||
topology.self = {
|
||||
hardware.info = "Pc Kardorf";
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
modules = {
|
||||
nix-settings.enable = true;
|
||||
xserver-defaults.enable = true;
|
||||
keymap.enable = true;
|
||||
builder.enable = true;
|
||||
system.boot-efi.enable = true;
|
||||
sound.enable = true;
|
||||
locales.enable = true;
|
||||
pcmanfm.enable = true;
|
||||
i3.enable = true;
|
||||
gdm.enable = true;
|
||||
virtualbox.enable = true;
|
||||
users-julian.enable = true;
|
||||
xdg-portal.enable = true;
|
||||
polkit.enable = true;
|
||||
keyring.enable = true;
|
||||
redshift.enable = true;
|
||||
syncthing.enable = true;
|
||||
};
|
||||
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
|
||||
|
@ -10,7 +10,28 @@
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.raspberry-pi-4
|
||||
|
||||
./hardware-configuration.nix
|
||||
|
||||
../common/global
|
||||
../common/users/julian
|
||||
|
||||
# ../common/optional/openssh.nix
|
||||
# ../common/optional/greetd.nix
|
||||
../common/optional/pipewire.nix
|
||||
../common/optional/remote-builder.nix
|
||||
# ../common/optional/boot-efi.nix
|
||||
../common/optional/pcmanfm.nix
|
||||
# ../common/optional/i3.nix
|
||||
# ../common/optional/gdm.nix
|
||||
../common/optional/redshift.nix
|
||||
# ../common/optional/virtualbox.nix
|
||||
../common/optional/xdg-portal.nix
|
||||
../common/optional/polkit.nix # TODO: maybe not needed!
|
||||
../common/optional/keyring.nix # TODO: maybe not needed!
|
||||
];
|
||||
|
||||
# disko.devices.disk.main.device = "/dev/mmcblk1";
|
||||
|
||||
@ -27,7 +48,7 @@
|
||||
|
||||
sops.secrets."vnc-passwd" = {
|
||||
owner = config.users.users.julian.name;
|
||||
sopsFile = ../../../secrets/vnc-passwd;
|
||||
sopsFile = ./vnc-passwd;
|
||||
format = "binary";
|
||||
};
|
||||
sops.secrets."wifi/pianonix" = { };
|
||||
@ -35,43 +56,15 @@
|
||||
sops.secrets."syncthing/pianonix/cert" = { };
|
||||
# sops.secrets."syncthing/public-keys/aspi-nix" = { };
|
||||
# sops.secrets."syncthing/public-keys/pianonix" = { };
|
||||
sops.secrets."password/pianonix" = {
|
||||
neededForUsers = true; # necessary for setting password
|
||||
};
|
||||
|
||||
modules = {
|
||||
sops.enable = true;
|
||||
nix-settings.enable = true;
|
||||
xserver-defaults.enable = true;
|
||||
keymap.enable = true;
|
||||
builder.enable = false;
|
||||
# system.boot-efi.enable = true;
|
||||
sound.enable = true;
|
||||
|
||||
locales.enable = true;
|
||||
pcmanfm.enable = true;
|
||||
|
||||
# i3.enable = true;
|
||||
# gdm.enable = true;
|
||||
redshift.enable = true;
|
||||
|
||||
# wayland.enable = true;
|
||||
# hyprland.enable = true;
|
||||
# tuigreet.enable = true;
|
||||
|
||||
# virtualbox.enable = true;
|
||||
users-julian.enable = true;
|
||||
syncthing = {
|
||||
enable = true;
|
||||
overrideSettings = true;
|
||||
};
|
||||
# xdg-portal.enable = true;
|
||||
polkit.enable = true;
|
||||
keyring.enable = true;
|
||||
};
|
||||
|
||||
users.mutableUsers = false;
|
||||
users.users.julian.hashedPasswordFile = config.sops.secrets."password/pianonix".path;
|
||||
|
||||
# Enable the Desktop Environment.
|
||||
# services.xserver.displayManager.lightdm.enable = true;
|
||||
|
Reference in New Issue
Block a user