From 406be8c14fd8a7d40940278f795dc26b92c47256 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 18 May 2022 19:43:52 +0200
Subject: [PATCH 1/2] rename packages with new names

---
 systems/PC-Fixe/configuration.nix | 2 +-
 systems/common-cli.nix            | 6 +++---
 systems/common-gui.nix            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix
index cd1454d..9f8e5a4 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;
diff --git a/systems/common-cli.nix b/systems/common-cli.nix
index 756a953..6d72c56 100644
--- a/systems/common-cli.nix
+++ b/systems/common-cli.nix
@@ -46,11 +46,11 @@
     usbutils
 
     # Réseau
-    telnet
+    inetutils
     rclone
     lftp
-    wireguard
-    nfsUtils
+    wireguard-tools
+    nfs-utils
     nmap
 
     # Divers
diff --git a/systems/common-gui.nix b/systems/common-gui.nix
index 8686638..8464231 100644
--- a/systems/common-gui.nix
+++ b/systems/common-gui.nix
@@ -22,7 +22,7 @@
     monero-gui
 
     firefox
-    torbrowser
+    tor-browser-bundle-bin
     chromium
 
     tdesktop
@@ -52,7 +52,7 @@
       inherit (texlive) scheme-small titling collection-langfrench cm-super;
     })
 
-    gnome-breeze
+    libsForQt5.breeze-gtk
 
     libreoffice
 

From 5b515d6147f0621ed0ffca6e343452a325f7bf9a Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 18 May 2022 19:44:20 +0200
Subject: [PATCH 2/2] change display port

---
 systems/PC-Fixe/configuration.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/systems/PC-Fixe/configuration.nix b/systems/PC-Fixe/configuration.nix
index 9f8e5a4..61304dd 100644
--- a/systems/PC-Fixe/configuration.nix
+++ b/systems/PC-Fixe/configuration.nix
@@ -209,13 +209,12 @@
   };
 
   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
-    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";
+    DP4Config = "--output DP-4 --mode 3440x1440 --rate 144";
+    HDMIConfig = "--output HDMI-0 --auto --left-of DP-4";
   in {
     services = {
       wol = {
@@ -235,8 +234,8 @@
       "enableTV" = {
         description = "Enable TV output";
         script = ''
-          ${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 ${DP4Config} --primary
+          /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
           ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig}
           ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }'
         '';
@@ -246,8 +245,8 @@
       "primaryTV" = {
         description = "Set TV output as primary";
         script = ''
-          ${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 ${DP4Config}
+          /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
           ${pkgs.xorg.xrandr}/bin/xrandr ${HDMIConfig} --primary
           ${pkgs.pipewire}/bin/pw-cli s 43 Profile '{ index: 1 }'
         '';
@@ -257,8 +256,8 @@
       "FreeSyncMode" = {
         description = "Enable FreeSync screen only";
         script = ''
-          ${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 ${DP4Config}
+          /run/current-system/sw/bin/nvidia-settings --assign CurrentMetaMode="DP-4: 3440x1440_144 { AllowGSYNCCompatible=On }"
           ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --off
         '';
         conflicts = ["CSMode.service"];
@@ -267,12 +266,12 @@
       "CSMode" = {
         description = "Enable 4:3 black bars";
         script = ''
-          ${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 ${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 --output HDMI-0 --off
         '';
         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 = {
           Type = "oneshot";