diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 23dd6a7..ef372c4 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -3,11 +3,8 @@ fzf_key_bindings
 
 # Shortcuts
 abbr g git
+abbr z zathura
 abbr v nvim
-abbr xi doas xbps-install -S
-abbr xu doas xbps-install -Suv
-abbr xq doas xbps-query -Rs
-abbr xr doas xbps-remove -R
 
 alias dot="git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME"
 
diff --git a/.config/nvim/after/plugin/copilot.lua b/.config/nvim/after/plugin/copilot.lua
index a33bec3..9e427e3 100644
--- a/.config/nvim/after/plugin/copilot.lua
+++ b/.config/nvim/after/plugin/copilot.lua
@@ -1,3 +1,7 @@
 vim.g.copilot_filetypes = { 
     ["text"] = false, 
 }
+
+local function set_copilot_workspace_folders(dir)
+  vim.g.copilot_workspace_folders = { dir }
+end
diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua
index 8ec8960..468dd29 100644
--- a/.config/nvim/after/plugin/telescope.lua
+++ b/.config/nvim/after/plugin/telescope.lua
@@ -6,7 +6,7 @@ vim.keymap.set('n', '<leader>g', builtin.live_grep, {})
 vim.keymap.set('n', '<leader>b', builtin.buffers, {})
 vim.keymap.set('n', '<leader>i', builtin.grep_string, {})
 vim.keymap.set('n', '<leader>r', builtin.lsp_references, {})
-vim.keymap.set('n', '<leader>m', builtin.diagnostics, {})
+vim.keymap.set('n', '<leader>d', builtin.diagnostics, {})
 vim.keymap.set('n', '<leader>s', builtin.lsp_document_symbols, {})
 vim.keymap.set('n', '<leader>t', builtin.treesitter, {})
 
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 1102072..cf08b17 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -29,3 +29,5 @@ vim.o.scrolloff = 8
 
 vim.o.splitbelow = true -- when splitting horizontally, move coursor to lower pane
 vim.o.splitright = true -- when splitting vertically, mnove coursor to right pane
+
+vim.o.makeprg = "make PROGRAM=%<"
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 1b5b186..8127186 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,18 +1,16 @@
 {
   "NeoSolarized": { "branch": "master", "commit": "b94b1a9ad51e2de015266f10fdc6e142f97bd617" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "copilot.vim": { "branch": "release", "commit": "25feddf8e3aa79f0573c8f43ddb13c44c530cfa5" },
-  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
-  "lazy.nvim": { "branch": "main", "commit": "5d29ffeaa0f2d91f1dfbc21943d19a11e59a6fc6" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "f12d50716e8e59ea9f5cf484eac6968c33a95917" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
-  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6d2ae9fdc3111a6e8fd5db2467aca11737195a30" },
-  "nvim-treesitter": { "branch": "master", "commit": "1eabe69bfa8f78e14fcf5d42a2b3881babaca30a" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" },
-  "vim-fugitive": { "branch": "master", "commit": "5a9bd42dd8dd127779f3cd8982a0419b7ca9c7f5" }
-}
\ No newline at end of file
+  "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2d725fdd7fe4a612fa3171ca0a965f455d8dc325" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
+  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
+  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
+  "nvim-lspconfig": { "branch": "master", "commit": "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40" },
+  "nvim-treesitter": { "branch": "master", "commit": "39016abc99853c3e9d70f1bec7e2fa661b9a81bf" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }
+}
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 4e8594f..3a37cd5 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -1,7 +1,7 @@
 vim.g.mapleader = ' '
 
 vim.keymap.set('n', '<leader>p', '"+p')
-vim.keymap.set('n', '<leader>y', '"+y')
+vim.keymap.set('v', '<leader>y', '"+y')
 vim.keymap.set('n', '<leader>e', vim.cmd.Ex)
 vim.keymap.set('n', 'n', 'nzzzv')
 vim.keymap.set('n', 'N', 'Nzzzv')
@@ -27,3 +27,8 @@ vim.keymap.set('v', 'L', '$')
 vim.keymap.set('v', 'H', '^')
 
 vim.keymap.set('n', '<leader>cd', ':cd %:p:h<CR>')
+
+
+-- This depend on the makeprg setting
+vim.keymap.set('n', '<F5>', ':make<CR>')
+vim.keymap.set('n', '<F6>', ':!bin/%<<CR>')
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 1fc7f83..3fc2b9a 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -37,7 +37,7 @@ require("lazy").setup({
     },
 
 	'lewis6991/gitsigns.nvim',
-	'github/copilot.vim',
+    'github/copilot.vim',
     'VonHeikemen/lsp-zero.nvim',
     'neovim/nvim-lspconfig',
     'hrsh7th/cmp-nvim-lsp',
diff --git a/.config/sway/config b/.config/sway/config
index 2762496..1f68fc8 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -63,6 +63,7 @@ input type:keyboard {
     bindsym $mod+Shift+a exec systemctl suspend
     bindsym $mod+Shift+i exec swaylock -f -c 000000
     bindsym $mod+Shift+o exec obsidian --ozone-platform=wayland --enable-features=UseOzonePlatform
+    bindsym $mod+Shift+p exec proton-mail --ozone-platform=wayland --enable-features=UseOzonePlatform
     bindsym $mod+Shift+r exec zathura ~/documents/books/$(ls -1 ~/documents/books | fuzzel -d)
 
 
@@ -245,4 +246,4 @@ exec_always kdeconnect-indicator &
 exec --no-startup-id /nix/store/$(ls -la /nix/store/ | awk '/polkit-gnome/ && $5 == "4096" {print $9; exit}')/libexec/polkit-gnome-authentication-agent-1 &
 exec_always dbus-update-activation-environment --all &
 exec_always blueman-applet &
-
+exec systemctl --user import-environment