diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix index 61304dd..cd1454d 100644 --- a/systems/PC-Fixe/configuration.nix +++ b/systems/PC-Fixe/configuration.nix @@ -95,7 +95,7 @@ }; environment.systemPackages = with pkgs; [ - usb-modeswitch + usb_modeswitch ]; programs.wireshark.enable = true; @@ -209,12 +209,13 @@ }; 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 - DP4Config = "--output DP-4 --mode 3440x1440 --rate 144"; - HDMIConfig = "--output HDMI-0 --auto --left-of DP-4"; + DP0Config = "--output DP-0 --mode 3440x1440 --rate 144"; + DP2Config = "--output DP-2 --auto --left-of DP-0"; + HDMIConfig = "--output HDMI-0 --auto --left-of DP-0"; in { services = { wol = { @@ -234,8 +235,8 @@ "enableTV" = { description = "Enable TV output"; script = '' - ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary - /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" + ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} --primary + /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }' ''; @@ -245,8 +246,8 @@ "primaryTV" = { description = "Set TV output as primary"; script = '' - ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} - /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" + ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} + /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} --primary ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }' ''; @@ -256,8 +257,8 @@ "FreeSyncMode" = { description = "Enable FreeSync screen only"; script = '' - ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} - /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }" + ${pkgs.xorg.xrandr}/bin/xrandr ${DP0Config} + /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-0: 3440x1440_144 { AllowGSYNCCompatible=On }" ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off ''; conflicts = ["CSMode.service"]; @@ -266,12 +267,12 @@ "CSMode" = { description = "Enable 4:3 black bars"; script = '' - ${pkgs.xorg.xrandr}/bin/xrandr ${DP4Config} --primary - /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 ${DP0Config} --primary + /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 ''; 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 = { Type = "oneshot"; diff --git a/systems/common-cli.nix b/systems/common-cli.nix index 6d72c56..756a953 100644 --- a/systems/common-cli.nix +++ b/systems/common-cli.nix @@ -46,11 +46,11 @@ usbutils # Réseau - inetutils + telnet rclone lftp - wireguard-tools - nfs-utils + wireguard + nfsUtils nmap # Divers diff --git a/systems/common-gui.nix b/systems/common-gui.nix index 8464231..8686638 100644 --- a/systems/common-gui.nix +++ b/systems/common-gui.nix @@ -22,7 +22,7 @@ monero-gui firefox - tor-browser-bundle-bin + torbrowser chromium tdesktop @@ -52,7 +52,7 @@ inherit (texlive) scheme-small titling collection-langfrench cm-super; }) - libsForQt5.breeze-gtk + gnome-breeze libreoffice