Compare commits

...

2 Commits

Author SHA1 Message Date
nyanloutre 5b515d6147
change display port 2022-05-18 19:44:20 +02:00
nyanloutre 406be8c14f
rename packages with new names 2022-05-18 19:43:52 +02:00
3 changed files with 18 additions and 19 deletions

View File

@ -95,7 +95,7 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
usb_modeswitch usb-modeswitch
]; ];
programs.wireshark.enable = true; programs.wireshark.enable = true;
@ -209,13 +209,12 @@
}; };
services.xserver.deviceSection = '' services.xserver.deviceSection = ''
Option "metamodes" "DP-0: 3440x1440_144 +0+0 {AllowGSYNCCompatible=On}" Option "metamodes" "DP-4: 3440x1440_144 +0+0 {AllowGSYNCCompatible=On}"
''; '';
systemd = let systemd = let
DP0Config = "--output DP-0 --mode 3440x1440 --rate 144"; DP4Config = "--output DP-4 --mode 3440x1440 --rate 144";
DP2Config = "--output DP-2 --auto --left-of DP-0"; HDMIConfig = "--output HDMI-0 --auto --left-of DP-4";
HDMIConfig = "--output HDMI-0 --auto --left-of DP-0";
in { in {
services = { services = {
wol = { wol = {
@ -235,8 +234,8 @@
"enableTV" = { "enableTV" = {
description = "Enable TV output"; description = "Enable TV output";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} --primary ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig}
${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }' ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }'
''; '';
@ -246,8 +245,8 @@
"primaryTV" = { "primaryTV" = {
description = "Set TV output as primary"; description = "Set TV output as primary";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config}
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} --primary ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} --primary
${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }' ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }'
''; '';
@ -257,8 +256,8 @@
"FreeSyncMode" = { "FreeSyncMode" = {
description = "Enable FreeSync screen only"; description = "Enable FreeSync screen only";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config}
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off
''; '';
conflicts = ["CSMode.service"]; conflicts = ["CSMode.service"];
@ -267,12 +266,12 @@
"CSMode" = { "CSMode" = {
description = "Enable 4:3 black bars"; description = "Enable 4:3 black bars";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} --primary ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=1920x1440+760+0, AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=1920x1440+760+0, AllowGSYNCCompatible=On }"
${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off
''; '';
preStop = '' preStop = ''
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=3440x1440+0+0, AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=3440x1440+0+0, AllowGSYNCCompatible=On }"
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";

View File

@ -46,11 +46,11 @@
usbutils usbutils
# Réseau # Réseau
telnet inetutils
rclone rclone
lftp lftp
wireguard wireguard-tools
nfsUtils nfs-utils
nmap nmap
# Divers # Divers

View File

@ -22,7 +22,7 @@
monero-gui monero-gui
firefox firefox
torbrowser tor-browser-bundle-bin
chromium chromium
tdesktop tdesktop
@ -52,7 +52,7 @@
inherit (texlive) scheme-small titling collection-langfrench cm-super; inherit (texlive) scheme-small titling collection-langfrench cm-super;
}) })
gnome-breeze libsForQt5.breeze-gtk
libreoffice libreoffice