Add changes in .zshrc and lsp.lua

README.md

@@ -3,6 +3,6 @@
 ## Usage
 
 ```bash
-$ stow -S clang-format kitty nvim sway tmux waybar wofi zsh kanshi
+$ stow -S clang-format kitty nvim sway tmux waybar wofi zsh
 ```
 

clang-format/.clang-format

@@ -9,7 +9,6 @@ PointerAlignment: Left
 AccessModifierOffset: -4
 AlwaysBreakTemplateDeclarations: true
 LambdaBodyIndentation: Signature
-AllowShortLambdasOnASingleLine: None
 
 MaxEmptyLinesToKeep: 3
 #ColumnLimit: 128

kanshi/.config/kanshi/config

@@ -1,13 +0,0 @@
-profile Home {
-    output "eDP-1" mode  2256x1504@59.999Hz position 1920,875 transform normal scale 1.399999976158142
-    output "DP-11" mode  1920x1200@59.95Hz position 0,0 transform normal scale 1.0
-    exec swayws move --away 1 eDP-1
-    exec swayws move --away 4 eDP-1
-}
-
-profile Kinemic {
-    output "eDP-1" mode  2256x1504@59.999Hz position 449,1440 transform normal scale 1.399999976158142
-    output "DP-3" mode  2560x1440@59.951Hz position 0,0 transform normal scale 1.0
-    exec swayws move --away 1 eDP-1
-    exec swayws move --away 4 eDP-1
-}

nvim/.config/nvim/lazy-lock.json

@@ -1,52 +1,50 @@
 {
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
-  "auto-session": { "branch": "main", "commit": "9d02776ed42874d37869dc683396234e3724b52d" },
+  "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" },
-  "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" },
+  "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "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": "87038123804796ca7af20d1b71c3428d858a9124" },
+  "copilot.vim": { "branch": "release", "commit": "1dcaf72099b436b5832d6117d9cd7a4a098a8d77" },
-  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
+  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
+  "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
-  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
+  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
-  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
+  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
   "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
   "molten-nvim": { "branch": "main", "commit": "8346bba69e0de96278dad2038e9be74605908b7d" },
-  "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" },
+  "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" },
-  "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
+  "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
-  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" },
+  "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
-  "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" },
+  "nvim-treesitter": { "branch": "master", "commit": "eb59a3df509322924631c1ed85b0d2ec696bb78d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "overseer.nvim": { "branch": "master", "commit": "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef" },
+  "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
+  "session-lens": { "branch": "main", "commit": "1b65d8e1bcd1836c5135cce118ba18d662a9dabd" },
-  "sqlite.nvim": { "branch": "master", "commit": "53115a1a73972ce75c9a371a682d27286be9e81e" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "time-tracker.nvim": { "branch": "master", "commit": "c0b87c30484920ed1b9a4589eb62902015dfe5c2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "9c104cf7868f1c739b43a07e5593666cc9de2d67" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
+  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
-  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
+  "trouble.nvim": { "branch": "main", "commit": "38915023a777b7f2422e503dc603f6a64b465bf5" },
-  "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-doge": { "branch": "master", "commit": "188351964c8b2540a69c1d2648b3c6e7877a016f" },
-  "vim-flog": { "branch": "master", "commit": "6f80c1ffa7068ca8cc0e29af7af4f6ed0717e65e" },
+  "vim-flog": { "branch": "master", "commit": "2f0836128cac9368176a564b237382d1766723f0" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vimtex": { "branch": "master", "commit": "9a5ef1d4ac8e4e06071179ebe8121350fcb97861" },
+  "vimtex": { "branch": "master", "commit": "0587a064f675fd85cdfb8a76d6a3ff698af3944b" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
 }

nvim/.config/nvim/lua/overseer/template/user/cmake_generate.lua

@@ -9,7 +9,7 @@ return {
                 "RelWithDebInfo",
                 "MinSizeRel"
             },
-            default = "Release"
+            default = "Debug"
         },
         generator = {
             type = "enum",

nvim/.config/nvim/lua/plugins/auto_session.lua

@@ -1,7 +1,6 @@
 return {
     {
         "rmagatti/auto-session",
-        lazy = false,
         dependencies = {
             "nvim-lualine/lualine.nvim"
         },

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -14,12 +14,7 @@ return {
         {
             'williamboman/mason.nvim',
             lazy = false,
-            opts = {
+            config = true
-                registries = {
-                    "github:antsouchlos/mason-registry",
-                    "github:mason-org/mason-registry"
-                }
-            }
         },
 
         -- Autocompletion
@@ -141,11 +136,14 @@ return {
                     vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
                         desc = "Code actions"
                     })
+                    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
+                        desc = "Code actions"
+                    })
                 end)
 
                 require('mason-lspconfig').setup({
                     ensure_installed = {
-                        'clangd',
+                        -- 'clangd',
                         'pyright',
                         'cmake',
                         'texlab'
@@ -178,12 +176,10 @@ return {
 
                 require('lspconfig').matlab_ls.setup({
                     settings = {
-                        filetypes = {
+                        filetypes = {"matlab"},
-                            "matlab"
-                        },
                         matlab = {
                             installPath = "/opt/matlab/R2023a/"
-                        }
+                        },
                     },
                     single_file_support = true
                 })

nvim/.config/nvim/lua/plugins/neoformat.lua

@@ -15,7 +15,7 @@ return {
 
                 let g:neoformat_markdown_mdformat = {
                     \ 'exe': 'mdformat',
-                    \ 'args': ['--wrap=79', '--number'],
+                    \ 'args': ['--wrap=79'],
                     \ 'replace': 1,
                     \ }
                 let g:neoformat_enabled_markdown = ['mdformat']

nvim/.config/nvim/lua/plugins/time_tracker.lua

@@ -1,10 +0,0 @@
-return {
-    "3rd/time-tracker.nvim",
-    dependencies = {
-        "3rd/sqlite.nvim"
-    },
-    event = "VeryLazy",
-    opts = {
-        data_file = vim.fn.stdpath("data") .. "/time-tracker.db"
-    }
-}

nvim/.config/nvim/lua/plugins/trouble.lua

@@ -13,15 +13,7 @@ return {
                 'nvim-telescope/telescope.nvim'
             }
         },
-        opts = {
+        opts = {},
-            modes = {
-                symbols = {
-                    win = {
-                        size = 50,
-                    }
-                }
-            }
-        },
         cmd = "Trouble",
         keys = {
           {

nvim/.config/nvim/lua/plugins/whichkey.lua

@@ -15,30 +15,26 @@ return {
         },
         config = function()
             local wk = require("which-key")
-            wk.add({
+            wk.register({
-                {
+                ["<leader>"] = {
-                    "<leader>d",
+                    l = {
-                    group = "Debug"
+                        name = "+LSP"
-                },
+                    },
-                {
+                    x = {
-                    "<leader>f",
+                        name = "+Trouble"
-                    group = "Find"
+                    },
-                },
+                    o = {
-                {
+                        name = "+Overseer"
-                    "<leader>l",
+                    },
-                    group = "LSP"
+                    d = {
-                },
+                        name = "+Debug"
-                {
+                    },
-                    "<leader>o",
+                    f = {
-                    group = "Overseer"
+                        name = "+Find"
-                },
+                    },
-                {
+                    s = {
-                    "<leader>s",
+                        name = "+Session"
-                    group = "Session"
+                    },
-                },
-                {
-                    "<leader>x",
-                    group = "Trouble"
                 }
             })
         end

nvim/.config/nvim/lua/remap.lua

@@ -9,6 +9,7 @@ vim.keymap.set("n", "n", "nzzzv")
 vim.keymap.set("n", "N", "Nzzzv")
 
 vim.keymap.set("x", "<leader>p", "\"_dP")
+vim.keymap.set("n", "<leader>d", "\"_d")
 vim.keymap.set("v", "<leader>d", "\"_d")
 
 vim.keymap.set("n", "<leader>y", "\"+y")

nvim/.config/nvim/lua/set.lua

@@ -28,9 +28,9 @@ vim.opt.signcolumn = "yes"
 vim.opt.updatetime = 50
 
 vim.api.nvim_create_autocmd('FileType', {
-    pattern = 'rust',
+	pattern = 'rust',
-    callback = function()
+	callback = function ()
-        vim.cmd [[
+        vim.cmd[[
 let &efm = ''
 " Random non issue stuff
 let &efm .= '%-G%.%#aborting due to previous error%.%#,'
@@ -53,5 +53,5 @@ let &efm .= '%Eerror%m,'
 let &efm .= '%Wwarning: %m,'
 let &efm .= '%-Z%*\s--> %f:%l:%c,'
         ]]
-    end
+	end,
 })

sway/.config/sway/config

@@ -18,7 +18,8 @@ bindsym Control+Mod1+l exec $lock
 
 bindsym Print exec grim -g "$(slurp -d)" - | wl-copy
 
-bindsym $mod+p exec kitty -e /usr/bin/expect -c "spawn python; expect \\"*>>> \\"; send \\"import numpy as np\n\\"; send \\"import sympy as sp\n\\"; interact"
+bindsym $mod+p exec kitty -e python
+
 bindsym $mod+Return exec $term
 bindsym $mod+Shift+q kill
 bindsym $mod+d exec $menu
@@ -44,8 +45,8 @@ bindsym XF86AudioPause exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
-bindsym XF86MonBrightnessUp exec /bin/sh -c ~/.config/sway/scripts/increase_brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
-bindsym XF86MonBrightnessDown exec /bin/sh -c ~/.config/sway/scripts/decrease_brightness
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
 
 bindsym $mod+c exec kitty -e python

sway/.config/sway/config.d/autostart.conf

@@ -1,2 +1,2 @@
 exec_always nm-applet &
-#exec_always blueman-applet &
+exec_always blueman-applet &

sway/.config/sway/config.d/workspaces.conf

@@ -3,7 +3,7 @@ set $ws2 "2: Firefox"
 set $ws3 "3: Management"
 set $ws4 "4"
 set $ws5 "5: Doc"
-set $ws6 "6: 3D-Printing"
+set $ws6 "6"
 set $ws7 "7: Music"
 set $ws8 "8"
 set $ws9 "9"
@@ -40,15 +40,12 @@ exec i3-msg 'workspace $ws2; exec firefox'
 ## Multiple monitors
 #
 
-set $this_disp "eDP-1"
+workspace $ws1 output DP-11 eDP-1
-set $other_disp "DP-11"
+workspace $ws2 output eDP-1 DP-11
-
+workspace $ws3 output eDP-1 DP-11
-workspace $ws1 output $other_disp $this_disp
+workspace $ws4 output DP-11 eDP-1
-workspace $ws2 output $this_disp
+workspace $ws5 output eDP-1
-workspace $ws3 output $this_disp
+workspace $ws6 output eDP-1
-workspace $ws4 output $other_disp $this_disp
+workspace $ws7 output eDP-1
-workspace $ws5 output $this_disp
+workspace $ws8 output eDP-1
-workspace $ws6 output $this_disp
-workspace $ws7 output $this_disp
-workspace $ws8 output $this_disp
 

sway/.config/sway/scripts/decrease_brightness

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export BRIGHTNESS=`brightnessctl g`
-if [ $BRIGHTNESS -gt 0 ]; then
-    brightnessctl set 5%-
-else
-    killall gammastep &> /dev/null
-
-    export BRIGHTNESS=`cat /tmp/brightness 2> /dev/null || echo 1` 
-    if [ `echo "$BRIGHTNESS > 0.1" | bc -l` == 1 ]; then
-        export BRIGHTNESS=`echo "$BRIGHTNESS - 0.1" | bc`
-        echo $BRIGHTNESS > /tmp/brightness
-        gammastep -O 6500 -b $BRIGHTNESS:0.1 &
-    else
-        gammastep -O 6500 -b 0.1:0.1 &
-    fi
-fi
-

sway/.config/sway/scripts/increase_brightness

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export BRIGHTNESS=`brightnessctl g`
-if [ $BRIGHTNESS == 0 ]; then
-    killall gammastep &> /dev/null
-
-    export BRIGHTNESS=`cat /tmp/brightness 2> /dev/null || echo 1` 
-    if [ `echo "$BRIGHTNESS < 1.0" | bc -l` == 1 ]; then
-        export BRIGHTNESS=`echo "$BRIGHTNESS + 0.1" | bc`
-        echo $BRIGHTNESS > /tmp/brightness
-        gammastep -O 6500 -b $BRIGHTNESS:0.1 &
-    else
-        brightnessctl set 5%
-    fi
-else
-    brightnessctl set +5%
-fi
-

waybar/.config/waybar/config

@@ -8,7 +8,7 @@
 	"modules-center": [
 		"clock#1",
 		"clock#2",
-		"custom/clock",
+		"clock#3",
 	],
 	"modules-right": [
 		"pulseaudio",
@@ -37,10 +37,9 @@
 		"format": "{:%d-%m-%Y}",
 		"tooltip": false
 	},
-	"custom/clock": {
+	"clock#3": {
-        "exec": "date +\"%H:%M\"",
+		"format": "{:%H:%M}",
-        "interval": 10,
+		"tooltip": false
-        "tooltip": false
 	},
 
 	"pulseaudio": {

zsh/.zshrc

@@ -5,7 +5,6 @@ SAVEHIST=5000
 setopt hist_ignore_all_dups
 setopt extendedglob
 unsetopt beep
-setopt interactivecomments
 bindkey -v
 # End of lines configured by zsh-newuser-install
 # The following lines were added by compinstall
@@ -40,10 +39,16 @@ export EDITOR=nvim
 
 alias get-idf='. $HOME/ext_sw/esp-idf/export.sh'
 
-alias c='cd ~/.dotfiles'
+alias c='z ~/.dotfiles'
-alias sc='cd ~/.config/sway'
+alias sc='z ~/.config/sway'
-alias nc='cd ~/.config/nvim'
+alias nc='z ~/.config/nvim'
-alias flog='nvim -c "Flog -all"'
+alias ezc='nvim ~/.zshrc'
+
+alias ait='z ~/Documents/kit/AIT && clear'
+alias kit='z ~/Documents/kit && clear'
+alias eml='z ~/Documents/kit/EMLLAB/emllab-challenge && . venv/bin/activate && clear'
+
+alias hyp='z ~/git/HyperLink_SW && clear'
 
 # . "$HOME/.cargo/env"
 #