diff --git a/home/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf
index 07eeb33..cc56e2f 100644
--- a/home/config/hypr/hyprland.conf
+++ b/home/config/hypr/hyprland.conf
@@ -166,7 +166,7 @@ device {
 $mainMod = SUPER # Sets "Windows" key as main modifier
 $terminal = kitty
 $browser = firefox
-$fileManager = nautilus
+$fileManager = dolphin
 $menu = rofi -show drun
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
@@ -179,12 +179,8 @@ bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 
-# Screenshot a window
-bind = $mainMod, PRINT, exec, hyprshot -m window
-# Screenshot a monitor
-bind = , PRINT, exec, hyprshot -m output
 # Screenshot a region
-bind = $shiftMod, PRINT, exec, hyprshot -m region
+bind = , PRINT, exec, hyprshot -m region
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
@@ -216,18 +212,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
 
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
 
 ##############################
 ### WINDOWS AND WORKSPACES ###
diff --git a/home/config/hyprpanel/options.json b/home/config/hyprpanel/options.json
index 9012db8..f97a375 100644
--- a/home/config/hyprpanel/options.json
+++ b/home/config/hyprpanel/options.json
@@ -151,7 +151,7 @@
   "bar.media.rightClick": "",
   "bar.media.show_active_only": false,
   "bar.media.truncation_size": 30,
-  "bar.media.show_label": true,
+  "bar.media.show_label": false,
   "bar.media.truncation": true,
   "bar.media.show_artist": false,
   "bar.clock.scrollDown": "",
@@ -226,14 +226,14 @@
         "workspaces"
       ],
       "middle": [
-        "media"
+        "clock"
       ],
       "right": [
         "systray",
+        "media",
         "volume",
         "network",
         "bluetooth",
-        "clock",
         "battery",
         "notifications"
       ]
diff --git a/home/user/programs/default.nix b/home/user/programs/default.nix
index 8b69b21..71e8427 100644
--- a/home/user/programs/default.nix
+++ b/home/user/programs/default.nix
@@ -4,6 +4,7 @@
     ./git.nix
     ./home-manager.nix
     ./hyprland.nix
+    ./gpg.nix
     ./kitty.nix
     ./starship.nix
     ./vscode.nix
diff --git a/home/user/programs/git.nix b/home/user/programs/git.nix
index e667eff..065547a 100644
--- a/home/user/programs/git.nix
+++ b/home/user/programs/git.nix
@@ -3,5 +3,14 @@
     enable = true;
     userName = "Ludovic Ortega";
     userEmail = "ludovic.ortega@adminafk.fr";
+    signing = {
+      key = "81E390A404C7D583A6D6958E22F86C9B1BEC401D";
+      signByDefault = true;
+    };
+    extraConfig = {
+      core.editor = "vim";
+      ui.color = true;
+      push.autoSetupRemote = true;
+    };
   };
 }
diff --git a/home/user/programs/gpg.nix b/home/user/programs/gpg.nix
new file mode 100644
index 0000000..2d60671
--- /dev/null
+++ b/home/user/programs/gpg.nix
@@ -0,0 +1,3 @@
+{
+  programs.gpg.agent = true;
+}
\ No newline at end of file
diff --git a/home/user/scripts/yad.nix b/home/user/scripts/yad.nix
index 8c996a6..30e1b97 100644
--- a/home/user/scripts/yad.nix
+++ b/home/user/scripts/yad.nix
@@ -14,25 +14,15 @@
       --column=Description: \
       --timeout=90 \
       --timeout-indicat \
-      " + ENTER" "Terminal" " + K" "App launcher" \
-      " + R" "Run command" " + M" "Minecraft launcher" \
-      " + C" "Calculator" " + SHIFT + W" "Search websites" \
-      " + A" "Open notifications" " + SHIFT + A" "Clear notifications" \
-      " + W" "Launch Firefox" " + ." "Emoji picker" \
-      " + S" "Take screenshot" " + SHIFT + M" "Mute microphone" \
-      " + D" "Launch Discord" " + P" "Pause player" \
-      " + SHIFT + P" "Next track" " + ALT + P" "Previous track" \
-      " + SHIFT + C" "Launch VSCodium" " + O" "Start screen recording" \
-      " + SHIFT + O" "Stop screen recording" " + G" "Launch Chrome" \
-      " + E" "File browser" " + L" "Lock screen" \
-      " + BACKSLASH" "Open power menu" " + APOSTRAPHE" "Change wallpaper" \
-      " + V" "Open clipboard" " + SHIFT + V" "Clear clipboard" \
-      " + ;" "Pseudo tiling" " + F" "Toggle fullscreen on focused" \
-      " + B" "Toggle transparency on focused" " + SHIFT + F" "Toggle floating on focused" \
-      " +    " "Move focus to arrow key direction" " + SHIFT +    " "Move focused window in arrow key direction" \
-      " + 1-0" "Move to workspace 1 - 10" " + SHIFT + 1-0" "Move focused window to workspace 1 - 10" \
-      " + LMB" "Drag window" " + RMB" "Resize window" \
-      "ALT + TAB" "Cycle window focus" " + ALT + O" "Open recording center" \
+      " + Q" "Terminal" " + V" "Toogle floating" \
+      " + C" "Kill active" " + R" "App menu" \
+      " + M" "Exit" " + P" "Pseudo dwindle" \
+      " + E" "File Manager" " J" "Toogle split" \
+
+      " + <Number>" "Switch workspace" " + SHIFT + <Number>" "Move active window to a workspace" \
+      " + <Scroll>" "Switch workspace" " + <Direction arrow>" "Move focus" \
+
+      "PRINT" "Screenshot a region" \
     '')
   ];
 }
diff --git a/system/modules/default.nix b/system/modules/default.nix
index 8682fc9..5f6f3d8 100644
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -9,7 +9,6 @@
     ./dns.nix
     ./file.nix
     ./fwupd.nix
-    ./gpg.nix
     ./internationalization.nix
     ./logind.nix
     ./network.nix
diff --git a/system/modules/gpg.nix b/system/modules/gpg.nix
deleted file mode 100644
index fc6e537..0000000
--- a/system/modules/gpg.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  programs.gnupg.agent = {
-    enable = true;
-  };
-}