Add changes in .zshrc and lsp.lua

Add new neovim welcome screen and change probability definitions
Check out newest version of trouble and modify keymaps
2024-08-05 09:02:02 +00:00 · 2024-06-18 01:48:01 +02:00 · 2024-06-18 01:47:35 +02:00 · 2024-06-18 01:47:12 +02:00 · 2024-06-18 01:46:50 +02:00 · 2024-06-11 00:40:33 +02:00
6 changed files with 106 additions and 78 deletions
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@ -9,42 +9,42 @@
  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "copilot.vim": { "branch": "release", "commit": "53d3091be388ff1edacdb84421ccfa19a446a84d" },
+  "copilot.vim": { "branch": "release", "commit": "1dcaf72099b436b5832d6117d9cd7a4a098a8d77" },
  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
-  "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
+  "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" },
+  "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
  "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
  "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
  "molten-nvim": { "branch": "main", "commit": "8346bba69e0de96278dad2038e9be74605908b7d" },
  "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" },
-  "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" },
+  "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
  "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d1ab6b6051976b04948e127b0f302a465b1394d6" },
-  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
-  "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" },
-  "nvim-treesitter": { "branch": "master", "commit": "49e4e2b4b62360677568c47b6467f31c809b391c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
-  "overseer.nvim": { "branch": "master", "commit": "17a4ff58decf99d324a580e950228550002198bc" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
+  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
+  "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
+  "nvim-treesitter": { "branch": "master", "commit": "eb59a3df509322924631c1ed85b0d2ec696bb78d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" },
  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
  "session-lens": { "branch": "main", "commit": "1b65d8e1bcd1836c5135cce118ba18d662a9dabd" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
+  "todo-comments.nvim": { "branch": "main", "commit": "9c104cf7868f1c739b43a07e5593666cc9de2d67" },
  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
-  "trouble.nvim": { "branch": "main", "commit": "6ce015ea999879364e35f20da3e8687583d3b719" },
+  "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" },
  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
  "vim-doge": { "branch": "master", "commit": "188351964c8b2540a69c1d2648b3c6e7877a016f" },
  "vim-flog": { "branch": "master", "commit": "2f0836128cac9368176a564b237382d1766723f0" },
  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vimtex": { "branch": "master", "commit": "366ba106795db13879fdbfb4d6e4b8e1d616b684" },
-  "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }
+  "vimtex": { "branch": "master", "commit": "0587a064f675fd85cdfb8a76d6a3ff698af3944b" },
+  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
 }
--- a/nvim/.config/nvim/lua/plugins/alpha.lua
+++ b/nvim/.config/nvim/lua/plugins/alpha.lua
@ -4,7 +4,7 @@
 local function clamp(x, min, max) return math.max(math.min(x, max), min) end

 local function get_random_image()
-    images = {
+    local images = {
        {
            [[██╗      █████╗  ██████╗██╗  ██╗███████╗]],
            [[██║     ██╔══██╗██╔════╝██║  ██║██╔════╝]],
@ -29,21 +29,53 @@ local function get_random_image()
            [[██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║]],
            [[██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║]],
            [[╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝]]
+        },
+        {
+            [[                  ▄                  ]],
+            [[                 ▟█▙                 ]],
+            [[                ▟███▙                ]],
+            [[               ▟█████▙               ]],
+            [[              ▟███████▙              ]],
+            [[             ▂▔▀▜██████▙             ]],
+            [[            ▟██▅▂▝▜█████▙            ]],
+            [[           ▟█████████████▙           ]],
+            [[          ▟███████████████▙          ]],
+            [[         ▟█████████████████▙         ]],
+            [[        ▟███████████████████▙        ]],
+            [[       ▟█████████▛▀▀▜████████▙       ]],
+            [[      ▟████████▛      ▜███████▙      ]],
+            [[     ▟█████████        ████████▙     ]],
+            [[    ▟██████████        █████▆▅▄▃▂    ]],
+            [[   ▟██████████▛        ▜█████████▙   ]],
+            [[  ▟██████▀▀▀              ▀▀██████▙  ]],
+            [[ ▟███▀▘                       ▝▀███▙ ]],
+            [[▟▛▀                               ▀▜▙]],
+            [[                 btw                 ]]
        }
    }

-    local i = 3
+    local pmf = {0.25, 0.25, 0.25, 0.25}
+    local cdf = {}

-    math.randomseed(os.time())
-    if math.fmod(math.random(100), 5) == 0 then
-        if math.random(0, 1) == 0 then
-            i = 1
-        else
-            i = 2
-        end
+    cdf[1] = 0
+    for j = 2, #pmf+1 do
+        cdf[j] = cdf[j - 1] + pmf[j - 1]
    end

-    return images[i]
+    if math.abs(cdf[#cdf] - 1) > 0.01 then
+        error("Probabilities do not add up to 1")
+    elseif #images ~= #pmf then
+        error("Number of images and probabilities do not match")
+    end
+
+    math.randomseed(os.time())
+    local r = math.random(100)
+
+    for j = 2, #cdf do
+        if r <= cdf[j] * 100 then
+            return images[j-1]
+        end
+    end
 end

 -----------------
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@ -143,7 +143,7 @@ return {

                require('mason-lspconfig').setup({
                    ensure_installed = {
-                        'clangd',
+                        -- 'clangd',
                        'pyright',
                        'cmake',
                        'texlab'
--- a/nvim/.config/nvim/lua/plugins/trouble.lua
+++ b/nvim/.config/nvim/lua/plugins/trouble.lua
@ -1,6 +1,7 @@
 return {
    {
        "folke/trouble.nvim",
+        tag="v3.4.1",
        dependencies = {
            {
                "nvim-tree/nvim-web-devicons"
@ -12,48 +13,39 @@ return {
                'nvim-telescope/telescope.nvim'
            }
        },
-        cmd = {
-            "Trouble",
-            "TroubleClose",
-            "TroubleToggle",
-            "TroubleRefresh"
+        opts = {},
+        cmd = "Trouble",
+        keys = {
+          {
+            "<leader>xw",
+            "<cmd>Trouble diagnostics toggle<cr>",
+            desc = "Diagnostics (Trouble)",
+          },
+          {
+            "<leader>xd",
+            "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+            desc = "Buffer Diagnostics (Trouble)",
+          },
+          {
+            "<leader>xs",
+            "<cmd>Trouble symbols toggle focus=false<cr>",
+            desc = "Symbols (Trouble)",
+          },
+          -- {
+          --   "<leader>cl",
+          --   "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+          --   desc = "LSP Definitions / references / ... (Trouble)",
+          -- },
+          -- {
+          --   "<leader>xl",
+          --   "<cmd>Trouble loclist toggle<cr>",
+          --   desc = "Location List (Trouble)",
+          -- },
+          {
+            "<leader>xq",
+            "<cmd>Trouble qflist toggle<cr>",
+            desc = "Quickfix List (Trouble)",
+          },
        },
-        init = function()
-            vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end, {
-                desc = "Toggle"
-            })
-            vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end, {
-                desc = "Workspace diagnostics"
-            })
-            vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end, {
-                desc = "Document diagnostics"
-            })
-            vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end, {
-                desc = "Quickfix"
-            })
-            vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end, {
-                desc = "Loclist"
-            })
-            -- vim.keymap.set("n", "<leader>xr", function() require("trouble").toggle("lsp_references") end, {
-            --     desc = "LSP references"
-            -- })
-        end,
-        config = function()
-            local trouble_provider = require("trouble.sources.telescope")
-            local telescope = require("telescope")
-
-            telescope.setup {
-                defaults = {
-                    mappings = {
-                        i = {
-                            ["<c-t>"] = trouble_provider.open
-                        },
-                        n = {
-                            ["<c-t>"] = trouble_provider.open
-                        }
-                    }
-                }
-            }
-        end
    }
 }
--- a/sway/.config/sway/config.d/workspaces.conf
+++ b/sway/.config/sway/config.d/workspaces.conf
@ -40,10 +40,10 @@ exec i3-msg 'workspace $ws2; exec firefox'
 ## Multiple monitors
 #

-workspace $ws1 output DP-3 eDP-1
-workspace $ws2 output eDP-1 DP-3
-workspace $ws3 output eDP-1 DP-3
-workspace $ws4 output DP-3 eDP-1
+workspace $ws1 output DP-11 eDP-1
+workspace $ws2 output eDP-1 DP-11
+workspace $ws3 output eDP-1 DP-11
+workspace $ws4 output DP-11 eDP-1
 workspace $ws5 output eDP-1
 workspace $ws6 output eDP-1
 workspace $ws7 output eDP-1
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@ -22,7 +22,7 @@ zstyle ':vcs_info:git:*' formats '%b '
 setopt PROMPT_SUBST
 PROMPT='%F{magenta}[%m] %F{blue}%~%f %F{red}${vcs_info_msg_0_}%f$ '

-source /usr/share/fzf/key-bindings.zsh
+source /usr/share/doc/fzf/examples/key-bindings.zsh

 alias ssh='kitty +kitten ssh'

@ -30,12 +30,16 @@ alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias ll='ls -l'
 alias la='ls -la'
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."

 export PATH=$PATH:/home/andreas/.local/bin
 export EDITOR=nvim

 alias get-idf='. $HOME/ext_sw/esp-idf/export.sh'

+alias c='z ~/.dotfiles'
 alias sc='z ~/.config/sway'
 alias nc='z ~/.config/nvim'
 alias ezc='nvim ~/.zshrc'
@ -46,10 +50,10 @@ alias eml='z ~/Documents/kit/EMLLAB/emllab-challenge && . venv/bin/activate && c

 alias hyp='z ~/git/HyperLink_SW && clear'

-. "$HOME/.cargo/env"
-
-eval "$(zoxide init zsh)"
-eval "$(thefuck --alias)"
+# . "$HOME/.cargo/env"
+#
+# eval "$(zoxide init zsh)"
+# eval "$(thefuck --alias)"

 . "$HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh"
 bindkey '^y' autosuggest-accept
Author	SHA1	Message	Date
Andreas Tsouchlos	d9d6856b6c	Add changes in .zshrc and lsp.lua	2024-08-05 09:02:02 +00:00
Andreas Tsouchlos	949e930a56	Add new neovim welcome screen and change probability definitions	2024-06-18 01:48:01 +02:00
Andreas Tsouchlos	1ea00e644d	Check out newest version of trouble and modify keymaps	2024-06-18 01:47:35 +02:00
Andreas Tsouchlos	be256e882b	Fix monitor config	2024-06-18 01:47:12 +02:00
Andreas Tsouchlos	478ded7f6e	Add 'c' alias for config	2024-06-18 01:46:50 +02:00
Andreas Tsouchlos	1d299f2e43	Update neovim plugins lazy-lock	2024-06-11 00:40:33 +02:00
Andreas Tsouchlos	c812148917	Update trouble to version 3.3.0	2024-06-11 00:40:19 +02:00
Andreas Tsouchlos	e690f17ff8	Add cd .. aliases to zshrc	2024-06-11 00:33:17 +02:00