modules/workstation: fixing bad graphics driver settings

4 files changed, 15 insertions, 30 deletions

diff --git a/modules/workstation/graphics/default.nix b/modules/workstation/graphics/default.nix
index e389b0015ba..1995313f1a6 100644
--- a/modules/workstation/graphics/default.nix
+++ b/modules/workstation/graphics/default.nix
@@ -15,17 +15,25 @@
         enableXfwm = false;
       };
     };
-    displayManager.defaultSession = "xfce";
+    displayManager.defaultSession = "xfce+i3";
     windowManager.i3.enable = true;
 
-    videoDrivers = [ "intel" ];
+    useGlamor = true;
+    videoDrivers = [ "amdgpu" ];
     deviceSection = ''
       Option "DRI" "2"
       Option "TearFree" "true"
     '';
-    useGlamor = true;
   };
 
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    extraPackages = with pkgs; [ libGL xorg.xf86videoati xorg.xf86inputlibinput ];
+    driSupport32Bit = true;
+  };
+  hardware.pulseaudio.support32Bit = true;
+  
   home-manager.users.spacekookie = { ... }: {
     imports = [
       ./i3
@@ -36,8 +44,6 @@
 
     services.gnome-keyring.enable = true;
 
-    home.packages = [
-      pkgs.gnome3.gnome-screenshot
-    ];
+    home.packages = [ pkgs.gnome3.gnome-screenshot ];
   };
 }
diff --git a/modules/workstation/graphics/fun.nix b/modules/workstation/graphics/fun.nix
index 56a6b4c0aef..de934b80e06 100644
--- a/modules/workstation/graphics/fun.nix
+++ b/modules/workstation/graphics/fun.nix
@@ -4,5 +4,7 @@
   home.packages = with pkgs; [
     spotify
     steam
+
+    superTuxKart
   ];
 }
diff --git a/modules/workstation/graphics/i3/compton.conf b/modules/workstation/graphics/i3/compton.conf
index a632c022593..473125630ae 100644
--- a/modules/workstation/graphics/i3/compton.conf
+++ b/modules/workstation/graphics/i3/compton.conf
@@ -6,15 +6,3 @@ menu-opacity = 0.90;
 frame-opacity = 0.90;  # i.e. titlebars, borders
 inactive-opacity-override = false;
 alpha-step = 0.06;
-
-### Blur options
-blur-background = true;
-blur-background-frame = true;
-# blur-kern = "3x3box"
-# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
-# blur-background-fixed = true;
-blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ];
-
-# # Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
-detect-rounded-corners = true;
-detect-client-opacity = true
diff --git a/modules/workstation/graphics/i3/i3status.conf b/modules/workstation/graphics/i3/i3status.conf
index fb36d20e7a0..042124f3fc2 100644
--- a/modules/workstation/graphics/i3/i3status.conf
+++ b/modules/workstation/graphics/i3/i3status.conf
@@ -8,32 +8,21 @@
 
 general {
         colors = true
-        interval = 5
+        interval = 1
 }
 
 order += "ipv6"
 order += "disk /"
-order += "wireless _first_"
 order += "ethernet _first_"
-order += "battery all"
 order += "load"
 order += "tztime local"
 
-wireless _first_ {
-    format_up = "W: (%quality at %essid) %ip"
-    format_down = "W: <down>"
-}
-
 ethernet _first_ {
     # if you use %speed, i3status requires root privileges
     format_up = "E: %ip (%speed)"
     format_down = "E: <down>"
 }
 
-battery all {
-    format = "%status %percentage"
-}
-
 tztime local {
     format = "%Y-%m-%d %H:%M:%S"
 }