vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move user and additional module handling into flake.nix

Browse source
This commit is contained in:
Vinzenz Schroeter 2025-09-15 19:01:30 +02:00
parent 87062e05c4
commit 8fc672bfcf
15 changed files with 275 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixosConfigurations/forgejo-runner-1/default.nix
View file

@ -1,10 +1,7 @@
{ vinzenzNixosModules, ... }:
{
imports = [
./configuration.nix
./hardware.nix
vinzenzNixosModules.podman
./forgejo-runner.nix
];
}

8
nixosConfigurations/ronja-pc/default.nix
View file

@ -1,14 +1,6 @@
{ vinzenzNixosModules, vinzenzHomeConfigurations, ... }:
{
imports = [
./configuration.nix
./hardware.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.steam
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.vinzenz-desktop-settings
vinzenzHomeConfigurations.ronja
];
}

11
nixosConfigurations/vinzenz-lpt2/default.nix
View file

@ -1,17 +1,6 @@
{ vinzenzNixosModules, vinzenzHomeConfigurations, ... }:
{
imports = [
./configuration.nix
./hardware.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.steam
vinzenzNixosModules.printing
vinzenzNixosModules.podman
vinzenzNixosModules.vinzenz-desktop-settings
vinzenzHomeConfigurations.vinzenz
vinzenzHomeConfigurations.ronja
];
}

96
nixosConfigurations/vinzenz-lpt2/hardware.nix
View file

@ -1,64 +1,56 @@
{ pkgs, lib, ... }:
{
vinzenzNixosModules,
pkgs,
lib,
...
}:
{
imports = [ vinzenzNixosModules.intel-graphics ];
config = {
# intel cpu
boot.kernelModules = [
"kvm-intel"
"xe"
];
# intel cpu
boot.kernelModules = [
"kvm-intel"
"xe"
];
networking = {
networkmanager.enable = true;
useDHCP = lib.mkDefault true;
};
networking = {
networkmanager.enable = true;
useDHCP = lib.mkDefault true;
};
boot = {
kernelPackages = pkgs.linuxPackages_zen;
boot = {
kernelPackages = pkgs.linuxPackages_zen;
supportedFilesystems = [ "btrfs" ];
initrd = {
supportedFilesystems = [ "btrfs" ];
initrd = {
supportedFilesystems = [ "btrfs" ];
availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
];
luks.devices = {
"luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
};
availableKernelModules = [
"xhci_pci"
"thunderbolt"
"nvme"
];
luks.devices = {
"luks-2c654ff2-3c42-48d3-a1e3-9545679afaa3" = {
device = "/dev/disk/by-uuid/2c654ff2-3c42-48d3-a1e3-9545679afaa3";
};
};
};
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/e4dad0c8-26a1-45e9-bbd9-48565eb6574e";
fsType = "btrfs";
options = [ "subvol=@" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/E2B7-2BC1";
fsType = "vfat";
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/e4dad0c8-26a1-45e9-bbd9-48565eb6574e";
fsType = "btrfs";
options = [ "subvol=@" ];
};
swapDevices = [
{
device = "/var/lib/swapfile";
size = 32 * 1024;
}
];
services.thermald.enable = true;
services.hardware.bolt.enable = true; # thunderbolt security
hardware.bluetooth.enable = true;
"/boot" = {
device = "/dev/disk/by-uuid/E2B7-2BC1";
fsType = "vfat";
};
};
swapDevices = [
{
device = "/var/lib/swapfile";
size = 32 * 1024;
}
];
services.thermald.enable = true;
services.hardware.bolt.enable = true; # thunderbolt security
hardware.bluetooth.enable = true;
}

11
nixosConfigurations/vinzenz-pc2/default.nix
View file

@ -1,19 +1,8 @@
{ vinzenzNixosModules, vinzenzHomeConfigurations, ... }:
{
imports = [
./configuration.nix
./hardware.nix
./vscode-server.nix
./hass.nix
vinzenzNixosModules.gnome
vinzenzNixosModules.wine-gaming
vinzenzNixosModules.steam
vinzenzNixosModules.printing
vinzenzNixosModules.podman
vinzenzNixosModules.vinzenz-desktop-settings
vinzenzHomeConfigurations.vinzenz
vinzenzHomeConfigurations.ronja
];
}

60
nixosConfigurations/vinzenz-pc2/hardware.nix
View file

@ -1,38 +1,30 @@
{ pkgs, lib, ... }:
{
vinzenzNixosModules,
pkgs,
lib,
...
}:
{
imports = [ vinzenzNixosModules.amd-graphics ];
config = {
# amd cpu
boot.kernelModules = [ "kvm-amd" ];
# amd cpu
boot.kernelModules = [ "kvm-amd" ];
boot = {
initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"sd_mod"
]; # "usb_storage"
kernelPackages = pkgs.linuxPackages_zen;
supportedFilesystems = [ "btrfs" ];
initrd.supportedFilesystems = [ "btrfs" ];
loader.efi.efiSysMountPoint = "/boot";
};
fileSystems = import ./fstab.nix;
swapDevices = [ ];
networking = {
networkmanager.enable = true;
useDHCP = lib.mkDefault true;
interfaces.eno1.wakeOnLan.enable = true;
};
hardware.bluetooth.enable = true;
boot = {
initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"sd_mod"
]; # "usb_storage"
kernelPackages = pkgs.linuxPackages_zen;
supportedFilesystems = [ "btrfs" ];
initrd.supportedFilesystems = [ "btrfs" ];
loader.efi.efiSysMountPoint = "/boot";
};
fileSystems = import ./fstab.nix;
swapDevices = [ ];
networking = {
networkmanager.enable = true;
useDHCP = lib.mkDefault true;
interfaces.eno1.wakeOnLan.enable = true;
};
hardware.bluetooth.enable = true;
}