7 files changed, 24 insertions, 15 deletions
diff --git a/dot_config/emacs/lisp/emacs-config.el b/dot_config/emacs/lisp/emacs-config.el
index bfc15ee..304b209 100644
--- a/dot_config/emacs/lisp/emacs-config.el
+++ b/dot_config/emacs/lisp/emacs-config.el
@@ -265,7 +265,6 @@
   (proced-enable-color-flag t))
 
 (use-package flyspell
-  :disabled ;; TODO: Remove on Emacs 31
   :ensure nil
   :config
   (flyspell-delay-use-timer t)
@@ -277,4 +276,9 @@
   :ensure nil
   :bind ([remap dabbrev-expand] . hippie-expand))
 
+(use-package flymake
+  :ensure nil
+  :config
+  (flymake-show-diagnostics-at-end-of-line t))
+ 
 (provide 'emacs-config)
diff --git a/dot_config/emacs/lisp/reading-config.el b/dot_config/emacs/lisp/reading-config.el
index c43a99f..6cbb147 100644
--- a/dot_config/emacs/lisp/reading-config.el
+++ b/dot_config/emacs/lisp/reading-config.el
@@ -12,7 +12,7 @@
 (use-package olivetti
   :ensure t
   :init
-  (setq olivetti-body-width 90)
+  (setq olivetti-body-width 120)
   :hook
   (org-mode . olivetti-mode)
   (nov-mode . olivetti-mode))
diff --git a/dot_config/nvim/lua/plugins/flash.lua b/dot_config/nvim/lua/plugins/flash.lua
index c3d267a..cf5ee96 100644
--- a/dot_config/nvim/lua/plugins/flash.lua
+++ b/dot_config/nvim/lua/plugins/flash.lua
@@ -2,7 +2,7 @@ return {
   "folke/flash.nvim",
   event = "VeryLazy",
   ---@type Flash.Config
-  config = {},
+  opts = {},
   -- stylua: ignore
   keys = {
     { "<Enter>", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
index cd9ff77..7da00f8 100644
--- a/dot_config/nvim/lua/plugins/lsp.lua
+++ b/dot_config/nvim/lua/plugins/lsp.lua
@@ -58,4 +58,6 @@ return {
 	end,
 
   vim.lsp.enable('tinymist'),
+  vim.lsp.enable('ts_ls'),
+  vim.lsp.enable('racket_langserver'),
 }
diff --git a/dot_config/nvim/lua/plugins/rustaceanvim.lua b/dot_config/nvim/lua/plugins/rustaceanvim.lua
index 72f1de5..421916d 100644
--- a/dot_config/nvim/lua/plugins/rustaceanvim.lua
+++ b/dot_config/nvim/lua/plugins/rustaceanvim.lua
@@ -1,6 +1,6 @@
 return {
 	"mrcjkb/rustaceanvim",
-	version = "^5", -- Recommended
+	version = "^9", -- Recommended
 	lazy = false, -- This plugin is already lazy
 	config = function()
 		vim.g.rustaceanvim = function()
diff --git a/dot_config/sway/executable_config b/dot_config/sway/executable_config
index 7b75619..c885371 100644
--- a/dot_config/sway/executable_config
+++ b/dot_config/sway/executable_config
@@ -7,14 +7,14 @@
 ### Variables
 #
 # Logo key. Use Mod1 for Alt.
-set $mod Mod1
+set $mod Mod4
 # Home row direction keys, like vim
 set $left h
 set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term wezterm
+set $term foot
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
@@ -35,10 +35,10 @@ output * bg ~/Pictures/thumbnail.png center
 #
 # Example configuration:
 #
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-#          before-sleep 'swaylock -f -c 000000'
+exec swayidle -w \
+         timeout 300 'swaylock -f -c 000000' \
+         timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+         before-sleep 'swaylock -f -c 000000'
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
@@ -69,7 +69,7 @@ output * bg ~/Pictures/thumbnail.png center
     bindsym $mod+Shift+q kill
 
     # Start your launcher
-    bindsym $mod+d exec $menu
+    bindsym $mod+x exec $menu
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -84,7 +84,8 @@ output * bg ~/Pictures/thumbnail.png center
     # Exit sway (logs you out of your Wayland session)
     bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
     # Lock screen
-    bindsym $mod+Shift+m exec lock
+    bindsym $mod+Shift+m exec 'swaylock -f -c 000000'
+
 #
 # Moving around:
 #
@@ -227,8 +228,6 @@ exec udiskie
 exec keepassxc --minimized
 exec /usr/lib/hyprpolkitagent/hyprpolkitagent
 
-bindsym $mod+Shift+y exec 'swaylock -f -c 000000'
-
 bindsym $mod+tab workspace next
 
 # # capture all screens to clipboard    
@@ -241,4 +240,8 @@ seat * hide_cursor 4000
 
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
+for_window [class="Pinentry-gtk"] floating enable
+
+exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
+
 include /etc/sway/config.d/*
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 866c83a..e51c998 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -5,7 +5,7 @@
                        // Archived modules
                        // "custom/gpu", "bluetooth",  "custom/weather", "temperature", "sway/window"
                        // Choose the order of the modules
-    "modules-left": [ "clock", "custom/pomodoro", "sway/mode", "idle_inhibitor", "custom/media"],
+    "modules-left": [ "clock", "custom/pomodoro", "sway/mode", "idle_inhibitor", "sway/window"],
     "modules-center": ["sway/workspaces"],
     "modules-right": ["custom/crypto", "custom/pacman", "cpu", "temperature", "custom/gpu", "pulseaudio", "bluetooth", "network", "custom/vpn", "tray", "battery"],
     // Modules configuration