zed update

.config/nvim/lazy-lock.json

@@ -1,29 +1,30 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
+  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
   "auto-session": { "branch": "main", "commit": "62437532b38495551410b3f377bcf4aaac574ebe" },
-  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
-  "catppuccin": { "branch": "main", "commit": "c4d475e4b5684747cde9b3f849186af7837d4397" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
+  "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
+  "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
   "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" },
-  "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
+  "gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "image.nvim": { "branch": "master", "commit": "c40215d7d7d1d8c823ee9a77be1a894d5c8df41b" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "markview.nvim": { "branch": "main", "commit": "02824a95a0db2c9fd1bab3adba4510bc8f9c91e4" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
+  "lualine.nvim": { "branch": "master", "commit": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8" },
+  "markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "63a3c6a80538de1003373a619e29aeda27809ad3" },
+  "mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
   "mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" },
   "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
-  "nvim-lspconfig": { "branch": "master", "commit": "2b87d107942b9eebef768512f5849330335a9493" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" },
-  "otter.nvim": { "branch": "main", "commit": "4796602953348e19fb24916557af7b89e188751f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "c588db330592fa477a70d2fee6ba20a57194bdc3" },
+  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6e76c5e47e957fbf080b1fdac165c66dbd2e7cfb" },
+  "otter.nvim": { "branch": "main", "commit": "a455e68a99d395889ab30a25ac3846a135e93c46" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" },
+  "rest.nvim": { "branch": "main", "commit": "714d5512aaec5565d55652480c16c26f8d95645d" },
+  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }
 }

.config/nvim/lua/config/keymaps.lua

@@ -30,6 +30,7 @@ vim.keymap.set('i', '<C-BS>', '<C-w>', { desc = 'delete word in insert mode' })
 
 -- kitty in current dir
 vim.keymap.set('n', '<leader>t', '<cmd>silent !kitty . &<CR>', { desc = 'open kitty in pwd' })
+vim.keymap.set('n', '<leader>e', '<cmd>silent !nautilus . &<CR>', { desc = 'open nautilus in pwd' })
 
 -- disable default comp
 vim.keymap.set('i', '<C-n>', '<NOP>', { desc = 'disable default comp' })
@@ -223,3 +224,15 @@ vim.keymap.set('n', '<leader>fr', '<cmd>FlutterRestart<CR>', { desc = 'flutter r
 vim.keymap.set('n', '<leader>fq', '<cmd>FlutterQuit<CR>', { desc = 'stop flutter' })
 vim.keymap.set('n', '<leader>fl', '<cmd>FlutterLogToggle<CR>', { desc = 'flutter log' })
 vim.keymap.set('n', '<leader>fc', '<cmd>FlutterLogClear<CR>', { desc = 'clear log' })
+
+-- INFO: Rest
+vim.keymap.set('n', '<leader>rr', '<cmd>Rest run<CR>', { desc = 'Run request under the cursor'})
+vim.keymap.set('n', '<leader>ro', '<cmd>vert Rest open<CR>', { desc = 'Open result pane'})
+vim.keymap.set('n', '<leader>rl', '<cmd>Rest last<CR>', { desc = 'Run last request'})
+vim.keymap.set('n', '<leader>rn', function ()
+  vim.ui.input({prompt = 'Enter request name'}, function (value)
+    if value then
+      vim.cmd('Rest run ' .. value)
+    end
+  end)
+end, { desc = 'Run last request'})

.config/nvim/lua/config/plugins/git.lua

@@ -44,12 +44,31 @@ return {
       require('diffview').setup({
 	keymaps = {
 	  disable_defaults = true,
+	  view = {
+	    { "n", "<c-n>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
+	    { "n", "<c-p>",	     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+	    { "n", "[x",             actions.prev_conflict,                  { desc = "Go to the previous conflict" } },
+	    { "n", "]x",             actions.next_conflict,                  { desc = "Go to the next conflict" } },
+	  },
 	  file_panel = {
-	    ['i'] = '<Up>',
-	    ['k'] = '<Down>',
-	    ['j'] = false,
+	    { "n", "k",              actions.next_entry,                     { desc = "Bring the cursor to the next file entry" } },
+	    { "n", "i",              actions.prev_entry,                     { desc = "Bring the cursor to the previous file entry" } },
+	    { "n", "<CR>",           actions.select_entry,                   { desc = "Open the diff for the selected entry" } },
+	    { "n", "l",              actions.select_entry,                   { desc = "Open the diff for the selected entry" } },
+	    { "n", "s",              actions.toggle_stage_entry,             { desc = "Stage / unstage the selected entry" } },
+	    { "n", "S",              actions.stage_all,                      { desc = "Stage all entries" } },
+	    { "n", "U",              actions.unstage_all,                    { desc = "Unstage all entries" } },
+	    { "n", "<c-n>",          actions.select_next_entry,              { desc = "Open the diff for the next file" } },
+	    { "n", "<c-p>",	     actions.select_prev_entry,              { desc = "Open the diff for the previous file" } },
+	    { "n", "[x",             actions.prev_conflict,                  { desc = "Go to the previous conflict" } },
+	    { "n", "]x",             actions.next_conflict,                  { desc = "Go to the next conflict" } },
+	    { "n", "g?",             actions.help("file_panel"),             { desc = "Open the help panel" } },
 
-	    ['<Space>'] = function () actions.toggle_stage_entry() end
+	    -- { "n", "<leader>cO",     actions.conflict_choose_all("ours"),    { desc = "Choose the OURS version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cT",     actions.conflict_choose_all("theirs"),  { desc = "Choose the THEIRS version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cB",     actions.conflict_choose_all("base"),    { desc = "Choose the BASE version of a conflict for the whole file" } },
+	    -- { "n", "<leader>cA",     actions.conflict_choose_all("all"),     { desc = "Choose all the versions of a conflict for the whole file" } },
+	    -- { "n", "dX",             actions.conflict_choose_all("none"),    { desc = "Delete the conflict region for the whole file" } },
 
 	  }
 	}

.config/nvim/lua/config/plugins/init.lua

@@ -24,13 +24,14 @@ require('lazy').setup({
 
   require('config.plugins.git'),
   require('config.plugins.ui'),
-  -- require('config.plugins.telescope'),
+
   require('config.plugins.languages.lsp'),
   require('config.plugins.languages.treesitter'),
   require('config.plugins.harpoon'),
   require('config.plugins.autosession'),
   require('config.plugins.snacks'),
   require('config.plugins.mini'),
+  require('config.plugins.rest'),
 
   require('config.plugins.languages.notebook'),
   require('config.plugins.languages.flutter'),

.config/nvim/lua/config/plugins/rest.lua

@@ -0,0 +1,18 @@
+vim.g.rest_nvim = {
+  ui = {
+    keybinds = {
+      prev = 'J',
+      next = 'L',
+    },
+  },
+}
+return {
+  "rest-nvim/rest.nvim",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function (_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      table.insert(opts.ensure_installed, "http")
+    end,
+  },
+}

.config/zed/settings.json

@@ -40,10 +40,12 @@
   "show_edit_predictions": false,
   "agent": {
     "always_allow_tool_actions": false,
-    "default_profile": "write",
+    "default_profile": "ask",
     "default_model": {
+      "effort": "high",
+      "enable_thinking": false,
       "provider": "copilot_chat",
-      "model": "claude-sonnet-4.5"
+      "model": "gemini-3.1-pro-preview"
     },
   },
   "terminal": {

scripts/youtubeBlocker.sh

@@ -12,9 +12,10 @@ handle() {
     case $1 in
         activewindow*)
             echo $1
-            if [[ $1 == *YouTube* ]] && ! is_valid_youtube_time; then
+            if [[ $1 == *YouTube*  || $1 == *Instagram* ]]; then
                 hyprctl dispatch killactive
-                notify-send "ENOUGH, LOCK IN"
+                notify-send "ENOUGH, LOCK IN" "GET BACK TO WORK" -u critical -i $HOME/dotfiles/scripts/discipline.png
+                mpv $HOME/dotfiles/scripts/getbacktowork.mp3
             fi
     esac
 }