From f145684e16ec09120e43c9e6728bd86c17940c91 Mon Sep 17 00:00:00 2001
From: zuma <lucien@shenanigans.cc>
Date: Wed, 7 May 2025 14:32:00 +0200
Subject: [PATCH] Remove activity-watcher and add Gamepad support

---
 commons/programs/hyprland.nix              |  4 ----
 commons/programs/neovim.nix                | 22 ++++++++++++++++++++++
 hosts/t0urn3s0l/configuration.nix          |  6 +++---
 hosts/t0urn3s0l/hardware-configuration.nix |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/commons/programs/hyprland.nix b/commons/programs/hyprland.nix
index 7673e74..f8458b0 100644
--- a/commons/programs/hyprland.nix
+++ b/commons/programs/hyprland.nix
@@ -140,10 +140,6 @@
 
         "swww-daemon" # Animated Wallpaper engine
         "waybar" # Sweet top bar
-
-        # Sleep is needed because otherwise waybar is not initialized
-        "sleep 1 && aw-qt" # ActivityWatch
-        "sleep 1 && aw-awatcher" # ActivityWatcher Wayland Watcher
       ];
     };
   };
diff --git a/commons/programs/neovim.nix b/commons/programs/neovim.nix
index 187517d..cb84271 100644
--- a/commons/programs/neovim.nix
+++ b/commons/programs/neovim.nix
@@ -6,6 +6,28 @@
 
     settings = {
       vim = {
+        keymaps = [
+          # Tab Keymaps
+          {
+            key = "<leader>t";
+            mode = "n";
+            silent = true;
+            action = ":tabnew<CR>";
+          }
+          {
+            key = "<Tab>";
+            mode = "n";
+            silent = true;
+            action = ":tabnext<CR>";
+          }
+          {
+            key = "<S-Tab>";
+            mode = "n";
+            silent = true;
+            action = ":tabprevious<CR>";
+          }
+        ];
+
         useSystemClipboard = true;
         lineNumberMode = "number";
 
diff --git a/hosts/t0urn3s0l/configuration.nix b/hosts/t0urn3s0l/configuration.nix
index cca9fd4..f271a3d 100644
--- a/hosts/t0urn3s0l/configuration.nix
+++ b/hosts/t0urn3s0l/configuration.nix
@@ -136,7 +136,7 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.permittedInsecurePackages = [
                 "cinny-4.2.3"
-		"cinny-unwrapped-4.2.3"
+                "cinny-unwrapped-4.2.3"
               ]; 
 
   # List packages installed in system profile. To search, run:
@@ -203,6 +203,7 @@
     eva # calculator
     util-linux # Set of system utilities
     sshfs # A filesystem to mount drives over ssh
+    exiftool # We need it for images manipulation
 
     # Languages
     php # For hosting Adminer
@@ -215,8 +216,6 @@
     grim # Screenshot tool
     slurp # Useful with grim for screenshotting
     swww # Wallpaper engine
-    activitywatch # Stats on time spent
-    awatcher # Wayland Idle and window watcher
     swaynotificationcenter # Notification daemon and notification center
     virtiofsd # Device backend for libvrtd
   ];
@@ -237,6 +236,7 @@
     };
   };
 
+  # KVM VM settings
   programs.virt-manager.enable = true;
   users.groups.libvirtd.members = ["zuma"];
   virtualisation.libvirtd.enable = true;
diff --git a/hosts/t0urn3s0l/hardware-configuration.nix b/hosts/t0urn3s0l/hardware-configuration.nix
index b97b79b..2874863 100644
--- a/hosts/t0urn3s0l/hardware-configuration.nix
+++ b/hosts/t0urn3s0l/hardware-configuration.nix
@@ -9,7 +9,7 @@
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [ "usbhid" "joydev" "xpad" ]; # usbhid, joydev and xpad are needed in order to use controllers (mine is a PS3 dualshock)
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];