From 030ef2e500ef7f47efeb966f78664c8d39278b30 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 11 Feb 2025 21:05:28 -0500 Subject: [PATCH] clean up & steam server --- hosts/fwbook.hardware-configuration.nix | 6 +-- hosts/hl-fws1.nix | 45 ++++++++++----------- hosts/hl-minipc1.hardware-configuration.nix | 10 ++++- hosts/hl-minipc1.nix | 10 ----- 4 files changed, 34 insertions(+), 37 deletions(-) diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index a850b5a..7736a96 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -11,7 +11,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - security.protectKernelImage = false; + security.protectKernelImage = false; fileSystems."/" = { device = "/dev/disk/by-uuid/3fbf3ccf-655a-4040-b898-b97a1d555912"; @@ -32,10 +32,10 @@ swapDevices = [ - { device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; } + # { device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; } { device = "/swapfile"; - size = 16 * 1024; # 16GB + size = 48 * 1024; # 48GB } ]; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 8f6f824..0ecbc99 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -1,5 +1,5 @@ { user }: -{ pkgs, lib, config, ... }: +{ pkgs, ... }: let scriptsFolder = builtins.filterSource (p: t: true) ./scripts/fw1; in @@ -23,27 +23,26 @@ in boot.tmp.useTmpfs = true; # Game Engine - boot.kernelPackages = pkgs.linuxPackages; # (this is the default) some amdgpu issues on 6.10 - programs = { - gamescope = { - enable = true; - capSysNice = true; - }; - steam = { - enable = true; - gamescopeSession.enable = true; - extest.enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - }; - }; - services.getty.autologinUser = "ari"; - environment = { - systemPackages = with pkgs;[ mangohud ]; - loginShellInit = '' - [[ "$(tty)" = "/dev/tty1" ]] && ${scriptsFolder}/gs.sh - ''; - }; + # programs = { + # gamescope = { + # enable = true; + # capSysNice = true; + # }; + # steam = { + # enable = true; + # gamescopeSession.enable = true; + # extest.enable = true; + # remotePlay.openFirewall = true; + # dedicatedServer.openFirewall = true; + # localNetworkGameTransfers.openFirewall = true; + # }; + # }; + # services.getty.autologinUser = "ari"; + # environment = { + # systemPackages = with pkgs;[ mangohud ]; + # loginShellInit = '' + # [[ "$(tty)" = "/dev/tty1" ]] && ${scriptsFolder}/gs.sh + # ''; + # }; } diff --git a/hosts/hl-minipc1.hardware-configuration.nix b/hosts/hl-minipc1.hardware-configuration.nix index 3132df9..c789740 100644 --- a/hosts/hl-minipc1.hardware-configuration.nix +++ b/hosts/hl-minipc1.hardware-configuration.nix @@ -6,6 +6,9 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; @@ -21,7 +24,12 @@ device = "/dev/disk/by-uuid/01FE-EDCC"; fsType = "vfat"; }; - + # Data + fileSystems."/mnt/Data" = { + device = "/dev/disk/by-uuid/ee4a60a8-b0d1-4f5c-a554-1d1d84c89e34"; + fsType = "ext4"; + options = [ "defaults" ]; + }; swapDevices = [ ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index d513a6b..4bff92b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -27,16 +27,6 @@ in }; # firmware updater services.fwupd.enable = true; - - # # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - # # Data - fileSystems."/mnt/Data" = { - device = "/dev/disk/by-uuid/ee4a60a8-b0d1-4f5c-a554-1d1d84c89e34"; - fsType = "ext4"; - options = [ "defaults" ]; - }; # # Services skyg.nixos.server.services = { audiobookshelf = {