diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix
index 716b4d0..598e15f 100644
--- a/nixos-configurations/laptop/default.nix
+++ b/nixos-configurations/laptop/default.nix
@@ -14,13 +14,16 @@
 
   networking.hostName = "laptop";
 
-  services.xserver = {
-    enable = true;
-    windowManager.i3 = {
+  services = {
+    xserver = {
       enable = true;
+      windowManager.i3 = {
+        enable = true;
+      };
+      libinput.enable = true;
+      videoDrivers = [ "modesetting" "nvidia" ];
     };
-    libinput.enable = true;
-    videoDrivers = [ "modesetting" "nvidia" ];
+    flameshot.enable = true;
   };
 
   hardware = {
diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix
index 85530d5..0251c26 100644
--- a/nixos-configurations/pc/default.nix
+++ b/nixos-configurations/pc/default.nix
@@ -56,7 +56,7 @@
     programs = {
       git = {
         signing = {
-          key = "29791D54E85BEE9E";
+          key = "C7F24D961CB819A5";
         };
       };
       swaylock.enable = true;
@@ -64,6 +64,7 @@
     home.packages = with pkgs; [
       dconf
       bemenu
+      wayshot
     ];
   };
 }
diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix
index 1641e37..ec63c76 100644
--- a/nixos-configurations/shared.nix
+++ b/nixos-configurations/shared.nix
@@ -110,7 +110,6 @@
       };
       gh.enable = true;
     };
-    services.flameshot.enable = true;
     home = {
       stateVersion = "22.11";
       packages = with pkgs; [