diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix index e3e2c13..6baea05 100644 --- a/configurations/host/flamaster/configuration.nix +++ b/configurations/host/flamaster/configuration.nix @@ -26,7 +26,7 @@ }; programs.java = { enable = true; - package = pkgs.graalvm17-ce; + package = pkgs.graalvm-ce; binfmt = true; }; # Bootloader. diff --git a/configurations/host/flamaster/extraHome.nix b/configurations/host/flamaster/extraHome.nix index 6acafa1..1ad957a 100644 --- a/configurations/host/flamaster/extraHome.nix +++ b/configurations/host/flamaster/extraHome.nix @@ -15,7 +15,7 @@ home.packages = [ pkgs.papirus-icon-theme - (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm17-ce ]; }) + (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; }) ]; } diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix index 68a8260..53a5201 100644 --- a/configurations/host/materusPC/extraHome.nix +++ b/configurations/host/materusPC/extraHome.nix @@ -27,7 +27,7 @@ home.packages = [ pkgs.papirus-icon-theme materusPkgs.ffmpeg6-amf-full - (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm17-ce ]; extraLibs = [ ]; }) + (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm-ce ]; extraLibs = [ ]; }) ]; programs.obs-studio = { diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix index e17b3e4..c015eeb 100644 --- a/configurations/host/materusPC/hardware/boot.nix +++ b/configurations/host/materusPC/hardware/boot.nix @@ -2,10 +2,11 @@ let video = [ - #"video=DP-3:1920x1080@144" "video=HDMI-A-3:1920x1080@144" + "video=DP-3:1920x1080@240" + - "video=DP-1:1920x1080@240" + #"video=DP-1:1920x1080@240" #"video=DP-2:1920x1080@240" #"video=HDMI-A-1:1920x1080@240" #"video=HDMI-A-2:1920x1080@240" @@ -22,7 +23,10 @@ in options kvm_amd nested=1 avic=1 npt=1 options vfio_iommu_type1 allow_unsafe_interrupts=1 ''; - boot.kernel.sysctl = {"vm.max_map_count" = 1000000;}; + boot.kernel.sysctl = { + "vm.max_map_count" = 1000000; + "vm.swappiness" = 10; + }; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; diff --git a/configurations/host/materusPC/hardware/default.nix b/configurations/host/materusPC/hardware/default.nix index b4b2947..361fb43 100644 --- a/configurations/host/materusPC/hardware/default.nix +++ b/configurations/host/materusPC/hardware/default.nix @@ -1,11 +1,4 @@ { config, pkgs, lib, inputs, materusFlake, materusPkgs, ... }: -let -pkg = import (builtins.fetchTarball { - name = "nixos-23.05"; - url = "https://github.com/nixos/nixpkgs/archive/4ecab3273592f27479a583fb6d975d4aba3486fe.tar.gz"; - sha256 = "sha256:10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf"; -}) {system = pkgs.system;}; -in { imports = [ @@ -45,7 +38,6 @@ in materusPkgs.i686Linux.amdgpu-pro-libs.vulkan libvdpau-va-gl ]; - users.groups.gpurun = {}; services.udev.extraRules = '' #GPU bar size diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix index 0264722..4a523f6 100644 --- a/configurations/host/materusPC/kde.nix +++ b/configurations/host/materusPC/kde.nix @@ -10,7 +10,7 @@ let keymap_layout=pl [output] - name=DP-1 + name=DP-3 mode=1920x1080@240 [output] @@ -19,7 +19,7 @@ let [output] name=HDMI-A-3 - mode=1920x1080@144 + mode=off '' ; in @@ -29,13 +29,15 @@ in services.xserver.displayManager.sddm.settings = { General = { DisplayServer = "wayland"; + InputMethod=""; }; Theme = { CursorTheme = "breeze_cursors"; CursorSize = "24"; }; Wayland = { - #CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}"; + CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}"; + }; }; services.xserver.desktopManager.plasma5.enable = true; diff --git a/configurations/host/materusPC/network.nix b/configurations/host/materusPC/network.nix index 35d1513..f53db57 100644 --- a/configurations/host/materusPC/network.nix +++ b/configurations/host/materusPC/network.nix @@ -6,8 +6,8 @@ networking.networkmanager.enable = true; networking.networkmanager.wifi.backend = "iwd"; networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 ]; - networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 ]; + networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944]; + networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944]; #Fix warning networking.networkmanager.extraConfig = lib.mkDefault '' [connectivity] diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 28c0a2b..469f0b1 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -117,6 +117,8 @@ XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_DATA_HOME = "\${HOME}/.local/share"; + SDL_AUDIODRIVER = "pipewire"; + #SSH_ASKPASS_REQUIRE = "prefer"; MOZ_USE_XINPUT2 = "1"; @@ -171,7 +173,7 @@ ''; }; java.enable = true; - java.package = pkgs.graalvm17-ce; + java.package = pkgs.graalvm-ce; java.binfmt = true; command-not-found.enable = false; dconf.enable = true; diff --git a/configurations/profile/os/games/steam.nix b/configurations/profile/os/games/steam.nix index 137658a..b35c5f4 100644 --- a/configurations/profile/os/games/steam.nix +++ b/configurations/profile/os/games/steam.nix @@ -67,6 +67,7 @@ let pkgs.jbig2enc pkgs.jbig2dec pkgs.vivaldi + pkgs.x264.lib pkgs.steamtinkerlaunch ] ++ config.materus.profile.packages.list.fonts;