diff --git a/configurations/git.nix b/configurations/git.nix
index 346c7be2..0d32f983 100644
--- a/configurations/git.nix
+++ b/configurations/git.nix
@@ -33,6 +33,10 @@
         "/vendor/bundle"
         "**/*.patch"
       ];
+      signing = {
+        key = "charlotte@vanpetegem.me";
+        signByDefault = true;
+      };
       userEmail = config.custom.git.email;
       userName = "Charlotte Van Petegem";
     };
diff --git a/configurations/kitty.nix b/configurations/kitty.nix
index b0f2b298..b2ce59e7 100644
--- a/configurations/kitty.nix
+++ b/configurations/kitty.nix
@@ -2,45 +2,38 @@
 
 {
   home-manager.users.charlotte = { pkgs, ... }: {
-    home.packages = [ pkgs.kitty ];
-    xdg.configFile."kitty/kitty.conf".text = ''
-      font_family Fira Code
-      font_size 9.0
-      disable_ligatures cursor
-
-      background #fbffff
-      foreground #535c65
-      selection_background #6d7782
-      selection_foreground #fbffff
-      url_color #906c33
-      cursor #434951
-
-      # normal
-      color0 #fbffff
-      color1 #ae5865
-      color2 #4d7f43
-      color3 #906c33
-      color4 #2b7ab2
-      color5 #8f63a2
-      color6 #008483
-      color7 #535c65
-
-      # bright
-      color8 #6d7782
-      color9 #ae5865
-      color10 #4d7f43
-      color11 #906c33
-      color12 #2b7ab2
-      color13 #8f63a2
-      color14 #008483
-      color15 #434951
-
-      enable_audio_bell no
-      visual_bell_duration 0.25
-
-      remember_window_size no
-      initial_window_width 1280
-      initial_window_width 720
-    '';
+    programs.kitty = {
+      enable = true;
+      settings = {
+        font_family = "Fira Code";
+        font_size = 9;
+        disable_ligatures = "cursor";
+        background = "#fbffff";
+        foreground = "#535c65";
+        selection_background = "#6d7782";
+        selection_foreground = "#fbffff";
+        url_color = "#906c33";
+        cursor = "#434951";
+        color0 = "#fbffff";
+        color1 = "#ae5865";
+        color2 = "#4d7f43";
+        color3 = "#906c33";
+        color4 = "#2b7ab2";
+        color5 = "#8f63a2";
+        color6 = "#008483";
+        color7 = "#535c65";
+        color8 = "#6d7782";
+        color9 = "#ae5865";
+        color10 = "#4d7f43";
+        color11 = "#906c33";
+        color12 = "#2b7ab2";
+        color13 = "#8f63a2";
+        color14 = "#008483";
+        color15 = "#434951";
+        enable_audio_bell = false;
+        visual_bell_duration = "0.25";
+        remember_window_size = false;
+      };
+    };
   };
 }
diff --git a/configurations/neovim.nix b/configurations/neovim.nix
index c3440da4..478670ab 100644
--- a/configurations/neovim.nix
+++ b/configurations/neovim.nix
@@ -30,6 +30,7 @@ in
   ];
 
   home-manager.users.charlotte = { pkgs, ... }: {
+    home.sessionVariables = { EDITOR = "nvim"; };
     programs.neovim = {
       enable = true;
       extraConfig = ''
diff --git a/configurations/pass.nix b/configurations/pass.nix
index b59bf4d8..05568dda 100644
--- a/configurations/pass.nix
+++ b/configurations/pass.nix
@@ -6,6 +6,10 @@
   ];
 
   home-manager.users.charlotte = { pkgs, ... }: {
-    home.packages = [ pkgs.pass ];
+    programs.password-store = {
+      enable = true;
+      settings = { PASSWORD_STORE_DIR = "$HOME/repos/passwords"; };
+    };
+    services.password-store-sync.enable = true;
   };
 }
diff --git a/configurations/sway.nix b/configurations/sway.nix
index 41ecbbae..a8e34e7b 100644
--- a/configurations/sway.nix
+++ b/configurations/sway.nix
@@ -8,7 +8,12 @@ in
 {
   services.dbus.packages = with pkgs; [ gnome3.dconf ];
   home-manager.users.charlotte = { pkgs, lib, ... }: {
-    home.packages = [ color-picker launcher screenshot ];
+    home.packages = [ color-picker screenshot ];
+    programs.mako = {
+      enable = true;
+      font = "Fira Code Normal 9";
+      layer = "overlay";
+    };
     services.kanshi = {
       enable = true;
       profiles = {
@@ -67,7 +72,6 @@ in
         ];
         startup = [
           { command = "${pkgs.swayidle}/bin/swayidle -w timeout 300 '${pkgs.swaylock}/bin/swaylock -f -c 000000' timeout 150 '${pkgs.sway}/bin/swaymsg \"output * dpms off\"' resume '${pkgs.sway}/bin/swaymsg \"output * dpms on\"' before-sleep '${pkgs.swaylock}/bin/swaylock -f -c 000000'"; }
-          { command = "${pkgs.mako}/bin/mako"; }
         ];
         window.commands = [
           { command = "floating enable"; criteria = { app_id = "launcher"; }; }
@@ -77,10 +81,12 @@ in
           "type:keyboard" = { xkb_layout = "us"; xkb_variant = "altgr-intl"; xkb_numlock = "enabled"; };
           "type:touchpad" = { drag = "enabled"; dwt = "enabled"; scroll_method = "two_finger"; tap = "enabled"; };
         };
+        modes = {}; # Unset default "resize" mode
         keybindings = lib.mkOptionDefault {
+          "${modifier}+Shift+q" = "nop Unset default kill";
+          "${modifier}+r" = "nop Unset default resize mode";
           "${modifier}+Shift+c" = "kill";
           "${modifier}+Shift+r" = "reload";
-          "${modifier}+Shift+q" = "noop";
           "${modifier}+c" = "exec ${pkgs.swaylock}/bin/swaylock -f -c 000000";
           "${modifier}+i" = "inhibit_idle open; border normal; mark --add inhibiting_idle";
           "${modifier}+Shift+i" = "inhibit_idle none; border pixel; unmark inhibiting_idle";
diff --git a/configurations/syncthing.nix b/configurations/syncthing.nix
index 14332719..e4466613 100644
--- a/configurations/syncthing.nix
+++ b/configurations/syncthing.nix
@@ -6,6 +6,9 @@
     { path = "sync"; type = "data"; }
   ];
   home-manager.users.charlotte = { pkgs, ... }: {
-    services.syncthing.enable = true;
+    services.syncthing = {
+      enable = true;
+      tray = true;
+    };
   };
 }
diff --git a/configurations/zsh.nix b/configurations/zsh.nix
index 683c4354..f80f60db 100644
--- a/configurations/zsh.nix
+++ b/configurations/zsh.nix
@@ -45,11 +45,7 @@
           };
         }
       ];
-      sessionVariables = {
-        DEFAULT_USER = "charlotte";
-        EDITOR = "nvim";
-        PASSWORD_STORE_DIR = "$HOME/repos/passwords";
-      };
+      sessionVariables = { DEFAULT_USER = "charlotte"; };
     };
   };
 }
diff --git a/profiles/bluetooth.nix b/profiles/bluetooth.nix
index d7a8c2da..3c5fa091 100644
--- a/profiles/bluetooth.nix
+++ b/profiles/bluetooth.nix
@@ -9,4 +9,8 @@
   services.blueman.enable = true;
   hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ];
   hardware.pulseaudio.package = pkgs.pulseaudioFull;
+
+  home-manager.users.charlotte = { ... }: {
+    services.blueman-applet.enable = true;
+  };
 }