From dbb54f1aafec35f752450244b566df58af289426 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 6 Oct 2018 01:13:22 +0200 Subject: [PATCH 1/4] =?UTF-8?q?[ASUS]=20d=C3=A9sactivation=20montage=20NFS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- systems/ASUS-G46VW/hardware-configuration.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/systems/ASUS-G46VW/hardware-configuration.nix b/systems/ASUS-G46VW/hardware-configuration.nix index 2847d6a..dd58e6a 100644 --- a/systems/ASUS-G46VW/hardware-configuration.nix +++ b/systems/ASUS-G46VW/hardware-configuration.nix @@ -22,12 +22,6 @@ fsType = "vfat"; }; - fileSystems."/mnt/medias_loutreos" = { - device = "192.168.20.1:/mnt/medias"; - fsType = "nfs"; - options = ["x-systemd.automount" "noauto"]; - }; - swapDevices = [ { device = "/dev/disk/by-uuid/156cd5e8-715c-48a5-9df4-14565227a6c9"; } ]; From 1add101da1011a5b801a6aafaf0dea67b5821f4d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 6 Oct 2018 01:15:48 +0200 Subject: [PATCH 2/4] =?UTF-8?q?[ASUS]=20r=C3=A8gles=20udev=20steam=20contr?= =?UTF-8?q?oller=20pr=C3=A9sentes=20dans=20unstable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- overlays/steamcontroller-udev-rules.nix | 42 ------------------------- systems/ASUS-G46VW/configuration.nix | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 overlays/steamcontroller-udev-rules.nix diff --git a/overlays/steamcontroller-udev-rules.nix b/overlays/steamcontroller-udev-rules.nix deleted file mode 100644 index 701ab8c..0000000 --- a/overlays/steamcontroller-udev-rules.nix +++ /dev/null @@ -1,42 +0,0 @@ -self: super: - -{ - steamcontroller-udev-rules = super.writeTextFile { - name = "steamcontroller-udev-rules"; - text = '' - # This rule is needed for basic functionality of the controller in Steam and keyboard/mouse emulation - SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666" - - # This rule is necessary for gamepad emulation; - KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput" - - # Valve HID devices over USB hidraw - KERNEL=="hidraw*", ATTRS{idVendor}=="28de", MODE="0666" - - # Valve HID devices over bluetooth hidraw - KERNEL=="hidraw*", KERNELS=="*28DE:*", MODE="0666" - - # DualShock 4 over USB hidraw - KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0666" - - # DualShock 4 wireless adapter over USB hidraw - KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0666" - - # DualShock 4 Slim over USB hidraw - KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0666" - - # DualShock 4 over bluetooth hidraw - KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666" - - # DualShock 4 Slim over bluetooth hidraw - KERNEL=="hidraw*", KERNELS=="*054C:09CC*", MODE="0666" - - # Nintendo Switch Pro Controller over USB hidraw - KERNEL=="hidraw*", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="2009", MODE="0666" - - # Nintendo Switch Pro Controller over bluetooth hidraw - KERNEL=="hidraw*", KERNELS=="*057E:2009*", MODE="0666" - ''; - destination = "/etc/udev/rules.d/60-steamcontroller.rules"; - }; -} diff --git a/systems/ASUS-G46VW/configuration.nix b/systems/ASUS-G46VW/configuration.nix index b3e2601..a25c99f 100644 --- a/systems/ASUS-G46VW/configuration.nix +++ b/systems/ASUS-G46VW/configuration.nix @@ -13,7 +13,6 @@ nixpkgs.overlays = [ (import ../../overlays/steam.nix) - (import ../../overlays/steamcontroller-udev-rules.nix) (import ../../overlays/ledger-udev-rules.nix) ]; @@ -27,11 +26,11 @@ # For Steam hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; + hardware.steam-hardware.enable = true; hardware.u2f.enable = true; services.udev.packages = with pkgs; [ - steamcontroller-udev-rules ledger-udev-rules ]; From 979a00c54eadf1b1cbea68aeb2b617761d069aec Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 6 Oct 2018 01:16:29 +0200 Subject: [PATCH 3/4] [ASUS] erreur compilation torbrowser --- systems/ASUS-G46VW/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/ASUS-G46VW/configuration.nix b/systems/ASUS-G46VW/configuration.nix index a25c99f..497548d 100644 --- a/systems/ASUS-G46VW/configuration.nix +++ b/systems/ASUS-G46VW/configuration.nix @@ -64,7 +64,6 @@ firefox chromium - torbrowser qutebrowser tdesktop From 2dcb9e51f5fca98bdc9e431aa385acb246cd9295 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 6 Oct 2018 01:17:07 +0200 Subject: [PATCH 4/4] [ASUS] activation Nvidia PRIME --- overlays/steam.nix | 17 ----------------- systems/ASUS-G46VW/configuration.nix | 11 ++++++++--- 2 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 overlays/steam.nix diff --git a/overlays/steam.nix b/overlays/steam.nix deleted file mode 100644 index 121f8e1..0000000 --- a/overlays/steam.nix +++ /dev/null @@ -1,17 +0,0 @@ -self: super: -let - baseConfig = { - allowUnfree = true; - }; - nixpkgs-steam-56 = import (super.fetchFromGitHub { - owner = "nyanloutre"; - repo = "nixpkgs"; - rev = "7af3a85d8d1a91b57b6cdee0b2e5d88981f310fa"; - sha256 = "1rcd0nw8k1pcp80zm8kyhk288dj5ifmxhpacm1wi5hfnhw194w1g"; - }) {config = baseConfig;}; -in -{ - steam_primus = nixpkgs-steam-56.steamPackages.steam-chrootenv.override { - withPrimus = true; - }; -} diff --git a/systems/ASUS-G46VW/configuration.nix b/systems/ASUS-G46VW/configuration.nix index 497548d..59c4923 100644 --- a/systems/ASUS-G46VW/configuration.nix +++ b/systems/ASUS-G46VW/configuration.nix @@ -12,7 +12,6 @@ ]; nixpkgs.overlays = [ - (import ../../overlays/steam.nix) (import ../../overlays/ledger-udev-rules.nix) ]; @@ -22,7 +21,13 @@ boot.tmpOnTmpfs = true; boot.plymouth.enable = true; - hardware.bumblebee.enable = true; + # NVIDIA + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia.optimus_prime.enable = true; + hardware.nvidia.modesetting.enable = true; + hardware.nvidia.optimus_prime.nvidiaBusId = "PCI:1:0:0"; + hardware.nvidia.optimus_prime.intelBusId = "PCI:0:2:0"; + # For Steam hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; @@ -98,7 +103,7 @@ vlc kodiPlain - steam_primus + steam sc-controller steam-run minecraft