Add changes in .zshrc and lsp.lua

2024-06-10 22:44:45 +00:00
21 changed files with 147 additions and 251 deletions
--- a/README.md
+++ b/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
 ```

--- a/clang-format/.clang-format
+++ b/clang-format/.clang-format
@@ -9,7 +9,6 @@ PointerAlignment: Left
 AccessModifierOffset: -4
 AlwaysBreakTemplateDeclarations: true
 LambdaBodyIndentation: Signature
-AllowShortLambdasOnASingleLine: None

 MaxEmptyLinesToKeep: 3
 #ColumnLimit: 128
--- a/kanshi/.config/kanshi/config
+++ b/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
-}
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,52 +1,50 @@
 {
  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
-  "auto-session": { "branch": "main", "commit": "9d02776ed42874d37869dc683396234e3724b52d" },
-  "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" },
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" },
+  "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" },
-  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
-  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "copilot.vim": { "branch": "release", "commit": "53d3091be388ff1edacdb84421ccfa19a446a84d" },
+  "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
+  "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
+  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
+  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" },
  "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "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": "25c11854aa25558ee6c03432edfa0df0217324be" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
+  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
  "molten-nvim": { "branch": "main", "commit": "8346bba69e0de96278dad2038e9be74605908b7d" },
-  "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" },
-  "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
-  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" },
-  "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "overseer.nvim": { "branch": "master", "commit": "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "session-lens": { "branch": "main", "commit": "eae46b472b3150f5ec0f977556e8085683d49eb0" },
-  "sqlite.nvim": { "branch": "master", "commit": "53115a1a73972ce75c9a371a682d27286be9e81e" },
+  "neoformat": { "branch": "master", "commit": "82864d6c7926c4f3b535a2fd7eab919b116fc969" },
+  "noice.nvim": { "branch": "main", "commit": "29c7f030b0920e2f17263a9ab8742cde144b9140" },
+  "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "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" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "session-lens": { "branch": "main", "commit": "1b65d8e1bcd1836c5135cce118ba18d662a9dabd" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "time-tracker.nvim": { "branch": "master", "commit": "c0b87c30484920ed1b9a4589eb62902015dfe5c2" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
-  "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
-  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
+  "todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
+  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
+  "trouble.nvim": { "branch": "main", "commit": "6ce015ea999879364e35f20da3e8687583d3b719" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
  "vim-doge": { "branch": "master", "commit": "188351964c8b2540a69c1d2648b3c6e7877a016f" },
-  "vim-flog": { "branch": "master", "commit": "6f80c1ffa7068ca8cc0e29af7af4f6ed0717e65e" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "vim-flog": { "branch": "master", "commit": "2f0836128cac9368176a564b237382d1766723f0" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vimtex": { "branch": "master", "commit": "9a5ef1d4ac8e4e06071179ebe8121350fcb97861" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
-}
+  "vimtex": { "branch": "master", "commit": "366ba106795db13879fdbfb4d6e4b8e1d616b684" },
+  "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }
+}
--- a/nvim/.config/nvim/lua/overseer/template/user/cmake_generate.lua
+++ b/nvim/.config/nvim/lua/overseer/template/user/cmake_generate.lua
@@ -9,7 +9,7 @@ return {
                "RelWithDebInfo",
                "MinSizeRel"
            },
-            default = "Release"
+            default = "Debug"
        },
        generator = {
            type = "enum",
--- 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()
-    local images = {
+    images = {
        {
            [[██╗      █████╗  ██████╗██╗  ██╗███████╗]],
            [[██║     ██╔══██╗██╔════╝██║  ██║██╔════╝]],
@@ -29,53 +29,21 @@ local function get_random_image()
            [[██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║]],
            [[██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║]],
            [[╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝]]
-        },
-        {
-            [[                  ▄                  ]],
-            [[                 ▟█▙                 ]],
-            [[                ▟███▙                ]],
-            [[               ▟█████▙               ]],
-            [[              ▟███████▙              ]],
-            [[             ▂▔▀▜██████▙             ]],
-            [[            ▟██▅▂▝▜█████▙            ]],
-            [[           ▟█████████████▙           ]],
-            [[          ▟███████████████▙          ]],
-            [[         ▟█████████████████▙         ]],
-            [[        ▟███████████████████▙        ]],
-            [[       ▟█████████▛▀▀▜████████▙       ]],
-            [[      ▟████████▛      ▜███████▙      ]],
-            [[     ▟█████████        ████████▙     ]],
-            [[    ▟██████████        █████▆▅▄▃▂    ]],
-            [[   ▟██████████▛        ▜█████████▙   ]],
-            [[  ▟██████▀▀▀              ▀▀██████▙  ]],
-            [[ ▟███▀▘                       ▝▀███▙ ]],
-            [[▟▛▀                               ▀▜▙]],
-            [[                 btw                 ]]
        }
    }

-    local pmf = {0.25, 0.25, 0.25, 0.25}
-    local cdf = {}
-
-    cdf[1] = 0
-    for j = 2, #pmf+1 do
-        cdf[j] = cdf[j - 1] + pmf[j - 1]
-    end
-
-    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
+    local i = 3

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

 -----------------
--- a/nvim/.config/nvim/lua/plugins/auto_session.lua
+++ b/nvim/.config/nvim/lua/plugins/auto_session.lua
@@ -1,7 +1,6 @@
 return {
    {
        "rmagatti/auto-session",
-        lazy = false,
        dependencies = {
            "nvim-lualine/lualine.nvim"
        },
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -14,12 +14,7 @@ return {
        {
            'williamboman/mason.nvim',
            lazy = false,
-            opts = {
-                registries = {
-                    "github:antsouchlos/mason-registry",
-                    "github:mason-org/mason-registry"
-                }
-            }
+            config = true
        },

        -- 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 = {
-                            "matlab"
-                        },
+                        filetypes = {"matlab"},
                        matlab = {
                            installPath = "/opt/matlab/R2023a/"
-                        }
+                        },
                    },
                    single_file_support = true
                })
--- a/nvim/.config/nvim/lua/plugins/neoformat.lua
+++ b/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']
--- a/nvim/.config/nvim/lua/plugins/time_tracker.lua
+++ b/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"
-    }
-}
--- a/nvim/.config/nvim/lua/plugins/trouble.lua
+++ b/nvim/.config/nvim/lua/plugins/trouble.lua
@@ -1,7 +1,6 @@
 return {
    {
        "folke/trouble.nvim",
-        tag="v3.4.1",
        dependencies = {
            {
                "nvim-tree/nvim-web-devicons"
@@ -13,47 +12,48 @@ return {
                'nvim-telescope/telescope.nvim'
            }
        },
-        opts = {
-            modes = {
-                symbols = {
-                    win = {
-                        size = 50,
+        cmd = {
+            "Trouble",
+            "TroubleClose",
+            "TroubleToggle",
+            "TroubleRefresh"
+        },
+        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
+                        }
                    }
                }
            }
-        },
-        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)",
-          },
-        },
+        end
    }
 }
--- a/nvim/.config/nvim/lua/plugins/whichkey.lua
+++ b/nvim/.config/nvim/lua/plugins/whichkey.lua
@@ -15,30 +15,26 @@ return {
        },
        config = function()
            local wk = require("which-key")
-            wk.add({
-                {
-                    "<leader>d",
-                    group = "Debug"
-                },
-                {
-                    "<leader>f",
-                    group = "Find"
-                },
-                {
-                    "<leader>l",
-                    group = "LSP"
-                },
-                {
-                    "<leader>o",
-                    group = "Overseer"
-                },
-                {
-                    "<leader>s",
-                    group = "Session"
-                },
-                {
-                    "<leader>x",
-                    group = "Trouble"
+            wk.register({
+                ["<leader>"] = {
+                    l = {
+                        name = "+LSP"
+                    },
+                    x = {
+                        name = "+Trouble"
+                    },
+                    o = {
+                        name = "+Overseer"
+                    },
+                    d = {
+                        name = "+Debug"
+                    },
+                    f = {
+                        name = "+Find"
+                    },
+                    s = {
+                        name = "+Session"
+                    },
                }
            })
        end
--- a/nvim/.config/nvim/lua/remap.lua
+++ b/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")
--- a/nvim/.config/nvim/lua/set.lua
+++ b/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',
-    callback = function()
-        vim.cmd [[
+	pattern = 'rust',
+	callback = function ()
+        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,
 })
--- a/sway/.config/sway/config
+++ b/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 XF86MonBrightnessDown exec /bin/sh -c ~/.config/sway/scripts/decrease_brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-


 bindsym $mod+c exec kitty -e python
--- a/sway/.config/sway/config.d/autostart.conf
+++ b/sway/.config/sway/config.d/autostart.conf
@@ -1,2 +1,2 @@
 exec_always nm-applet &
-#exec_always blueman-applet &
+exec_always blueman-applet &
--- a/sway/.config/sway/config.d/workspaces.conf
+++ b/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"
-set $other_disp "DP-11"
-
-workspace $ws1 output $other_disp $this_disp
-workspace $ws2 output $this_disp
-workspace $ws3 output $this_disp
-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
+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 $ws5 output eDP-1
+workspace $ws6 output eDP-1
+workspace $ws7 output eDP-1
+workspace $ws8 output eDP-1

--- a/sway/.config/sway/scripts/decrease_brightness
+++ b/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
-
--- a/sway/.config/sway/scripts/increase_brightness
+++ b/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
-
--- a/waybar/.config/waybar/config
+++ b/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": {
-        "exec": "date +\"%H:%M\"",
-        "interval": 10,
-        "tooltip": false
+	"clock#3": {
+		"format": "{:%H:%M}",
+		"tooltip": false
 	},

 	"pulseaudio": {
--- a/zsh/.zshrc
+++ b/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
@@ -31,19 +30,21 @@ 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='cd ~/.dotfiles'
-alias sc='cd ~/.config/sway'
-alias nc='cd ~/.config/nvim'
-alias flog='nvim -c "Flog -all"'
+alias sc='z ~/.config/sway'
+alias nc='z ~/.config/nvim'
+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"
 #