From b4cafcfe3a25fc5cd3aeed15aa22f7c65d30e538 Mon Sep 17 00:00:00 2001 From: materus Date: Mon, 20 May 2024 15:40:24 +0200 Subject: [PATCH] configurations: updates --- .../host/flamaster/configuration.nix | 4 +- .../host/flamaster/home/materus/default.nix | 59 +++++++++++++++++++ .../host/materusPC/hardware/boot.nix | 5 +- configurations/host/materusPC/network.nix | 2 +- configurations/profile/common/nixpkgs.nix | 2 +- 5 files changed, 67 insertions(+), 5 deletions(-) diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix index 368721f..e1ff3ed 100644 --- a/configurations/host/flamaster/configuration.nix +++ b/configurations/host/flamaster/configuration.nix @@ -158,9 +158,9 @@ services.openssh.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22 27015 25565 24454 8123 ]; + networking.firewall.allowedTCPPorts = [ 22 27015 25565 24454 8123 24800 ]; networking.firewall.allowedTCPPortRanges = [{ from = 16262; to = 16272; }]; - networking.firewall.allowedUDPPorts = [ 22 16261 16262 8766 8767 25565 24454 8123 ]; + networking.firewall.allowedUDPPorts = [ 22 16261 16262 8766 8767 25565 24454 8123 24800 ]; # Or disable the firewall altogether. networking.firewall.enable = true; diff --git a/configurations/host/flamaster/home/materus/default.nix b/configurations/host/flamaster/home/materus/default.nix index 3b84d00..5e37175 100644 --- a/configurations/host/flamaster/home/materus/default.nix +++ b/configurations/host/flamaster/home/materus/default.nix @@ -13,6 +13,65 @@ bash.enable = true; zsh.enable = true; + editor.code.fhs.enable = true; + editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in [ + llvmpkgs.clang + llvmpkgs.llvm + llvmpkgs.bintools + llvmpkgs.lld + llvmpkgs.lldb + llvmpkgs.libllvm + llvmpkgs.libllvm.dev + + raylib + gcc + gdb + nil + nixfmt + nixpkgs-fmt + cmake + gnumake + ninja + binutils + coreutils + util-linux + openssl + openssl.dev + pkg-config + dotnet-sdk_8 + mono + mold + python3 + lua + gtk4.dev + gtk4 + miniaudio + SDL2.dev + SDL2 + freeglut.dev + freeglut + boost.dev + boost + glew.dev + libGL.dev + libGLU.dev + vulkan-loader.dev + xorg.xorgproto + xorg.libX11.dev + xorg.libXrandr.dev + xorg.libXrender.dev + rustup + freetype.dev + + fpc + openjdk21 + bison + flex + + ldc + dmd + dub + ]); }; diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix index d6fbd03..a502430 100644 --- a/configurations/host/materusPC/hardware/boot.nix +++ b/configurations/host/materusPC/hardware/boot.nix @@ -13,10 +13,13 @@ let ]; + in { #Kernel - boot.kernelPackages = pkgs.linuxPackages_zen; + + boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_lqx; + boot.kernelParams = [ "rcu_nocbs=${materusArg.materusPC.vmCores}" "nohz_full=${materusArg.materusPC.vmCores}" diff --git a/configurations/host/materusPC/network.nix b/configurations/host/materusPC/network.nix index e030a07..b382d9d 100644 --- a/configurations/host/materusPC/network.nix +++ b/configurations/host/materusPC/network.nix @@ -11,7 +11,7 @@ #networking.networkmanager.wifi.backend = "iwd"; networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944 ]; - networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944 ]; + networking.firewall.allowedUDPPorts = [ (lib.strings.toInt materusArg.wireguard.port) 24800 5900 3702 4656 6000 9943 9944 ]; networking.networkmanager.settings = { connectivity = { uri = "http://nmcheck.gnome.org/check_network_status.txt"; diff --git a/configurations/profile/common/nixpkgs.nix b/configurations/profile/common/nixpkgs.nix index bb400b6..8698357 100644 --- a/configurations/profile/common/nixpkgs.nix +++ b/configurations/profile/common/nixpkgs.nix @@ -20,7 +20,7 @@ in }; config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ]; - config.nix.package = lib.mkDefault pkgs.nixUnstable; + config.nix.package = lib.mkDefault (if (!materusCfg.stable) then pkgs.nixVersions.${"latest"} else pkgs.nixVersions.stable); config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry { nixpkgs-stable = { from = { type = "indirect"; id = "nixpkgs-stable"; };