From af32037f5d845f114725b68d5209b8057878a116 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Mon, 30 Sep 2024 20:25:08 +0200
Subject: [PATCH] minor fixes

---
 home/modules/wm/hyprland/toothpick/inputs.nix | 23 ++++++++-----------
 .../modules/hardware/graphics/amd/default.nix |  1 +
 .../hardware/graphics/nvidia/default.nix      |  1 +
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/home/modules/wm/hyprland/toothpick/inputs.nix b/home/modules/wm/hyprland/toothpick/inputs.nix
index 82752393..1c96ea32 100644
--- a/home/modules/wm/hyprland/toothpick/inputs.nix
+++ b/home/modules/wm/hyprland/toothpick/inputs.nix
@@ -1,12 +1,11 @@
-{ lib
-, config
-, ...
-}:
-let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf mkEnableOption;
   cfg = config.modules.wm.hyprland.toothpick.inputs;
-in
-{
+in {
   options = {
     modules.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland";
   };
@@ -20,6 +19,9 @@ in
       ];
 
       input = {
+        kb_layout = "se";
+        kb_variant = "nodeadkeys";
+
         follow_mouse = 1;
         accel_profile = "flat";
         sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
@@ -31,13 +33,6 @@ in
           scroll_factor = 0.5;
         };
       };
-      # Desktop keyboard
-      device = [
-        {
-          name = "usb-hid-keyboard";
-          kb_layout = "se";
-        }
-      ];
       gestures = {
         workspace_swipe = true;
         workspace_swipe_distance = 400;
diff --git a/system/modules/hardware/graphics/amd/default.nix b/system/modules/hardware/graphics/amd/default.nix
index b303b487..1cc9dcce 100644
--- a/system/modules/hardware/graphics/amd/default.nix
+++ b/system/modules/hardware/graphics/amd/default.nix
@@ -11,6 +11,7 @@ in {
     modules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
   };
   config = mkIf cfg.enable {
+    services.xserver.videoDrivers = ["amdgpu"];
     hardware = {
       graphics = {
         enable = true;
diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/system/modules/hardware/graphics/nvidia/default.nix
index 0e9cd47c..7660415d 100644
--- a/system/modules/hardware/graphics/nvidia/default.nix
+++ b/system/modules/hardware/graphics/nvidia/default.nix
@@ -29,6 +29,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    services.xserver.videoDrivers = ["nvidia"];
     environment.systemPackages = with pkgs; [
       egl-wayland
     ];