complete refactor of packages and options

This commit is contained in:
stitchy 2024-03-27 03:47:54 +00:00
parent 16fb30026c
commit a2f3b33514
Signed by: stitchy
SSH key fingerprint: SHA256:yz2SoxdnY67tfY5Jzb0f2v8f5W3o/IF359kbcquWip8
12 changed files with 328 additions and 297 deletions

View file

@ -1,9 +1,55 @@
{config, pkg, home-manager, ...}:
{ config, lib, pkgs, ... }:
let
# This is a placeholder
in
{
options = {};
imports = [ ../packages/default.nix ];
config = {
hardware = {
bluetooth.enable = lib.mkDefault false;
steam-hardware.enable = lib.mkDefault false;
};
boot = {
kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
loader = {
efi.canTouchEfiVariables = lib.mkDefault true;
systemd-boot.enable = lib.mkDefault true;
};
};
security.sudo.wheelNeedsPassword = false;
security.rtkit.enable = true;
services.xserver.displayManager.lightdm.enable = false;
# Wireguard stuff, to-do make better
networking.firewall = {
enable = true;
# if packets are still dropped, they will show up in dmesg
logReversePathDrops = true;
# wireguard trips rpfilter up
extraCommands = ''
ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 47111 -j RETURN
ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 47111 -j RETURN
ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN
ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN
'';
extraStopCommands = ''
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 47111 -j RETURN || true
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 47111 -j RETURN || true
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
'';
# Open ports in the firewall.
allowedTCPPorts = [ 22000 ];
allowedUDPPorts = [ 22000 ];
};
environment.etc.hosts.mode = "0644";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
};
}

View file

@ -6,8 +6,9 @@
{
imports =
[ # Include the results of the hardware scan.
[
./hardware-configuration.nix
../default.nix
];
networking.hostName = "gemini";

View file

@ -1,13 +1,17 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
{
imports = [
./hardware-configuration.nix
../default.nix
];
stitchyconf = {
artPkgs.enable = true;
};
system.nixos.tags = [ "Nya_Beginnings" ];
services.logind.powerKey = "ignore";
@ -41,6 +45,8 @@
"i915.enable_guc=7"
];
virtualisation.libvirtd.enable = true;
hardware.bluetooth.enable = true;
hardware.opengl = {
enable = true;
driSupport = true;
@ -76,8 +82,7 @@
STOP_CHARGE_THRESH_BAT0 = 90; # 80 and above it stops charging
};
};
};
# Read the Docs before Changing
system.stateVersion = "23.05";

View file

@ -64,12 +64,16 @@ in {
imports =
[
./hardware-configuration.nix
../default.nix
];
virtualisation.libvirtd.hooks.qemu = {
passthrough = "${passthrough}";
};
virtualisation.libvirtd.enable = true;
hardware = {
steam-hardware.enable = true;
};
networking.hostName = "malachite";
@ -77,5 +81,4 @@ in {
# Read the Docs before Changing
system.stateVersion = "23.05"; # Did you read the comment?
}