BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vps-arm-2024-08-30-18-52-45

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-08-30 18:52:45 +02:00
parent c138e90c56
commit 0ef8c6662f
8 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -52,7 +52,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
modules = [ modules = [
./machine/desktop.nix ./machine/desktop/configuration.nix
]; ];
}; };
@ -61,10 +61,17 @@
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
modules = [ modules = [
fw-fanctrl.nixosModules.default fw-fanctrl.nixosModules.default
./machine/framework.nix ./machine/framework/configuration.nix
]; ];
}; };
vps-arm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs outputs; };
modules = [
./machine/vps-arm/configuration.nix
];
};
}; };
}; };
} }

24
machine/desktop.nix → machine/desktop/configuration.nix
View File

@ -1,8 +1,8 @@
{ config, pkgs, inputs, outputs, ... }: { config, pkgs, inputs, outputs, ... }:
let let
secrets = import ../configs/secrets.nix; secrets = import ../../configs/secrets.nix;
be = import ../configs/borg-exclude.nix; be = import ../../configs/borg-exclude.nix;
wireguard = import ../configs/wireguard.nix; wireguard = import ../../configs/wireguard.nix;
in in
{ {
nixpkgs = { nixpkgs = {
@ -30,19 +30,19 @@ in
}; };
imports = [ imports = [
./desktop-hardware-configuration.nix ./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-pc-ssd
../configs/browser.nix ../../configs/browser.nix
../configs/common.nix ../../configs/common.nix
../configs/docker.nix ../../configs/docker.nix
../configs/games.nix ../../configs/games.nix
../configs/libvirt.nix ../../configs/libvirt.nix
../configs/plasma.nix ../../configs/plasma.nix
../configs/user-gui.nix ../../configs/user-gui.nix
../configs/user.nix ../../configs/user.nix
]; ];
nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-znver2" ]; nix.settings.system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-znver2" ];

0
machine/desktop-hardware-configuration.nix → machine/desktop/hardware-configuration.nix
View File

33
machine/framework.nix → machine/framework/configuration.nix
View File

@ -1,8 +1,7 @@
{ config, pkgs, lib, outputs, inputs, ... }: { config, pkgs, lib, outputs, inputs, ... }:
let let
be = import ../configs/borg-exclude.nix; be = import ../../configs/borg-exclude.nix;
secrets = import ../configs/secrets.nix; secrets = import ../../configs/secrets.nix;
wireguard = import ../configs/wireguard.nix;
in in
{ {
nixpkgs = { nixpkgs = {
@ -10,16 +9,6 @@ in
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.modifications
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
# You can also add overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
# Or define it inline, for example:
# (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: {
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
]; ];
config = { config = {
allowUnfree = true; allowUnfree = true;
@ -27,16 +16,16 @@ in
}; };
imports = [ imports = [
./framework-hardware-configuration.nix ./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.framework-12th-gen-intel inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
../configs/browser.nix ../../configs/browser.nix
../configs/common.nix ../../configs/common.nix
../configs/docker.nix ../../configs/docker.nix
../configs/games.nix ../../configs/games.nix
../configs/libvirt.nix ../../configs/libvirt.nix
../configs/plasma-wayland.nix ../../configs/plasma-wayland.nix
../configs/user-gui.nix ../../configs/user-gui.nix
../configs/user.nix ../../configs/user.nix
]; ];
boot = { boot = {

0
machine/framework-hardware-configuration.nix → machine/framework/hardware-configuration.nix
View File

44
machine/vps-arm.nix → machine/vps-arm/configuration.nix
View File

@ -1,24 +1,34 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, outputs, inputs, ... }:
let let
secrets = import ../configs/secrets.nix; secrets = import ../../configs/secrets.nix;
be = import ../configs/borg-exclude.nix; be = import ../../configs/borg-exclude.nix;
unstable = import <nixos-unstable> { config.allowUnfree = true; };
in in
{ {
imports = [ nixpkgs = {
/etc/nixos/hardware-configuration.nix overlays = [
../configs/common.nix outputs.overlays.additions
../configs/docker.nix outputs.overlays.modifications
../configs/user.nix outputs.overlays.unstable-packages
];
config = {
allowUnfree = true;
};
};
../services/adguardhome.nix imports = [
../services/frigate.nix ./hardware-configuration.nix
../services/gitea.nix ../../configs/common.nix
../services/nextcloud.nix ../../configs/docker.nix
../services/rustdesk-server.nix ../../configs/user.nix
../services/uptime-kuma.nix
../services/headscale.nix ../../services/adguardhome.nix
../services/goaccess.nix ../../services/frigate.nix
../../services/gitea.nix
../../services/nextcloud.nix
../../services/rustdesk-server.nix
../../services/uptime-kuma.nix
../../services/headscale.nix
../../services/goaccess.nix
]; ];
boot.loader = { boot.loader = {

37
machine/vps-arm/hardware-configuration.nix Normal file
View File

@ -0,0 +1,37 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_scsi" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/332b05c2-56cc-4b0b-b906-54b6b87542cd";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/3D20-21CC";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
}

3
services/frigate.nix
View File

@ -1,6 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
unstable = import <nixos-unstable> { config.allowUnfree = true; };
secrets = import ../configs/secrets.nix; secrets = import ../configs/secrets.nix;
in in
{ {
@ -17,7 +16,7 @@ in
frigate = { frigate = {
enable = true; enable = true;
package = unstable.pkgs.frigate; package = pkgs.unstable.frigate;
hostname = "frigate.szczepan.ski"; hostname = "frigate.szczepan.ski";
settings = { settings = {