commit changes

systems/x86_64-linux/drivebystation-nix/configuration.nix

@@ -6,7 +6,7 @@
 
 {
   imports =
-    [ 
+    [
       ./hardware/hardware-configuration.nix
     ];
 
@@ -42,37 +42,88 @@
     LC_TIME = "nl_NL.UTF-8";
   };
 
-  services.xserver = {
-    enable = true; # Enable the deprecated X11 teletype terminal connection system. 
-    # Specify first device section to use nvidia GPU
-    #deviceSection = ''
-    #  # Pick the 1070
-    #  BusID "PCI:1:0:0"
-    #'';
-    desktopManager = {
-      # Disable xterm
-      xterm.enable = false;
-      # Enable xfce session
-      xfce = {
-        enable = true;
+  services = {
+    displayManager.sddm.enable = false;
+    displayManager.defaultSession = "gnome";
+    desktopManager.plasma6.enable = true;
+    xserver = {
+      enable = true; # Enable the deprecated X11 teletype terminal connection system. 
+      # Specify first device section to use nvidia GPU
+
+
+
+
+
+    #   services.xserver.config = lib.mkForce ''
+    #   Section "ServerLayout"
+    #     Identifier "layout"
+    #     Screen 0 "amdgpu"
+    #     Inactive "nvidia"
+    #     Option "AllowNVIDIAGPUScreens"
+    #   EndSection
+
+    #   Section "Device"
+    #     Identifier "nvidia"
+    #     Driver "nvidia"
+    #     BusID "PCI:01:0:0"
+    #   EndSection
+
+    #   Section "Screen"
+    #     Identifier "nvidia"
+    #     Device "nvidia"
+    #   EndSection
+
+    #   Section "Device"
+    #     Identifier "amdgpu"
+    #     Driver "amdgpu"
+    #     BusID "PCI:50:0:0"
+    #   EndSection
+
+    #   Section "Screen"
+    #     Identifier "amdgpu"
+    #     Device "amdgpu"
+    #   EndSection
+    # '';
+
+
+
+
+      deviceSection = ''
+       # Pick the 1070
+       # BusID "PCI:01:0:0"
+       # Pick amdgpu
+       BusID "PCI:50:0:0"
+      '';
+      serverLayoutSection = ''
+        Identifier "layout"
+        Screen 0 "amdgpu"
+        Screen "Screen-amdgpu[0]"
+        Inactive "nvidia"
+        Option "AllowNVIDIAGPUScreens"
+      '';
+
+      desktopManager = {
+        # Disable xterm
+        xterm.enable = false;
+        # Enable xfce session
+        xfce = {
+          enable = true;
+        };
+        # Enable Gnome Session
+        gnome.enable = true;
+        # Disable fuckshit plasma
+      };
+      # Configure Display Manager
+      displayManager = {
+        gdm.enable = true;
+        # Enable lightdm
+        lightdm.enable = false;
+      };
+      # Configure keymap in X11
+      xkb = {
+        layout = "us";
+        variant = "intl";
       };
-      # Enable Gnome Session
-      gnome.enable = true;
-      # Disable fuckshit plasma
-      plasma6.enable = false;
-    };
-    # Configure Display Manager
-    displayManager = {
-      gdm.enable = false;
-      sddm.enable = false;
-      # Enable lightdm
-      lightdm.enable = true;
-      defaultSession = "xfce";
-    };
-    # Configure keymap in X11
-    xkb = {
-      layout = "us";
-      variant = "intl";
     };
   };
   # services.xserver.displayManager.defaultSession = "gnome-x11";  # services.xserver.displayManager.autoLogin.enable = true;
@@ -116,8 +167,8 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
     xfce.xfce4-whiskermenu-plugin
     gnome-tweaks
   ];
@@ -136,7 +187,7 @@
   # services.openssh.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 
+  networking.firewall.allowedTCPPorts = [
     24800 #Synergy
   ];
   networking.firewall.allowedUDPPorts = [