Compare commits

..

No commits in common. "5b515d6147f0621ed0ffca6e343452a325f7bf9a" and "b9fc58fc597a91b1ddae78f7ed92faea960c10b3" have entirely different histories.

3 changed files with 19 additions and 18 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,12 +209,13 @@
}; };
services.xserver.deviceSection = '' services.xserver.deviceSection = ''
Option "metamodes" "DP-4: 3440x1440_144 +0+0 {AllowGSYNCCompatible=On}" Option "metamodes" "DP-0: 3440x1440_144 +0+0 {AllowGSYNCCompatible=On}"
''; '';
systemd = let systemd = let
DP4Config = "--output DP-4 --mode 3440x1440 --rate 144"; DP0Config = "--output DP-0 --mode 3440x1440 --rate 144";
HDMIConfig = "--output HDMI-0 --auto --left-of DP-4"; DP2Config = "--output DP-2 --auto --left-of DP-0";
HDMIConfig = "--output HDMI-0 --auto --left-of DP-0";
in { in {
services = { services = {
wol = { wol = {
@ -234,8 +235,8 @@
"enableTV" = { "enableTV" = {
description = "Enable TV output"; description = "Enable TV output";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} --primary
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 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 }'
''; '';
@ -245,8 +246,8 @@
"primaryTV" = { "primaryTV" = {
description = "Set TV output as primary"; description = "Set TV output as primary";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config}
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 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 }'
''; '';
@ -256,8 +257,8 @@
"FreeSyncMode" = { "FreeSyncMode" = {
description = "Enable FreeSync screen only"; description = "Enable FreeSync screen only";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config}
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 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"];
@ -266,12 +267,12 @@
"CSMode" = { "CSMode" = {
description = "Enable 4:3 black bars"; description = "Enable 4:3 black bars";
script = '' script = ''
${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} --primary
/run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=1920x1440+760+0, AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 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-4: 3440x1440_144 { ViewPortIn=3440x1440, ViewPortOut=3440x1440+0+0, AllowGSYNCCompatible=On }" /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 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
inetutils telnet
rclone rclone
lftp lftp
wireguard-tools wireguard
nfs-utils nfsUtils
nmap nmap
# Divers # Divers

View File

@ -22,7 +22,7 @@
monero-gui monero-gui
firefox firefox
tor-browser-bundle-bin torbrowser
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;
}) })
libsForQt5.breeze-gtk gnome-breeze
libreoffice libreoffice