refactor some things, might have broken everything
This commit is contained in:
@ -6,49 +6,31 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/09/06 00:57:04 by tomoron #+# #+# #
|
||||
# Updated: 2026/05/21 00:20:51 by tomoron ### ########.fr #
|
||||
# Updated: 2026/06/15 02:03:18 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
|
||||
{ config, lib, inputs, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
boot.kernelParams = [ "nvidia-drm-modset=1" ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
lm_sensors # can be user (and global)
|
||||
];
|
||||
|
||||
networking.hostName = "nixos-fixe";
|
||||
|
||||
hardware.cpu.intel.updateMicrocode = true;
|
||||
|
||||
mods.yubikey.pam.enable = true;
|
||||
mods.nvidia.enable = true;
|
||||
|
||||
boot.kernelModules = [ "kvm-intel" "nvidia" ];
|
||||
mods.displayManager.enable = true;
|
||||
|
||||
mods.nvidia.enable = true;
|
||||
mods.gayming.enable = true;
|
||||
|
||||
programs.noisetorch.enable = true;
|
||||
|
||||
# hardware.nvidia = {
|
||||
# open = true;
|
||||
#
|
||||
# prime.nvidiaBusId = "PCI:1:0:0";
|
||||
# prime.intelBusId = "PCI:0:2:0";
|
||||
# prime.sync.enable = true;
|
||||
#
|
||||
# modesetting.enable = true;
|
||||
# };
|
||||
|
||||
services.openssh.enable = true;
|
||||
programs.droidcam.enable = true;
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages;
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
networking.hostId = "98e475dd";
|
||||
|
||||
mods.zfs.enable = true;
|
||||
|
||||
mods.docker = {
|
||||
enable = true;
|
||||
boot = false;
|
||||
|
||||
@ -6,17 +6,13 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/09/06 00:57:02 by tomoron #+# #+# #
|
||||
# Updated: 2025/09/06 00:57:03 by tomoron ### ########.fr #
|
||||
# Updated: 2026/06/14 18:25:39 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
{lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../global/packages.nix
|
||||
];
|
||||
|
||||
users.users.tom = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "video" ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/09/06 00:56:57 by tomoron #+# #+# #
|
||||
# Updated: 2026/06/13 23:20:55 by tomoron ### ########.fr #
|
||||
# Updated: 2026/06/15 02:11:29 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -35,22 +35,23 @@
|
||||
|
||||
};
|
||||
|
||||
boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup
|
||||
programs.droidcam.enable = true;
|
||||
boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup, loaded automatically when gpu is started
|
||||
|
||||
|
||||
|
||||
mods.displayManager.enable = true;
|
||||
mods.yubikey.pam.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
networking.hostName = "patate-douce";
|
||||
# networking.wireless.enable = true;
|
||||
networking.networkmanager.wifi.backend = "iwd";
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.allowAuxiliaryImperativeNetworks = true;
|
||||
networking.networkmanager.enable = false;
|
||||
networking.dhcpcd.enable = false;
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
|
||||
specialisation.vfio_ready.configuration = {
|
||||
#vfio ready configuration sets up kvmfr0 kernel module, disables xbox controller on host os, enables libvirtd and installs looking-glass
|
||||
|
||||
mods.virtualHost.enable = true;
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
|
||||
@ -73,30 +74,13 @@
|
||||
environment.systemPackages = with pkgs; [ looking-glass-client ];
|
||||
};
|
||||
|
||||
services.udev.extraRules = ''
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="df11", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
|
||||
'';
|
||||
|
||||
|
||||
networking.dhcpcd.enable = false;
|
||||
systemd.network.enable = true;
|
||||
networking.useNetworkd = true;
|
||||
|
||||
programs.noisetorch.enable = true;
|
||||
|
||||
services.postgresql.enable = true;
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
acpi # can be user (global)
|
||||
impala
|
||||
openvr
|
||||
];
|
||||
|
||||
# programs.alvr.enable = true;
|
||||
|
||||
|
||||
mods.touchpad.enable = true;
|
||||
|
||||
mods.powerSave = {
|
||||
@ -113,10 +97,8 @@
|
||||
|
||||
};
|
||||
|
||||
|
||||
services.asusd = {
|
||||
enable = true;
|
||||
# enableUserService = true;
|
||||
};
|
||||
|
||||
services.supergfxd.enable = true;
|
||||
@ -133,14 +115,13 @@
|
||||
programs.wireshark.enable = true;
|
||||
programs.wireshark.usbmon.enable = true;
|
||||
|
||||
mods.yubikey.pam.enable = true;
|
||||
mods.docker.enable = true;
|
||||
mods.gayming.enable = true;
|
||||
mods.nvidia.enable = true;
|
||||
mods.nvidia.prime = true;
|
||||
|
||||
|
||||
services.usbmuxd.enable = true; #sometimes hangs when shutting down
|
||||
|
||||
services.usbmuxd.enable = true; #iphone usb service sometimes hangs when shutting down
|
||||
|
||||
services.avahi.enable = true;
|
||||
services.pipewire = {
|
||||
@ -160,6 +141,8 @@
|
||||
"bluez5.enable-hw-volume" = true;
|
||||
};
|
||||
};
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
@ -167,5 +150,4 @@
|
||||
};
|
||||
|
||||
programs.corectrl.enable = true;
|
||||
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/09/06 00:57:09 by tomoron #+# #+# #
|
||||
# Updated: 2026/06/13 23:40:36 by tomoron ### ########.fr #
|
||||
# Updated: 2026/06/15 02:04:54 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -27,7 +27,6 @@ let
|
||||
];
|
||||
in
|
||||
{
|
||||
boot.kernelPackages = pkgs.linuxPackages;
|
||||
boot.extraModulePackages = [
|
||||
config.boot.kernelPackages.gasket #driver for google coral edge tpu
|
||||
];
|
||||
@ -65,7 +64,7 @@ in
|
||||
# create dummy display to be able to start x11
|
||||
'';
|
||||
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
mods.zfs.enable = true;
|
||||
boot.zfs.forceImportRoot = false;
|
||||
boot.zfs.extraPools = [ "raid_vol" ];
|
||||
|
||||
@ -107,12 +106,6 @@ in
|
||||
autoprune = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
zfs
|
||||
screen #can be user (and global)
|
||||
(inputs.dockermcmgr.packages.${pkgs.stdenv.hostPlatform.system}.default)
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostName = "server";
|
||||
|
||||
@ -124,7 +117,7 @@ in
|
||||
defaultGateway.address = "192.168.1.254";
|
||||
defaultGateway.interface = "eth0";
|
||||
nameservers = ["8.8.8.8" "8.8.4.4" "1.1.1.1"];
|
||||
hostId = "68290da7";
|
||||
hostId = "68290da7";
|
||||
|
||||
firewall.allowedTCPPorts = ports;
|
||||
firewall.allowedUDPPorts = ports;
|
||||
@ -144,6 +137,18 @@ in
|
||||
boot = true;
|
||||
};
|
||||
|
||||
systemd.services.dockermcmgr-server = {
|
||||
enable = true;
|
||||
wantedBy = ["multi-user.target"];
|
||||
restartIfChanged = true;
|
||||
serviceConfig = {
|
||||
ExecStart = "${inputs.dockermcmgr.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/dmm serverMode";
|
||||
User = "tom";
|
||||
Group= "users";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
nix.settings.trusted-users = [ "root" "builder" "tom" ];
|
||||
|
||||
users.users.builder = {
|
||||
@ -157,18 +162,4 @@ in
|
||||
users.groups.builder = {};
|
||||
|
||||
mods.remote-build.enable = false;
|
||||
|
||||
|
||||
|
||||
systemd.services.dockermcmgr-server = {
|
||||
enable = true;
|
||||
wantedBy = ["multi-user.target"];
|
||||
restartIfChanged = true;
|
||||
serviceConfig = {
|
||||
ExecStart = "${inputs.dockermcmgr.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/dmm serverMode";
|
||||
User = "tom";
|
||||
Group= "users";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user