From 82b0f111c28862dc073c91bc5e798c9e39f57d02 Mon Sep 17 00:00:00 2001 From: cerberus Date: Tue, 30 Sep 2025 19:35:36 +0200 Subject: [PATCH] added nvim --- nvim/.gitignore | 8 + nvim/.neoconf.json | 15 ++ nvim/LICENSE | 201 +++++++++++++++++ nvim/README.md | 4 + nvim/init.lua | 2 + nvim/lazy-lock.json | 43 ++++ nvim/lazyvim.json | 18 ++ nvim/lua/config/autocmds.lua | 8 + nvim/lua/config/keymaps.lua | 3 + nvim/lua/config/lazy.lua | 53 +++++ nvim/lua/config/options.lua | 5 + nvim/lua/plugins/colorscheme.lua | 12 ++ nvim/lua/plugins/example.lua | 202 ++++++++++++++++++ nvim/stylua.toml | 3 + qtile/__pycache__/config.cpython-313.pyc | Bin 0 -> 2272 bytes qtile/config.py | 4 +- qtile/modules/groups.py | 147 ++++++------- qtile/modules/keys.py | 23 +- qtile/modules/layouts.py | 1 + qtile/modules/widgets.py | 1 - .../themes/__pycache__/colors.cpython-313.pyc | Bin 0 -> 768 bytes 21 files changed, 663 insertions(+), 90 deletions(-) create mode 100644 nvim/.gitignore create mode 100644 nvim/.neoconf.json create mode 100644 nvim/LICENSE create mode 100644 nvim/README.md create mode 100644 nvim/init.lua create mode 100644 nvim/lazy-lock.json create mode 100644 nvim/lazyvim.json create mode 100644 nvim/lua/config/autocmds.lua create mode 100644 nvim/lua/config/keymaps.lua create mode 100644 nvim/lua/config/lazy.lua create mode 100644 nvim/lua/config/options.lua create mode 100644 nvim/lua/plugins/colorscheme.lua create mode 100644 nvim/lua/plugins/example.lua create mode 100644 nvim/stylua.toml create mode 100644 qtile/__pycache__/config.cpython-313.pyc create mode 100644 qtile/themes/__pycache__/colors.cpython-313.pyc diff --git a/nvim/.gitignore b/nvim/.gitignore new file mode 100644 index 0000000..cc5457a --- /dev/null +++ b/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/nvim/.neoconf.json b/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/nvim/LICENSE b/nvim/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/nvim/README.md b/nvim/README.md new file mode 100644 index 0000000..185280b --- /dev/null +++ b/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..2514f9e --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json new file mode 100644 index 0000000..bcc3c0a --- /dev/null +++ b/nvim/lazy-lock.json @@ -0,0 +1,43 @@ +{ + "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, + "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, + "SchemaStore.nvim": { "branch": "main", "commit": "2ae6d27897c60265d4ad3f33e286528d519098fd" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, + "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, + "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, + "dial.nvim": { "branch": "master", "commit": "f0404ec1f83a03f2c3457e60087c6331d1cbb83f" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "fzf-lua": { "branch": "main", "commit": "70cdea35ac8fe5e3a977616b883d780a842cc115" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, + "grug-far.nvim": { "branch": "main", "commit": "c5b629399c0f2e436c00df381e44852a13b7313a" }, + "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.ai": { "branch": "main", "commit": "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9" }, + "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" }, + "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" }, + "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" }, + "nvim-lspconfig": { "branch": "master", "commit": "3e89e4973d784e1c966517e528b3a30395403fa7" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "render-markdown.nvim": { "branch": "main", "commit": "e76eb2e4262f0f0a1a7bd7a454dd7d44f1299afd" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" } +} diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json new file mode 100644 index 0000000..462ed91 --- /dev/null +++ b/nvim/lazyvim.json @@ -0,0 +1,18 @@ +{ + "extras": [ + "lazyvim.plugins.extras.coding.luasnip", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.editor.dial", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.python", + "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.util.dot" + ], + "install_version": 7, + "news": { + "NEWS.md": "10960" + }, + "version": 8 +} \ No newline at end of file diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..4221e75 --- /dev/null +++ b/nvim/lua/config/autocmds.lua @@ -0,0 +1,8 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- +-- Add any additional autocmds here +-- with `vim.api.nvim_create_autocmd` +-- +-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults) +-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell") diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua new file mode 100644 index 0000000..2c134f7 --- /dev/null +++ b/nvim/lua/config/keymaps.lua @@ -0,0 +1,3 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..0201db5 --- /dev/null +++ b/nvim/lua/config/lazy.lua @@ -0,0 +1,53 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + -- "tutor", + "zipPlugin", + }, + }, + }, +}) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua new file mode 100644 index 0000000..d29496c --- /dev/null +++ b/nvim/lua/config/options.lua @@ -0,0 +1,5 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here + +vim.opt.colorcolumn = "72,79" diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..f206ac3 --- /dev/null +++ b/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,12 @@ +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, +} diff --git a/nvim/lua/plugins/example.lua b/nvim/lua/plugins/example.lua new file mode 100644 index 0000000..75fc8c4 --- /dev/null +++ b/nvim/lua/plugins/example.lua @@ -0,0 +1,202 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, { + function() + return "😄" + end, + }) + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, + { + "fladson/vim-kitty", + ft = "kitty", + tag = "*", -- You can select a tagged version + }, +} diff --git a/nvim/stylua.toml b/nvim/stylua.toml new file mode 100644 index 0000000..5d6c50d --- /dev/null +++ b/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/qtile/__pycache__/config.cpython-313.pyc b/qtile/__pycache__/config.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d1a0e964f6ef7265fa9d2329553faa8d8a4bb4c2 GIT binary patch literal 2272 zcmbVMNsk*v6fV0Lx7YSI9?ueHOD1t(?2I6aW{47&peVMKWtu~j7`57V+tae$WnQ;u zJ9)%m1RQ_^QjUn6_$M4E3WrXKC`bsw+-8&mS6;PkCKn>0rLKDKtGCp9^;Nx$$0G#4 zp7Qis7PfQWM395p|S#s zFH4nhIRcS#6r#Q^S7PNj#LEdt_8he7C4{t;mM#%3b1$G}*CcIXE$~{u60P$7uBO%mnAWCYrW#o!mq%NN+3M`ZyQg)GrD_5znzf?EyRHLu> zzEQ=VRD<@GrlLXLVE)iw7IH?_04Mw z+M>3kom~?z1z=G-2TR&AoW=QEiNLaU9?s)`0sjL27x8~ny8v(Dyn=sGD?q7ru5j^) zZ?6z!(xR_5SO0gF7w`z1pZy3-GXv)-1c> zut=Bo9n+T)ms>#lJ%=S)rmOq1j+RbAV6knhfuN&z4a;W9vDTyDf?>HVK1RA`!!j^s z;35v8joOd3(eoJT(Hde85u}N(GTcYDT@y ztFs#{M0-Zv!mWvpwP!N9Ye385EfZYY+Y8_6nfAP9*v?T712Cc4TE%9FO=`PL;iK;r zX;Lsp0mUwDyu*b1tE)`x!`2Q9Z5z8C15=?Fb@$@#ZqHoj{inF&qaQKs(N!Kh*f3ed zrVZ0*_&pby+OFwf_DsXo8zy#=B~Ae_T$6=SA9k2UP^3NAqPBDUD2?$xW|D)&xJmRRM4ohRj1_rLOuJDW?Y3xfDmlO}B2)jis{7mmnWJ%c)9ji~u}(V_ z90+kNhSm2w2=WpDpGpE@jwi>v)RD zMx%=(=ORmNcXYoGI`E>9_8onv-Uo+*?iY{YPZ6IA>Bg`^es6Sst&qj3F=q67qe$r{ z?R4n2?q}AUwBC1Ess@(b(wl&^(vj=+HcK@-)WA#EHhZpa)aaJUqNDuV2K1O}^j)eq z`<>3PYBueM(y6U)V{S}f)Lm=K;JjcNFo(z22U8z+DegzWYiD(R{%?1A{XdYG*jB=p zOPjQ7mg*+dOz1l$JZt{8lzbYMhDx!w%ap6bQ@RG9pc{XKoyRyH3xPo3PniVfpOY)k z$>MKh`FFDNf~>wEx1Nw&Ka-i~Wa(HTsl2D=z08z1dB#g*PolCC9Ec}5B1OHJ`qj-Z zZhA3XTl%j2WU}OC^Ij^$GIMAakDLgKB%fqowaou(%h}gh9Ol4)sX^#iCSv$teSiJn`u_E=&8NbQ7ftQo@TADWgZ&2w`o8`s{8U;%aBu@{rR+Bk zz5I+fIpw8u9+n%Ha`LedN(Tpt<21?U4@uHXX9wyp6H|vI?PYU^B;}1{Tufo3_?So! gq8MSIdS}ial4&nDeMmB1GCPQS;pDyy5Am@60$K%>jsO4v literal 0 HcmV?d00001 diff --git a/qtile/config.py b/qtile/config.py index d674071..6162f91 100644 --- a/qtile/config.py +++ b/qtile/config.py @@ -7,7 +7,7 @@ from libqtile.config import Screen from themes.colors import gruvbox_dark from modules.keys import keybinds, mousebinds -from modules.groups import groups +from modules.groups import groups, get_group_keys from modules.widgets import widgets_main, widgets_portrait, widgets_media from modules.hooks import * from modules.layouts import layouts @@ -63,7 +63,9 @@ widget_defaults = dict( ) # Essentials +mod = "mod4" keys = keybinds() +keys.extend(get_group_keys(mod)) mouse = mousebinds() groups = groups layouts = layouts diff --git a/qtile/modules/groups.py b/qtile/modules/groups.py index 897e69e..318ac7f 100644 --- a/qtile/modules/groups.py +++ b/qtile/modules/groups.py @@ -1,9 +1,12 @@ +# groups.py (überarbeitete Version) + import re from libqtile.lazy import lazy from libqtile.config import Group, EzKey as Key, Match, DropDown, ScratchPad -from modules.keys import keybinds +# WICHTIG: Definiere hier group_screen_map und groups group_screen_map = { + "0": 0, "1": 1, "2": 1, "3": 1, @@ -31,10 +34,7 @@ groups = [ Group( name="0", label="󰓓", - matches=[ - Match(wm_class=re.compile(r"^(steam)")), - Match(wm_class=re.compile(r"^(Minecraft*)")), - ], + matches=[Match(wm_class=re.compile(r"^(steam|Minecraft*)"))], ), Group(name="1", label="󰲡"), Group(name="2", label="󰲣"), @@ -46,43 +46,17 @@ groups = [ Group(name="8", label="󰲯"), Group(name="9", label="󰲱"), # Groups on function-keys - Group( - name="f1", - label="", - matches=[ - Match(wm_class=re.compile(r"^(firefox)$")), - ], - ), + Group(name="f1", label="", matches=[Match(wm_class=re.compile(r"^(firefox)$"))]), Group(name="f2", label="", matches=[Match(wm_class="discord")]), - Group( - name="f3", - label="", - matches=[Match(wm_class=re.compile(r"^(joplin)$"))], - ), + Group(name="f3", label="", matches=[Match(wm_class=re.compile(r"^(joplin)$"))]), Group( name="f4", label=" ", - matches=[ - Match( - wm_class=re.compile(r"^(com.github.th_ch.youtube_music)$"), - ), - ], - ), - Group( - name="f5", - label="󱦹", - matches=[Match(wm_class="rnote")], - ), - Group( - name="f6", - label="󰟵", - matches=[Match(wm_class="bitwarden")], - ), - Group( - name="f7", - label=" 󰣀", - matches=[Match(wm_class=re.compile(r"^(XPipe)$"))], + matches=[Match(wm_class=re.compile(r"^(com.github.th_ch.youtube_music)$"))], ), + Group(name="f5", label="󱦹", matches=[Match(wm_class="rnote")]), + Group(name="f6", label="󰟵", matches=[Match(wm_class="bitwarden")]), + Group(name="f7", label=" 󰣀", matches=[Match(wm_class=re.compile(r"^(XPipe)$"))]), Group(name="f8", label="󱊲"), Group(name="f9", label="󱊳"), Group(name="f10", label="󱊴"), @@ -90,54 +64,7 @@ groups = [ Group(name="f12", label="󱊶"), ] - -def create_group_keys(groups, go_to_group, go_to_group_and_move_window): - additional_keys = [] - - -def go_to_group(name: str): - def _inner(qtile): - screen = group_screen_map.get(name, 0) - if len(qtile.screens) <= 2: - qtile.groups_map[name].toscreen() - else: - qtile.focus_screen(screen) - qtile.groups_map[name].toscreen() - - return _inner - - -# for i in groups: -# keys.append(Key([mod], i.name, lazy.function(go_to_group(i.name)))) -for i in groups: - keys.append( - Key(f"M-{i.name}", lazy.function(go_to_group(i.name))), - ) - - -def go_to_group_and_move_window(name: str): - def _inner(qtile): - screen = group_screen_map.get(name, 0) - if len(qtile.screens) <= 2: - qtile.current_window.togroup(name, switch_group=False) - else: - qtile.current_window.togroup(name, switch_group=False) - qtile.focus_screen(screen) - qtile.groups_map[name].toscreen() - - return _inner - - -for i in groups: - keys.append( - Key(f"M-S-{i.name}", lazy.function(go_to_group_and_move_window(i.name))), - ) - -for i in range(1, 12): - group_name = f"" - key = f"" - keys.append - +# Füge die Scratchpad-Gruppe zur Gruppenliste hinzu groups.append( ScratchPad( "scratchpad", @@ -165,3 +92,53 @@ groups.append( ], ) ) + + +def go_to_group(name: str): + def _inner(qtile): + screen = group_screen_map.get(name, 0) + if len(qtile.screens) <= 2: + qtile.groups_map[name].toscreen() + else: + qtile.focus_screen(screen) + qtile.groups_map[name].toscreen() + + return _inner + + +def go_to_group_and_move_window(name: str): + def _inner(qtile): + screen = group_screen_map.get(name, 0) + qtile.current_window.togroup(name, switch_group=False) + if len(qtile.screens) > 2: + qtile.focus_screen(screen) + qtile.groups_map[name].toscreen() + + return _inner + + +def get_group_keys(mod: str) -> list: + """ + Diese Funktion erstellt und gibt alle Key-Bindings für die Gruppen zurück. + Sie nimmt den Modifier-Key (z.B. "M") als Argument. + """ + keys = [] + + # Fügt Keys für reguläre Gruppen und F-Tasten-Gruppen hinzu + for group in groups: + # Hier wird der Name der Gruppe als Key verwendet, außer bei Scratchpads + if group.name != "scratchpad": + # Normale Gruppen wechseln + keys.append( + Key(f"M-{group.name}", lazy.function(go_to_group(group.name))), + ) + + # Fenster in Gruppe verschieben + keys.append( + Key( + f"M-S-{group.name}", + lazy.function(go_to_group_and_move_window(group.name)), + ), + ) + + return keys diff --git a/qtile/modules/keys.py b/qtile/modules/keys.py index cde1fa4..6d9694b 100644 --- a/qtile/modules/keys.py +++ b/qtile/modules/keys.py @@ -1,10 +1,11 @@ from libqtile.lazy import lazy from libqtile.config import EzKey as Key from libqtile.config import EzClick as Click, EzDrag as Drag +from modules.groups import groups def keybinds(): - from config import APPS + # from ..config import APPS keys = ( [ @@ -51,8 +52,8 @@ def keybinds(): lazy.window.toggle_fullscreen(), desc="Toggles wiondow between tiled/floating and fullscreen", ), - Key("", lazy.next_layout(), desc="Switches between layouts"), - Key("", lazy.reload_config(), desc="Reload config"), + Key("M-", lazy.next_layout(), desc="Switches between layouts"), + Key("M-C-r", lazy.reload_config(), desc="Reload config"), # Audio and media control Key("", lazy.spawn("pamixer -t"), desc="Mutes Audio"), Key( @@ -112,6 +113,22 @@ def keybinds(): Key("M-", lazy.spawn(APPS["terminal"])), ], ) + + for group in groups: + # Hier wird der Name der Gruppe als Key verwendet, außer bei Scratchpads + if group.name != "scratchpad": + # Normale Gruppen wechseln + keys.append( + Key(f"M-{group.name}", lazy.function(go_to_group(group.name))), + ) + + # Fenster in Gruppe verschieben + keys.append( + Key( + f"M-S-{group.name}", + lazy.function(go_to_group_and_move_window(group.name)), + ), + ) return keys diff --git a/qtile/modules/layouts.py b/qtile/modules/layouts.py index a70f686..adeca13 100644 --- a/qtile/modules/layouts.py +++ b/qtile/modules/layouts.py @@ -47,6 +47,7 @@ floating_layout = layout.Floating( Match(wm_class="pavucontrol"), Match(wm_class="org.gnome.FileRoller"), Match(wm_class="lximage-qt"), + Match(wm_class="matplotlib"), ], **floating_layout_defaults, ) diff --git a/qtile/modules/widgets.py b/qtile/modules/widgets.py index 76193fd..67accbe 100644 --- a/qtile/modules/widgets.py +++ b/qtile/modules/widgets.py @@ -42,7 +42,6 @@ widgets_media = [ fontsize=24, foreground=gruvbox_dark["blue"], mouse_callbacks={"Button1": lazy.function(start_menu)}, - **widget_defaults, ), widget.GroupBox2( padding=6, diff --git a/qtile/themes/__pycache__/colors.cpython-313.pyc b/qtile/themes/__pycache__/colors.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b6637330851d2d4f85cf220bbf643021794901dc GIT binary patch literal 768 zcmXw$yKd7^7=VxKIQOL2q$%{4rUf!k-yK^*Yz!+Id-Btae5LL%Ep$l3ktm;L|&DiC^m&!m5G(}U3(IN?#Fw!+$(ZZ~byJiWWx-kqj8?Q|C zA{Dpzx~*GS8kDIRj$vZyP?lx-rh#QZjeIM#pu$Lj3cXPEM_70Y^8(M)u<(??^bJ?V z!c)A!WsaVSoZ(ygzGkRFR!+D(ix_UU%s^pT`GLi8@(Bkc$ARyVBF@+h+OeIH>SiVP zE_ER-+X*a4FHZ4s!?aD?&dT$Y&tn{Ts-@Z1hoO))Bc9%S$>*EE<+ne{8vn2CwLDIy zO!gV~7*7}SwV%wwNhIGbCoz+kV>V?A*-zqxFRtegS@q2{3DTIofZyT?kc)yK zmM$bVTr&Mp7| literal 0 HcmV?d00001