Lots of refactoring
This commit is contained in:
Lauren Lagarde
parent
2f65f8fcba
commit
70e37a959e
46 changed files with 635 additions and 400 deletions
|
|
@ -1,7 +1,41 @@
|
|||
# sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#$TARGET_HOSTNAME --disk nvme0n1 /dev/nvme0n1
|
||||
# tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nixos-rebuild switch --flake mlaga97-nixos?submodules=1#$HOSTNAME
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [
|
||||
./ll-nixos-full.nix
|
||||
../features/intelgpu.nix
|
||||
# Core Features
|
||||
../features/base.nix
|
||||
../features/tui-apps.nix
|
||||
../features/openssh-server.nix
|
||||
|
||||
# Core Tweaks
|
||||
../tweaks/zram.nix
|
||||
../tweaks/enable_flakes.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Lauren Base
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
|
||||
# i3wm
|
||||
../features/i3wm.nix
|
||||
../features/hardware/yubikey.nix
|
||||
../tweaks/bluetooth.nix
|
||||
../tweaks/intel_igpu_screen_tearing.nix
|
||||
|
||||
# Dotspace
|
||||
../secrets/dotspace.nix
|
||||
../features/stronghold-binary-cache.nix
|
||||
|
||||
# Additional Software
|
||||
../features/embedded.nix
|
||||
../features/hardware/rtl-sdr.nix
|
||||
../features/hardware/printing.nix
|
||||
../features/virtualization/docker.nix
|
||||
../features/virtualization/libvirt-host.nix
|
||||
|
||||
# ll-latitude-e5591
|
||||
../features/gpu/intel.nix
|
||||
../features/systemd-boot.nix
|
||||
];
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
|
@ -9,4 +43,18 @@
|
|||
boot.kernelParams = [
|
||||
"i915.enable_guc=2"
|
||||
];
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
# Tinc Stuff
|
||||
# TODO: Less hacky
|
||||
|
||||
services.tinc.networks.mlaga97space = {
|
||||
name = "ll_latitude_e5591";
|
||||
ed25519PrivateKeyFile = "/root/tinc/mlaga97space_ed25519_key.priv";
|
||||
|
||||
chroot = false;
|
||||
settings.ConnectTo = [ "fortress" "citadel" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
{ ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
./ll-nixos-headless.nix
|
||||
# Core Features
|
||||
../features/base.nix
|
||||
../features/tui-apps.nix
|
||||
../features/openssh-server.nix
|
||||
|
||||
# Core Tweaks
|
||||
../tweaks/zram.nix
|
||||
../tweaks/enable_flakes.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Lauren Base
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
|
||||
# i3wm
|
||||
../features/i3.nix
|
||||
../features/yubikey.nix
|
||||
../features/i3wm.nix
|
||||
../features/hardware/yubikey.nix
|
||||
../tweaks/bluetooth.nix
|
||||
../tweaks/intel_igpu_screen_tearing.nix
|
||||
|
||||
# Lauren
|
||||
../users/lauren_lagarde/i3.nix
|
||||
../users/lauren_lagarde/autologin.nix
|
||||
# Dotspace
|
||||
../secrets/dotspace.nix
|
||||
../features/stronghold-binary-cache.nix
|
||||
];
|
||||
|
||||
home-manager.users.lauren_lagarde = {
|
||||
imports = [
|
||||
../users/lauren_lagarde/home-manager/monitor_configs.nix
|
||||
../users/lauren_lagarde/home-manager/secrets/dotspace_gui.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./ll-nixos-base.nix
|
||||
|
||||
# Additional Features
|
||||
../features/factorio.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,11 +1,37 @@
|
|||
{ ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
./ll-nixos-base.nix
|
||||
# Core Features
|
||||
../features/base.nix
|
||||
../features/tui-apps.nix
|
||||
../features/openssh-server.nix
|
||||
|
||||
# Additional Features
|
||||
../features/rtl-sdr.nix
|
||||
../features/printing.nix
|
||||
# Core Tweaks
|
||||
../tweaks/zram.nix
|
||||
../tweaks/enable_flakes.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Lauren Base
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
|
||||
# i3wm
|
||||
../features/i3wm.nix
|
||||
../features/hardware/yubikey.nix
|
||||
../tweaks/bluetooth.nix
|
||||
../tweaks/intel_igpu_screen_tearing.nix
|
||||
|
||||
# Dotspace
|
||||
../secrets/dotspace.nix
|
||||
../features/stronghold-binary-cache.nix
|
||||
|
||||
# Additional Software
|
||||
../features/embedded.nix
|
||||
../features/virtualbox.nix
|
||||
../features/hardware/rtl-sdr.nix
|
||||
../features/hardware/printing.nix
|
||||
../features/virtualization/docker.nix
|
||||
../features/virtualization/libvirt-host.nix
|
||||
|
||||
# Assume Intel GPU
|
||||
../features/gpu/intel.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
# Core
|
||||
../features/base.nix
|
||||
../tweaks/zram.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Headless
|
||||
../features/headless.nix
|
||||
../tweaks/zfs.nix
|
||||
|
||||
# Lauren
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
{
|
||||
home-manager.users.lauren_lagarde = {
|
||||
imports = [
|
||||
../users/lauren_lagarde/home-manager/lauren_lagarde.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
# Dotspace
|
||||
../features/stronghold-binary-cache.nix
|
||||
../secrets/dotspace.nix
|
||||
../users/lauren_lagarde/dotspace.nix
|
||||
];
|
||||
}
|
||||
47
systems/ll-nixos-xmrig-worker.nix
Normal file
47
systems/ll-nixos-xmrig-worker.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
# Core Features
|
||||
../features/base.nix
|
||||
../features/tui-apps.nix
|
||||
../features/openssh-server.nix
|
||||
|
||||
# Core Tweaks
|
||||
../tweaks/zram.nix
|
||||
../tweaks/enable_flakes.nix
|
||||
];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
powerManagement.cpuFreqGovernor = "performance";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
xmrig
|
||||
];
|
||||
|
||||
# Improve xmrig performance
|
||||
hardware.cpu.x86.msr.enable = true;
|
||||
hardware.cpu.x86.msr.settings.allow-writes = "on";
|
||||
|
||||
# Helper Scripts
|
||||
home-manager.users.nixos.home = {
|
||||
stateVersion = "24.11";
|
||||
file = {
|
||||
"stronghold" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
sudo nmtui-connect Stronghold
|
||||
'';
|
||||
};
|
||||
"mine" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
sudo xmrig --randomx-1gb-pages -o vm-docker-2.mlaga97.space:3333
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# SSH Config
|
||||
users.users.nixos.openssh.authorizedKeys.keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCl881A1gvgCx+4ECrmJnO2QCTiqjaOLfAegKAAkvWNFKL0rDfsj8tZULUcyn87HYsRrdmqCOQ62GOjQyK803azq7QTxwY4vjczkJxico4LnIToTobcz+JkgF6Rf/h74bs9dHk4ZU853FRBz3wi/14rI10Iwckt37B1ayJacpELuzFobKYip2FjiL1vNH3tiAFR131z+YBByvNX+uJYEhpsI0xry9zbsSUWUq5/YFpmjezblzYRokfsReYiKJeQBeROSeRC/xFBSnikECSylNI4sw5VIpGXFIxL5xhss+s+3dnb+LFQ+zInOYxkVRydYc/In9Wz6Tu7v07K8bjvE7nQwHenoGtRW590Xu0rJApS+k8Cu16sCO2QFj/aI+gCrhU0ymM0aicr0hFAME6Y7j9HcR6PxYxnXZjI7cfqhO5TG8jot25SPzJcvH3EV5oPKtAkw9XA+8+nAI9czFlUgHnuMJAqw1IGOD3qozwqZ5yn1+kG7FZJRpvaPc5pK2HtqaAKJmnRuVaWcFuNALh86gr7Qn8IEp8Q+YyKmDqrMZ4KLJUMnVqn4y0HVS1eB5nVujaJZUGJWA4q3og0FE/2kH74WEp2ZtuJAoEPcgfZ6Ns7BmmXIZU7qu4kQoQ73b3mn6hCi5xlQ/sClzwHYkRPo4tST64ED/UIRPCYe1byNUWSww== lauren@lagarde.dev"
|
||||
];
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
# Core
|
||||
../features/base.nix
|
||||
../tweaks/zram.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Headless
|
||||
../features/headless.nix
|
||||
|
||||
# Lauren
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
{
|
||||
home-manager.users.lauren_lagarde = {
|
||||
imports = [
|
||||
../users/lauren_lagarde/home-manager/lauren_lagarde.nix
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
# i3wm
|
||||
../features/i3.nix
|
||||
../tweaks/intel_igpu_screen_tearing.nix
|
||||
|
||||
# Lauren
|
||||
../users/lauren_lagarde/i3.nix
|
||||
../users/lauren_lagarde/autologin.nix
|
||||
];
|
||||
|
||||
powerManagement.cpuFreqGovernor = "performance";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
xmrig
|
||||
];
|
||||
|
||||
hardware.cpu.x86.msr = {
|
||||
enable = true;
|
||||
settings.allow-writes = "on";
|
||||
};
|
||||
|
||||
home-manager.users.lauren_lagarde = {
|
||||
home.file = {
|
||||
"Stronghold" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
sudo nmtui-connect Stronghold
|
||||
'';
|
||||
};
|
||||
"mine" = {
|
||||
executable = true;
|
||||
text = ''
|
||||
sudo xmrig -o vm-docker-2.mlaga97.space:3333
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
# cd; rm nixos-config; tar -xvf /Parlor/Lauren/nixos-config.tar.zst; cd nixos-config/nixos/; sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#TARGET_HOSTNAME --disk vda /dev/vda
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./ll-nixos-headless.nix
|
||||
|
||||
../features/docker.nix
|
||||
../features/dockge.nix
|
||||
|
||||
../tweaks/disable_firewall.nix
|
||||
];
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
# Bootloader / Kernel
|
||||
|
||||
# UEFI Boot
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
# Libvirt Guest Kernel Modules
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
# Disk Layout
|
||||
|
||||
# https://github.com/nix-community/disko/issues/528
|
||||
disko.devices = {
|
||||
disk = {
|
||||
vda = {
|
||||
type = "disk";
|
||||
device = "/dev/vda";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
boot = {
|
||||
size = "1G";
|
||||
type = "EF00";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
mountOptions = [ "umask=0077" ];
|
||||
};
|
||||
};
|
||||
primary = {
|
||||
size = "100%";
|
||||
content = {
|
||||
type = "lvm_pv";
|
||||
vg = "pool";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
lvm_vg = {
|
||||
pool = {
|
||||
type = "lvm_vg";
|
||||
lvs = {
|
||||
root = {
|
||||
size = "100%FREE";
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "ext4";
|
||||
mountpoint = "/";
|
||||
mountOptions = [
|
||||
"defaults"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./ll-nixos-headless.nix
|
||||
|
||||
# Additional Features
|
||||
../features/persistent_docker.nix
|
||||
../tweaks/disable-firewall.nix
|
||||
];
|
||||
}
|
||||
26
systems/vm-docker-host/vm-docker-host-base.nix
Normal file
26
systems/vm-docker-host/vm-docker-host-base.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
# Core Features
|
||||
../features/base.nix
|
||||
../features/tui-apps.nix
|
||||
../features/openssh-server.nix
|
||||
|
||||
# Core Tweaks
|
||||
../tweaks/zram.nix
|
||||
../tweaks/enable_flakes.nix
|
||||
../tweaks/disable_nixos_user.nix
|
||||
../tweaks/systemd-resolved_nonsense.nix
|
||||
|
||||
# Lauren Base
|
||||
../users/lauren_lagarde/lauren_lagarde.nix
|
||||
|
||||
# Dotspace
|
||||
../../secrets/dotspace.nix
|
||||
../../features/stronghold-binary-cache.nix
|
||||
|
||||
# Docker Host Stuff
|
||||
../../tweaks/disable_firewall.nix
|
||||
../../features/virtualization/docker.nix
|
||||
../../features/virtualization/dockge.nix
|
||||
];
|
||||
}
|
||||
12
systems/vm-docker-host/vm-docker-host-luks.nix
Normal file
12
systems/vm-docker-host/vm-docker-host-luks.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
# git add *; tar -cavf /Parlor/Lauren/mlaga97-nixos.tar.zst ../mlaga97-nixos
|
||||
# tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nix run 'github:nix-community/disko/latest#disko-install' -- --extra-files ./ssh_host_ed25519_key /root/secrets/initrd/ssh_host_ed25519_key --flake mlaga97-nixos#$TARGET_HOSTNAME --disk vda /dev/vda
|
||||
# tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nixos-rebuild switch --flake mlaga97-nixos?submodules=1#$HOSTNAME
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./vm-docker-host-base.nix
|
||||
|
||||
# UEFI SSH LUKS
|
||||
../../features/initrd_ssh.nix
|
||||
../../features/libvirt-uefi-guest.nix
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue