diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 95974d9..94052d2 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -20,6 +20,18 @@ in desktopSystemConfiguration {
 })
 
 (desktopUserHomeConfiguration {
+  xdg.configFile."xkb/symbols/tr-swapped-i".text = ''
+    default partial
+    xkb_symbols "basic" {
+      include "tr(basic)"
+
+      name[Group1]="Turkish (i and ı swapped)";
+
+      key <AC11>  { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ idotless, Iabovedot,  paragraph , none      ]};
+      key <AD08>  { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ i       , I        ,  apostrophe, dead_caron ]};
+    };
+  '';
+
   wayland.windowManager.hyprland = enabled {
     settings = {
       monitor    = [ ",preferred,auto,1" ];
@@ -160,7 +172,7 @@ in desktopSystemConfiguration {
       input = {
         follow_mouse = 1;
 
-        kb_layout = "tr";
+        kb_layout = "tr-swapped-i";
 
         repeat_delay = 400;
         repeat_rate  = 100;
diff --git a/modules/localisation.nix b/modules/localisation.nix
index 31496e0..7d5a1fc 100644
--- a/modules/localisation.nix
+++ b/modules/localisation.nix
@@ -1,7 +1,15 @@
-{ lib, ... }: with lib; merge
+{ lib, pkgs, ... }: with lib; merge
 
 (systemConfiguration {
-  console.keyMap = "trq";
+  console.keyMap = pkgs.writeText "trq-swapped-i.map" ''
+    include "${pkgs.kbd}/share/keymaps/i386/qwerty/trq.map"
+
+    keycode 23 = i
+    	altgr       keycode 23 = +icircumflex
+    	altgr shift keycode 23 = +Icircumflex
+
+    keycode 40 = +dotlessi +Idotabove
+  '';
 
   i18n.defaultLocale = "C.UTF-8";
 })