fred/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update nix config

Browse source
This commit is contained in:
fred 2025-08-12 11:53:58 -07:00
parent f610209aff
commit 07b7f0cc1f
34 changed files with 388 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hosts/desk/boot.nix
View file

@ -1,12 +1,10 @@
{
boot.initrd.luks.devices = {
"luks-c14a978c-5752-4d1b-beb9-57fb710cd409" = {
device = "/dev/disk/by-uuid/c14a978c-5752-4d1b-beb9-57fb710cd409";
allowDiscards = true;
keyFileSize = 4096;
keyFile = "/dev//disk/by-id/usb-Generic_Flash_Disk_C94D5655-0:0";
fallbackToPassword = true;
preLVM = false;
};
};
boot.initrd.luks.devices."luks-c185ba0a-181b-4521-adaf-530b93a383b9" = {
device = "/dev/disk/by-uuid/c185ba0a-181b-4521-adaf-530b93a383b9";
allowDiscards = true;
keyFileSize = 4096;
keyFile = "/dev/disk/by-id/usb-Generic_Flash_Disk_CE8AD7705";
fallbackToPassword = true;
preLVM = false;
};
}

23
hosts/desk/default.nix
View file

@ -21,6 +21,7 @@ in
../../modules/apps/99_i3_config.nix
../../modules/dev/docker.nix
../../modules/dev/ruby.nix
../../modules/dev/utils.nix
../../modules/misc/polkit.nix
inputs.home-manager.nixosModules.default
inputs.sops-nix.nixosModules.sops
@ -31,6 +32,7 @@ in
user = "fred";
host = "desk";
sops_file = "home.yaml";
rootless_docker = true;
time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8";
@ -55,19 +57,16 @@ in
};
### HDD's ###
fileSystems."/run/media/fred/2tb" =
{ device = "/dev/disk/by-uuid/2967e82b-a83c-4357-9939-1fbcc2618a9a";
fsType = "ext4";
options = hdd_opts;
environment.etc.crypttab = {
mode = "0600";
text = ''
# <volume-name> <encrypted-device> [key-file] [options]
8tb UUID=72edb411-1740-43e0-81ba-084374bb2b78 /dev/disk/by-id/usb-Generic_Flash_Disk_CE8AD7705 keyfile-size=4096,nofail
'';
};
fileSystems."/run/media/fred/arch_home" =
{ device = "/dev/disk/by-uuid/122e2d4f-3512-4077-a5ee-f80ac6e32300";
fsType = "ext4";
options = hdd_opts;
};
fileSystems."/run/media/fred/arch_root" =
{ device = "/dev/disk/by-uuid/56a64ba1-5ffa-426d-bca2-ede62c7b2498";
fileSystems."/run/media/fred/8tb" =
{ device = "/dev/mapper/8tb";
fsType = "ext4";
options = hdd_opts;
};
@ -81,7 +80,7 @@ in
};
services.tcsd.enable = false; # prevent sysinit-reactiviation.target hang when rebuilding flake
services.xserver.displayManager.lightdm.extraSeatDefaults = "display-setup-script = ${pkgs.ddcutil}/bin/ddcutil --bus=7 setvcp 60 0x0f";
services.xserver.displayManager.lightdm.extraSeatDefaults = "display-setup-script = ${pkgs.ddcutil}/bin/ddcutil --bus=8 setvcp 60 0x0f";
networking.firewall.allowedUDPPorts = [ 11357 ]; # ollama-docker
networking.firewall.allowedTCPPorts = [ 11357 ]; # ollama-docker

23
hosts/desk/desk_apps.nix
View file

@ -1,11 +1,34 @@
{ config, pkgs, ... }: {
config = {
home-manager.users.${config.user} = { pkgs, ... }: {
home.packages = with pkgs; [
yt-dlp
freetube
];
programs.zed-editor = {
enable = true;
userSettings = {
vim_mode = true;
telemetry = {
diagnostics = false;
metrics = false;
};
language_models = {
ollama = {
api_url = "https://ollama.local";
};
};
assistant = {
enabled = true;
default_model = {
provider = "ollama";
model = "deepseek-coder-v2:16b";
};
};
};
};
};
};
}

4
hosts/desk/hardware.nix
View file

@ -15,12 +15,12 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/aa4561b3-a61d-4ed9-8847-b88c6fc06525";
{ device = "/dev/disk/by-uuid/59e32983-f2f6-4ea3-b295-e8886f159002";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6FD4-7839";
{ device = "/dev/disk/by-uuid/2B41-6F12";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};

6
hosts/desk/kvm.nix
View file

@ -4,7 +4,11 @@
virtualisation.libvirtd = {
enable = true;
qemu.ovmf.enable = true;
qemu.ovmf = {
enable = true;
packages = [ pkgs.OVMFFull ];
};
qemu.swtpm.enable = true;
qemu.runAsRoot = false;
onBoot = "ignore";
onShutdown = "shutdown";

1
hosts/htpc/default.nix
View file

@ -1 +0,0 @@
# TODO

12
hosts/lap/boot.nix Normal file
View file

@ -0,0 +1,12 @@
{
boot.initrd.luks.devices = {
"luks-847548dd-10b5-46d1-82f4-bf982a32c1b5" = {
device = "/dev/disk/by-uuid/847548dd-10b5-46d1-82f4-bf982a32c1b5";
allowDiscards = true;
keyFileSize = 4096;
keyFile = "/dev/disk/by-id/usb-Generic-_SD_MMC_27B8RE273ED5E";
fallbackToPassword = true;
preLVM = false;
};
};
}

75
hosts/lap/default.nix Normal file
View file

@ -0,0 +1,75 @@
{ pkgs, inputs, config, lib, ... }:
let
nfs_opts = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ];
hdd_opts = [ "nosuid" "nodev" "nofail" ];
in
{
imports =
[
./boot.nix
./hardware.nix
# ./desk_apps.nix
../../modules/common/default.nix
../../modules/common/system-d_boot.nix
../../modules/networking/ssh.nix
../../modules/networking/hosts.nix
../../modules/user
../../modules/apps/99_i3_config.nix
../../modules/dev/docker.nix
../../modules/dev/ruby.nix
../../modules/dev/utils.nix
../../modules/misc/polkit.nix
inputs.home-manager.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
config = {
user = "fred";
host = "lap";
sops_file = "home.yaml";
time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8";
environment.systemPackages = with pkgs; [
nfs-utils
ddcutil
input-remapper
xorg.xinit # for vnc server
];
networking.firewall.allowedUDPPorts = [ 5900 ]; # vnc-server
networking.firewall.allowedTCPPorts = [ 5900 ]; # vnc-server
#### NFS's ###
services.autofs = {
enable = true;
timeout = 60;
autoMaster = ''
/- /etc/autofs/auto.nfs_server --timeout=60
'';
};
environment.etc."autofs/auto.nfs_server" = {
text = ''
/nfs -rw,soft,rsize=8192,wsize=8192 nfs:/nfs
/solid -rw,soft,rsize=8192,wsize=8192 nfs:/solid
/docker -rw,soft,rsize=8192,wsize=8192 nfs:/docker
'';
mode = "0644";
};
services.tcsd.enable = false; # prevent sysinit-reactiviation.target hang when rebuilding flake
networking.enableIPv6 = false;
security.pki.certificates = [ (builtins.readFile ../../dotfiles/certs/mfCA.crt) ];
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = false;
services.blueman.enable = true;
system.stateVersion = "25.05";
};
}

45
hosts/lap/hardware.nix Normal file
View file

@ -0,0 +1,45 @@
# 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 + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# hardware.nvidia.open=false;
fileSystems."/" =
{ device = "/dev/disk/by-uuid/f7766025-9e57-4b52-b47c-b158b3a894f2";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-847548dd-10b5-46d1-82f4-bf982a32c1b5".device = "/dev/disk/by-uuid/847548dd-10b5-46d1-82f4-bf982a32c1b5";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B177-CFE7";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [{
device = "/var/lib/swapfile";
size = 8*1024;
}];
# 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.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp61s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

2
hosts/vm_ollama/ollama.nix
View file

@ -30,7 +30,7 @@
models = "/mnt/ollama_models/";
rocmOverrideGfx = "10.3.0";
environmentVariables = {
OLLAMA_KEEP_ALIVE="15m";
OLLAMA_KEEP_ALIVE="60m";
};
};

6
hosts/vps/boot.nix Normal file
View file

@ -0,0 +1,6 @@
{
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
boot.loader.grub.useOSProber = false;
boot.loader.grub.enableCryptodisk = true;
}

15
hosts/vps_fz/default.nix → hosts/vps/default.nix
View file

@ -10,6 +10,7 @@
../../modules/networking/ssh.nix
../../modules/user
../../modules/apps/00_tui_base.nix
../../modules/dev/docker.nix
inputs.home-manager.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
@ -17,17 +18,15 @@
config = {
### USER ###
user = "vps_fz";
host = "vps_fz";
sops_file = "vps_fz.yaml";
user = "vps";
host = "vps";
sops_file = "vps.yaml";
rootless_docker = true;
### NETWORKING ###
networking.enableIPv6 = false;
networking.firewall = {
enable = true;
allowedTCPPorts = [ 80 443 ];
};
# firewall config in server_config
system.stateVersion = "25.05";
};

17
hosts/vps_fz/hardware.nix → hosts/vps/hardware.nix
View file

@ -14,15 +14,24 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/0b1c3bc9-4332-4950-bc20-20e7eb8aa003";
{ device = "/dev/disk/by-uuid/f22c3def-a743-4861-a98d-569cab10b34c";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-938c9dc1-9c55-4152-bc69-4d8770518c90".device = "/dev/disk/by-uuid/938c9dc1-9c55-4152-bc69-4d8770518c90";
# Setup keyfile
boot.initrd = {
secrets."/boot/crypto_keyfile.bin" = null;
luks.devices."luks-d05cd87b-ba29-4daf-ad6a-c58b857026a9" = {
keyFile = "/boot/crypto_keyfile.bin";
device = "/dev/disk/by-uuid/d05cd87b-ba29-4daf-ad6a-c58b857026a9";
};
};
swapDevices =
[ { device = "/dev/disk/by-uuid/7961b651-0b10-4fbf-a429-8e53a2b67b34"; }
];
[{
device = "/var/lib/swapfile";
size = 4*1024;
}];
# 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

18
hosts/vps_fz/boot.nix
View file

@ -1,18 +0,0 @@
{
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
boot.loader.grub.useOSProber = false;
boot.initrd.luks.devices."luks-c2ab1085-f8ec-49df-a26b-ece597abc3b7".device = "/dev/disk/by-uuid/c2ab1085-f8ec-49df-a26b-ece597abc3b7";
# Setup keyfile
boot.initrd.secrets = {
"/boot/crypto_keyfile.bin" = null;
};
boot.loader.grub.enableCryptodisk = true;
boot.initrd.luks.devices."luks-938c9dc1-9c55-4152-bc69-4d8770518c90".keyFile = "/boot/crypto_keyfile.bin";
boot.initrd.luks.devices."luks-c2ab1085-f8ec-49df-a26b-ece597abc3b7".keyFile = "/boot/crypto_keyfile.bin";
# boot.loader.systemd-boot.enable = true;
# boot.loader.efi.canTouchEfiVariables = true;
}

40
hosts/vps_fz/server_config.nix
View file

@ -1,40 +0,0 @@
{ pkgs, inputs, config, lib, ... }: {
config = {
# fail2ban
services.fail2ban.enable = true;
services.openssh.settings.LogLevel = "VERBOSE";
# caddy
services.caddy = {
enable = true;
configFile = ../../dotfiles/caddy/Caddyfile;
};
networking.firewall.allowedTCPPorts = [ 80 443 ];
# gitea
sops.secrets."gitea_dbpass" = {
owner = "gitea";
group = "gitea";
};
services.gitea = {
enable = true;
database = {
type = "postgres";
passwordFile = config.sops.secrets."gitea_dbpass".path;
};
settings = {
server = {
DOMAIN = "gitea.fredzernia.com";
ROOT_URL = "https://gitea.fredzernia.com";
HTTP_PORT = 7904;
};
service.DISABLE_REGISTRATION = true;
};
};
};
}