Add changes in .zshrc

Reviewed-on: https://git.mercurial-manifold.eu/an.tsouchlos/dotfiles/pulls/1

README.md

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

clang-format/.clang-format

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

kanshi/.config/kanshi/config

@@ -0,0 +1,13 @@
+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
+}

kitty/.config/kitty/kitty.conf

@@ -5,3 +5,4 @@ include current-theme.conf
 #
 background_opacity 0.87
 enable_audio_bell no
+touch_scroll_multiplier 8.0

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

@@ -1,50 +1,52 @@
 {
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
-  "auto-session": { "branch": "main", "commit": "9e0a169b6fce8791278abbd110717b921afe634d" },
+  "auto-session": { "branch": "main", "commit": "9d02776ed42874d37869dc683396234e3724b52d" },
-  "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
+  "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "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": "1e135c5303bc60598f6314a2276f31dc91aa34dd" },
+  "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
-  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
+  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
-  "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" },
+  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
+  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "b93f040edd57888cd6a1e7d9dee47dddc4463f8f" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "molten-nvim": { "branch": "main", "commit": "8346bba69e0de96278dad2038e9be74605908b7d" },
-  "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" },
+  "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" },
-  "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
+  "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
+  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
+  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" },
-  "nvim-nio": { "branch": "master", "commit": "d8743224616f8107347ddebc77cdbf1e488bdee2" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-tree.lua": { "branch": "master", "commit": "347e1eb35264677f66a79466bb5e3d111968e12c" },
+  "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" },
-  "nvim-treesitter": { "branch": "master", "commit": "9a47a523e3b9e49d3fa14d5743b9860a66eca731" },
+  "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" },
-  "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "overseer.nvim": { "branch": "master", "commit": "89942ad366c8a9bb93f82411de17dc7c644b4e3b" },
+  "overseer.nvim": { "branch": "master", "commit": "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "session-lens": { "branch": "main", "commit": "1b65d8e1bcd1836c5135cce118ba18d662a9dabd" },
+  "session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
+  "sqlite.nvim": { "branch": "master", "commit": "53115a1a73972ce75c9a371a682d27286be9e81e" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
+  "time-tracker.nvim": { "branch": "master", "commit": "c0b87c30484920ed1b9a4589eb62902015dfe5c2" },
-  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
-  "vim-doge": { "branch": "master", "commit": "a96aef58c04e30caf0ce6e98da2e43694624df18" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
-  "vim-flog": { "branch": "master", "commit": "6289ab2e237ceeefdbcc7eb584b63d144bf88d94" },
+  "vim-doge": { "branch": "master", "commit": "188351964c8b2540a69c1d2648b3c6e7877a016f" },
-  "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
+  "vim-flog": { "branch": "master", "commit": "6f80c1ffa7068ca8cc0e29af7af4f6ed0717e65e" },
+  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vimtex": { "branch": "master", "commit": "a80934749c69cc6875b3c9b13ef59573a4824fb2" },
+  "vimtex": { "branch": "master", "commit": "9a5ef1d4ac8e4e06071179ebe8121350fcb97861" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
 }

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

@@ -0,0 +1,25 @@
+return {
+    name = "Cargo Build",
+    builder = function()
+        local file = vim.fn.expand("%:p")
+        return {
+            cmd = {
+                "cargo"
+            },
+            args = {
+                "build"
+            },
+            components = {
+                {
+                    "on_output_quickfix"
+                },
+                "default"
+            }
+        }
+    end,
+    condition = {
+        filetype = {
+            "rust",
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+return {
+    name = "Cargo Clean",
+    builder = function()
+        local file = vim.fn.expand("%:p")
+        return {
+            cmd = {
+                "cargo"
+            },
+            args = {
+                "clean",
+            },
+            components = {
+                "default"
+            }
+        }
+    end,
+    condition = {
+        filetype = {
+            "rust",
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+return {
+    name = "Cargo Run",
+    builder = function()
+        local file = vim.fn.expand("%:p")
+        return {
+            cmd = {
+                "cargo"
+            },
+            args = {
+                "run"
+            },
+            components = {
+                "default"
+            }
+        }
+    end,
+    condition = {
+        filetype = {
+            "rust"
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+return {
+    name = "Cargog Test",
+    builder = function()
+        return {
+            cmd = {
+                "cargo"
+            },
+            args = {
+                "test",
+            },
+            components = {
+                {
+                    "on_output_quickfix"
+                },
+                "default"
+            }
+        }
+    end,
+    condition = {
+        filetype = {
+            "rust",
+        }
+    }
+}

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

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

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())
+    cdf[1] = 0
-    if math.fmod(math.random(100), 5) == 0 then
+    for j = 2, #pmf+1 do
-        if math.random(0, 1) == 0 then
+        cdf[j] = cdf[j - 1] + pmf[j - 1]
-            i = 1
-        else
-            i = 2
-        end
     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
 
 -----------------

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

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

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

@@ -14,7 +14,12 @@ return {
         {
             'williamboman/mason.nvim',
             lazy = false,
-            config = true
+            opts = {
+                registries = {
+                    "github:antsouchlos/mason-registry",
+                    "github:mason-org/mason-registry"
+                }
+            }
         },
 
         -- Autocompletion
@@ -136,9 +141,6 @@ 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({
@@ -176,10 +178,12 @@ return {
 
                 require('lspconfig').matlab_ls.setup({
                     settings = {
-                        filetypes = {"matlab"},
+                        filetypes = {
+                            "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'],
+                    \ 'args': ['--wrap=79', '--number'],
                     \ 'replace': 1,
                     \ }
                 let g:neoformat_enabled_markdown = ['mdformat']

nvim/.config/nvim/lua/plugins/overseer.lua

@@ -3,7 +3,11 @@ return {
     config = function()
         require("overseer").setup({
             templates = {
-                "builtin",
+--                "builtin",
+                "user.cargo_build",
+                "user.cargo_clean",
+                "user.cargo_run",
+                "user.cargo_test",
                 "user.cmake_generate",
                 "user.cmake_build",
                 "user.cmake_clean",

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

@@ -0,0 +1,10 @@
+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

@@ -1,6 +1,7 @@
 return {
     {
         "folke/trouble.nvim",
+        tag="v3.4.1",
         dependencies = {
             {
                 "nvim-tree/nvim-web-devicons"
@@ -12,48 +13,47 @@ return {
                 'nvim-telescope/telescope.nvim'
             }
         },
-        cmd = {
+        opts = {
-            "Trouble",
+            modes = {
-            "TroubleClose",
+                symbols = {
-            "TroubleToggle",
+                    win = {
-            "TroubleRefresh"
+                        size = 50,
-        },
-        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.providers.telescope")
-            local telescope = require("telescope")
-
-            telescope.setup {
-                defaults = {
-                    mappings = {
-                        i = {
-                            ["<c-t>"] = trouble_provider.open_with_trouble
-                        },
-                        n = {
-                            ["<c-t>"] = trouble_provider.open_with_trouble
-                        }
                     }
                 }
             }
-        end
+        },
+        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)",
+          },
+        },
     }
 }

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

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

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

@@ -9,7 +9,6 @@ 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

@@ -26,3 +26,32 @@ vim.opt.scrolloff = 8
 vim.opt.signcolumn = "yes"
 
 vim.opt.updatetime = 50
+
+vim.api.nvim_create_autocmd('FileType', {
+    pattern = 'rust',
+    callback = function()
+        vim.cmd [[
+let &efm = ''
+" Random non issue stuff
+let &efm .= '%-G%.%#aborting due to previous error%.%#,'
+let &efm .= '%-G%.%#test failed, to rerun pass%.%#,'
+" Capture enter directory events for doc tests
+let &efm .= '%D%*\sDoc-tests %f%.%#,'
+" Doc Tests
+let &efm .= '%E---- %f - %o (line %l) stdout ----,'
+let &efm .= '%Cerror%m,'
+let &efm .= '%-Z%*\s--> %f:%l:%c,'
+" Unit tests && `tests/` dir failures
+" This pattern has to come _after_ the doc test one
+let &efm .= '%E---- %o stdout ----,'
+let &efm .= '%Zthread %.%# panicked at %m\, %f:%l:%c,'
+let &efm .= '%Cthread %.%# panicked at %m,'
+let &efm .= '%+C%*\sleft: %.%#,'
+let &efm .= '%+Z%*\sright: %.%#\, %f:%l:%c,'
+" Compiler Errors and Warnings
+let &efm .= '%Eerror%m,'
+let &efm .= '%Wwarning: %m,'
+let &efm .= '%-Z%*\s--> %f:%l:%c,'
+        ]]
+    end
+})

sway/.config/sway/config

@@ -1,29 +1,24 @@
 set $mod Mod4
 set $term kitty
-# set $menu dmenu_path | wofi --show=run --matching fuzzy | xargs swaymsg exec --
 set $menu dmenu_path | wofi --show=run --matching | xargs swaymsg exec --
+set $lock swaylock --screenshot --effect-blur 10x10 --effect-vignette 0.5:1 --ring-color 3c3836 --key-hl-color d65e0e -f
 
-#xwayland disable
 
 output * bg ~/.config/sway/wallpapers/mountains.jpg fill
-
 output eDP-1 scale 1.4
 
-### Idle configuration
+bindswitch --reload --locked lid:on exec $lock
-#
+exec sway-audio-idle-inhibit
-# Example configuration:
+exec swayidle -w \
-#
+    timeout 10 $lock \
-# exec swayidle -w \
+    timeout 20 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-#          timeout 300 'swaylock -f -c 000000' \
+    before-sleep $lock
-#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power 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
-# resumed. It will also lock your screen before your computer goes to sleep.
 
-bindsym $mod+p exec kitty -e python
+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+Return exec $term
 bindsym $mod+Shift+q kill
 bindsym $mod+d exec $menu
@@ -31,43 +26,29 @@ bindsym $mod+d exec $menu
 floating_modifier $mod normal
 
 bindsym $mod+Shift+c reload
-bindsym $mod+Shift+e exec --no-startup-id i3-msg exit
+bindsym $mod+Shift+e exec i3-msg exit
 
-#bar {
-#    position top
-#
-#    # When the status_command prints a new line to stdout, swaybar updates.
-#    # The default just shows the current date and time.
-#    status_command while date +'%Y-%m-%d %X'; do sleep 1; done
-#
-#    colors {
-#        statusline #ffffff
-#        background #323232
-#        inactive_workspace #32323200 #32323200 #5c5c5c
-#    }
-#}
 bar {
     swaybar_command waybar
     position top
 }
 
-bindsym XF86AudioRaiseVolume exec --no-startup-id pulsemixer --change-volume +5 --max-volume 100 #increase sound volume
+bindsym XF86AudioRaiseVolume exec pulsemixer --change-volume +5 --max-volume 100 #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pulsemixer --change-volume -5 --max-volume 100 #decrease sound volume
+bindsym XF86AudioLowerVolume exec pulsemixer --change-volume -5 --max-volume 100 #decrease sound volume
-bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id pulsemixer --change-volume +5 --max-volume 300 #increase sound volume
+bindsym Shift+XF86AudioRaiseVolume exec pulsemixer --change-volume +5 --max-volume 300 #increase sound volume
-bindsym Shift+XF86AudioLowerVolume exec --no-startup-id pulsemixer --change-volume -5 --max-volume 300 #decrease sound volume
+bindsym Shift+XF86AudioLowerVolume exec pulsemixer --change-volume -5 --max-volume 300 #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound
 
-bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
+bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioPause exec --no-startup-id playerctl play-pause
+bindsym XF86AudioPause exec playerctl play-pause
-bindsym XF86AudioNext exec --no-startup-id playerctl next
+bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+bindsym XF86AudioPrev exec playerctl previous
 
-bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +5%
+bindsym XF86MonBrightnessUp exec /bin/sh -c ~/.config/sway/scripts/increase_brightness
-bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 5%-
+bindsym XF86MonBrightnessDown exec /bin/sh -c ~/.config/sway/scripts/decrease_brightness
 
-include ~/.config/sway/config.d/*
 
-bindsym $mod+c exec --no-startup-id kitty -e python
+bindsym $mod+c exec kitty -e python
 
 for_window [title="blueman-manager"] floating enable
 
@@ -76,10 +57,13 @@ default_floating_border none
 default_floating_border normal 0
 hide_edge_borders smart
 
-gaps inner 20
+gaps inner 15
 smart_gaps on
 
 blur enable
 blur_radius 8
 
-exec --no-startup-id dbus-update-activation-environment DISPLAY
+exec dbus-update-activation-environment DISPLAY
+
+
+include ~/.config/sway/config.d/*

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

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

sway/.config/sway/config.d/input.conf

@@ -1,14 +1,14 @@
 input "type:touchpad" {
-    left_handed enabled
     tap enabled
     natural_scroll enabled
     scroll_factor 0.4
     dwt disable
-    accel_profile "adaptive" # disable mouse acceleration (enabled by default; to set it manually, use "adaptive" instead of "flat")
+    accel_profile "adaptive"
-    pointer_accel 0 # set mouse sensitivity (between -1 and 1)
+    pointer_accel 0
 }
 
-input * {
+input type:keyboard {
-    xkb_layout "de"
+    xkb_layout de(nodeadkeys),gr,de(neo)
-    xkb_variant "nodeadkeys"
+    xkb_options grp:ctrls_toggle,caps:escape
 }
+

sway/.config/sway/config.d/navigation.conf

@@ -1,3 +1,7 @@
+#
+# Window Focus
+#
+
 set $left h
 set $down j
 set $up k
@@ -13,6 +17,10 @@ bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
+#
+# Window Movement
+#
+
 bindsym $mod+Shift+$left move left
 bindsym $mod+Shift+$down move down
 bindsym $mod+Shift+$up move up
@@ -23,20 +31,9 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
-bindsym $mod+b splith
+#
-bindsym $mod+v splitv
+# Window Size
-
+#
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-bindsym $mod+f fullscreen
-
-bindsym $mod+Shift+space floating toggle
-
-bindsym $mod+space focus mode_toggle
-
-bindsym $mod+a focus parent
 
 mode "resize" {
     bindsym $left resize shrink width 10px
@@ -54,5 +51,23 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+#
+# WM Behavior
+#
+
+bindsym $mod+b splith
+bindsym $mod+v splitv
+
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+bindsym $mod+f fullscreen
+
+bindsym $mod+Shift+space floating toggle
+bindsym $mod+space focus mode_toggle
+
+bindsym $mod+a focus parent
+
 bindsym $mod+Shift+minus move scratchpad
 bindsym $mod+minus scratchpad show

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"
+set $ws6 "6: 3D-Printing"
 set $ws7 "7: Music"
 set $ws8 "8"
 set $ws9 "9"
@@ -31,21 +31,24 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-# assign [class="firefox"] $ws2
 assign [class="Spotify"] $ws7
 
-exec --no-startup-id i3-msg 'workspace $ws1; exec kitty; $ws1'
+exec i3-msg 'workspace $ws1; exec kitty; $ws1'
-exec --no-startup-id i3-msg 'workspace $ws2; exec firefox'
+exec i3-msg 'workspace $ws2; exec firefox'
 
 #
 ## Multiple monitors
 #
-#workspace $ws1 output DP1-3 eDP1
+
-#workspace $ws2 output eDP1 DP1-3
+set $this_disp "eDP-1"
-#workspace $ws3 output eDP1 DP1-3
+set $other_disp "DP-11"
-#workspace $ws4 output DP1-3 eDP1
+
-#workspace $ws5 output eDP1
+workspace $ws1 output $other_disp $this_disp
-#workspace $ws6 output eDP1
+workspace $ws2 output $this_disp
-#workspace $ws7 output eDP1
+workspace $ws3 output $this_disp
-#workspace $ws8 output eDP1
+workspace $ws4 output $other_disp $this_disp
+workspace $ws5 output $this_disp
+workspace $ws6 output $this_disp
+workspace $ws7 output $this_disp
+workspace $ws8 output $this_disp
 

sway/.config/sway/scripts/decrease_brightness

@@ -0,0 +1,18 @@
+#!/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

@@ -0,0 +1,18 @@
+#!/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",
-		"clock#3",
+		"custom/clock",
 	],
 	"modules-right": [
 		"pulseaudio",
@@ -16,31 +16,19 @@
 		"cpu",
 		"battery",
 		"disk",
+        "sway/language",
 		"tray"
 	],
 
-	"custom/left-arrow-dark": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/left-arrow-light": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/right-arrow-dark": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/right-arrow-light": {
-		"format": "",
-		"tooltip": false
-	},
-
 	"sway/workspaces": {
 		"disable-scroll": true,
 		"format": "{name}"
 	},
 
+    "sway/language": {
+    	"format": "{short} {variant} ",
+    },
+
 	"clock#1": {
 		"format": "{:%a}",
 		"tooltip": false
@@ -49,9 +37,10 @@
 		"format": "{:%d-%m-%Y}",
 		"tooltip": false
 	},
-	"clock#3": {
+	"custom/clock": {
-		"format": "{:%H:%M}",
+        "exec": "date +\"%H:%M\"",
-		"tooltip": false
+        "interval": 10,
+        "tooltip": false
 	},
 
 	"pulseaudio": {

zsh/.zshrc

@@ -1,9 +1,11 @@
 # Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
-HISTSIZE=1000
+HISTSIZE=5000
-SAVEHIST=1000
+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
@@ -19,9 +21,9 @@ autoload -Uz vcs_info
 precmd() { vcs_info }
 zstyle ':vcs_info:git:*' formats '%b '
 setopt PROMPT_SUBST
-PROMPT='%F{blue}%~%f %F{red}${vcs_info_msg_0_}%f$ '
+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'
 
@@ -29,88 +31,24 @@ 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 sc='z ~/.config/sway'
+alias c='cd ~/.dotfiles'
-alias nc='z ~/.config/nvim'
+alias sc='cd ~/.config/sway'
-alias ezc='nvim ~/.zshrc'
+alias nc='cd ~/.config/nvim'
+alias flog='nvim -c "Flog -all"'
 
-alias ait='z ~/Documents/kit/AIT && clear'
+# . "$HOME/.cargo/env"
-alias kit='z ~/Documents/kit && clear'
+#
-alias eml='z ~/Documents/kit/EMLLAB/emllab-challenge && . venv/bin/activate && clear'
+# eval "$(zoxide init zsh)"
+# eval "$(thefuck --alias)"
 
-alias hyp='z ~/git/HyperLink_SW && clear'
+. "$HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh"
-
+bindkey '^y' autosuggest-accept
-eval "$(zoxide init zsh)"
-eval "$(thefuck --alias)"
-
-#source /usr/share/git/completion/git-completion.zsh
-#
-#eval "$(thefuck --alias)"
-#
-#export VISUAL=nvim
-#export EDITOR="$VISUAL"
-#
-#function pym {
-#    python -m $@
-#}
-#
-#function _pym_complete {
-#
-#    local executable current previous options
-#    executable=${COMP_WORDS[0]}
-#    current="${COMP_WORDS[COMP_CWORD]}"
-#    previous="${COMP_WORDS[COMP_CWORD-1]}"
-#
-#    COMPREPLY=()
-#    if [[ ( "$executable" == python* && "$previous" == "-m" ) ||
-#          ( "$executable" == pym     && ! "$current" == -* ) ]]; then
-#
-#        options="`python <<EOF
-#import os
-#import pkgutil
-#import sys
-#current = '$current'
-#if '.' in current:
-#    package_name = current.rsplit('.', 1)[0]
-#    try:
-#        package = __import__(package_name, fromlist=['__name__'])
-#    except:
-#        exit()
-#else:
-#    package_name = ''
-#    package = None
-#def walk_packages(paths, match, prefix=''):
-#    for loader, name, ispkg in pkgutil.iter_modules(paths, prefix):
-#        if not name.startswith(match):
-#            continue
-#        yield loader, name, ispkg
-#        if ispkg:
-#            for x in walk_packages([os.path.join(loader.path, name.split('.')[-1])], match, name + '.'):
-#                yield x
-#for loader, name, ispkg in walk_packages(
-#    package and getattr(package, '__path__', ()),
-#    current,
-#    package_name and (package_name + '.'),
-#):
-#    if ispkg:
-#        continue
-#    if name.endswith('.__main__'):
-#        print(name.rsplit('.', 1)[0])
-#    else:
-#        print(name)
-#EOF
-#        `"
-#        COMPREPLY=( $(compgen -W "${options}") )
-#        return 0
-#    fi
-#}
-#
-#complete -F _pym_complete -o nospace -o bashdefault -o default pym
-#complete -F _pym_complete -o nospace -o bashdefault -o default python
-#
-. "$HOME/.cargo/env"