From 33e490f05f94a2ed83d207be3230d858a7b37e24 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 17 Jun 2024 16:19:21 +0200 Subject: [PATCH] Updated config --- .config/hypr/typing.conf | 9 +-- .config/nvim/init.lua | 5 +- .config/nvim/lazy-lock.json | 18 ++---- .config/nvim/lua/autocmds.lua | 15 +---- .config/nvim/lua/boot.lua | 12 ---- .../lua/{plugins => disabled}/autopairs.lua | 0 .../nvim/lua/{plugins => disabled}/lsp.lua | 0 .../{plugins => disabled}/mini-complete.lua | 0 .../{plugins => disabled}/mini-surround.lua | 0 .../lua/{plugins => disabled}/multicursor.lua | 0 .../nvim/lua/{plugins => disabled}/noice.lua | 0 .../nvim/lua/{plugins => disabled}/notify.lua | 0 .../nvim/lua/{plugins => disabled}/tree.lua | 0 .config/nvim/lua/keys.lua | 58 ++++++------------- .config/nvim/lua/{setup.lua => packages.lua} | 19 +++++- .config/nvim/lua/plugins/flash.lua | 2 +- .config/nvim/lua/plugins/gitsigns.lua | 2 +- .config/nvim/lua/plugins/telescope.lua | 13 ----- .config/nvim/lua/plugins/treesitter.lua | 20 ------- .config/nvim/lua/settings.lua | 3 +- .config/waybar/modules.jsonc | 4 +- .config/waybar/style.css | 14 ++--- 22 files changed, 59 insertions(+), 135 deletions(-) delete mode 100644 .config/nvim/lua/boot.lua rename .config/nvim/lua/{plugins => disabled}/autopairs.lua (100%) rename .config/nvim/lua/{plugins => disabled}/lsp.lua (100%) rename .config/nvim/lua/{plugins => disabled}/mini-complete.lua (100%) rename .config/nvim/lua/{plugins => disabled}/mini-surround.lua (100%) rename .config/nvim/lua/{plugins => disabled}/multicursor.lua (100%) rename .config/nvim/lua/{plugins => disabled}/noice.lua (100%) rename .config/nvim/lua/{plugins => disabled}/notify.lua (100%) rename .config/nvim/lua/{plugins => disabled}/tree.lua (100%) rename .config/nvim/lua/{setup.lua => packages.lua} (68%) diff --git a/.config/hypr/typing.conf b/.config/hypr/typing.conf index 82fcbbb..1e521f1 100644 --- a/.config/hypr/typing.conf +++ b/.config/hypr/typing.conf @@ -8,6 +8,7 @@ bindle = $mod, Grave, exec, wtype ≈ bindle = $mod, T, exec, wtype ™ bindle = $mod, C, exec, wtype © bindle = $mod, R, exec, wtype ® +bindle = $mod, L, exec, wtype λ # German language bindle = $mod, A, exec, wtype ä @@ -19,8 +20,8 @@ bindle = $mod SHIFT, U, exec, wtype Ü bindle = $mod, S, exec, wtype ß # Emoji -bindle = $mod, W, exec, wtype 👋 -bindle = $mod, H, exec, wtype ❤️ -bindle = $mod, L, exec, wtype 👍 -bindle = $mod, P, exec, wtype 🙏 bindle = $mod, F, exec, wtype 🤣 +bindle = $mod, H, exec, wtype ❤️ +bindle = $mod, P, exec, wtype 🙏 +bindle = $mod, T, exec, wtype 👍 +bindle = $mod, W, exec, wtype 👋 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 72a5653..7fc9621 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,6 +1,5 @@ require("settings") -require("boot") -require("setup") +require("packages") require("keys") require("autocmds") -require("usercmds") +require("usercmds") \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8dff548..a2c6257 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,21 +1,11 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" }, - "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, - "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" }, - "mini.completion": { "branch": "main", "commit": "6cd80770afa5da1d2a529a2b4b1fb18756d7866c" }, - "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, + "gitsigns.nvim": { "branch": "main", "commit": "47c8e3e571376b24de62408fd0c9d12f0a9fc0a3" }, + "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, - "noice.nvim": { "branch": "main", "commit": "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, - "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, - "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-treesitter": { "branch": "master", "commit": "f7edd3f5f636dceebc874a59bdcf9de6a41dbc68" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, - "telescope.nvim": { "branch": "master", "commit": "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197" }, - "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" } + "telescope.nvim": { "branch": "master", "commit": "c392f1b78eaaf870ca584bd698e78076ed301b26" } } \ No newline at end of file diff --git a/.config/nvim/lua/autocmds.lua b/.config/nvim/lua/autocmds.lua index f19796b..f68a88a 100644 --- a/.config/nvim/lua/autocmds.lua +++ b/.config/nvim/lua/autocmds.lua @@ -56,17 +56,4 @@ on({ "VimEnter" }, { require("telescope.builtin").find_files() end end, -}) - --- on({ "VimEnter" }, { --- desc = "Open file explorer if there is enough horizontal space", --- group = group, --- callback = function() --- local files = require("nvim-tree.api") --- local width = vim.go.columns --- --- if width > 120 then --- files.tree.toggle({ focus = false }) --- end --- end, --- }) +}) \ No newline at end of file diff --git a/.config/nvim/lua/boot.lua b/.config/nvim/lua/boot.lua deleted file mode 100644 index e0218fd..0000000 --- a/.config/nvim/lua/boot.lua +++ /dev/null @@ -1,12 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - }) -end -vim.opt.rtp:prepend(lazypath) diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/disabled/autopairs.lua similarity index 100% rename from .config/nvim/lua/plugins/autopairs.lua rename to .config/nvim/lua/disabled/autopairs.lua diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/disabled/lsp.lua similarity index 100% rename from .config/nvim/lua/plugins/lsp.lua rename to .config/nvim/lua/disabled/lsp.lua diff --git a/.config/nvim/lua/plugins/mini-complete.lua b/.config/nvim/lua/disabled/mini-complete.lua similarity index 100% rename from .config/nvim/lua/plugins/mini-complete.lua rename to .config/nvim/lua/disabled/mini-complete.lua diff --git a/.config/nvim/lua/plugins/mini-surround.lua b/.config/nvim/lua/disabled/mini-surround.lua similarity index 100% rename from .config/nvim/lua/plugins/mini-surround.lua rename to .config/nvim/lua/disabled/mini-surround.lua diff --git a/.config/nvim/lua/plugins/multicursor.lua b/.config/nvim/lua/disabled/multicursor.lua similarity index 100% rename from .config/nvim/lua/plugins/multicursor.lua rename to .config/nvim/lua/disabled/multicursor.lua diff --git a/.config/nvim/lua/plugins/noice.lua b/.config/nvim/lua/disabled/noice.lua similarity index 100% rename from .config/nvim/lua/plugins/noice.lua rename to .config/nvim/lua/disabled/noice.lua diff --git a/.config/nvim/lua/plugins/notify.lua b/.config/nvim/lua/disabled/notify.lua similarity index 100% rename from .config/nvim/lua/plugins/notify.lua rename to .config/nvim/lua/disabled/notify.lua diff --git a/.config/nvim/lua/plugins/tree.lua b/.config/nvim/lua/disabled/tree.lua similarity index 100% rename from .config/nvim/lua/plugins/tree.lua rename to .config/nvim/lua/disabled/tree.lua diff --git a/.config/nvim/lua/keys.lua b/.config/nvim/lua/keys.lua index b4a1f48..faffc64 100644 --- a/.config/nvim/lua/keys.lua +++ b/.config/nvim/lua/keys.lua @@ -2,47 +2,25 @@ local function map(mode, lhs, rhs, info) vim.keymap.set(mode, lhs, rhs, { desc = info }) end --- Basics map("n", ";", ":", "Command mode") -map({ "i", "n" }, "", "noh", "Clear search") -map({"n", "v"}, "q", "qa!", "Quit all") - --- Buffer management -map("n", "", "enew", "New file") -map({ "i", "n", "s", "v" }, "", "w", "Save file") +map("n", "U", "redo", "Redo") +map("n", "", "ToggleWord", "Toggle word") map("n", "", "close", "Close window") - --- Copy and paste -map("v", "", "y") -map("n", "", '"+P') - --- Editing lines -map({ "n", "v" }, "", "^", "Beginning of line") -map("i", "", "^i", "Beginning of line") -map({ "i", "n", "v" }, "", "", "End of line") -map("n", "", "^Da", "Rewrite line") -map("i", "", "^Da", "Rewrite line") -map("v", "", "V", "Select line") -map("n", "", "i", "Split line") -map({"n", "v"}, "", "ggVG", "Select all") +map("n", "l", "Lazy", "Lazy") +map({"n", "v"}, "q", "qa!", "Quit all") +map({"n", "i"}, "", "noh", "Clear search") +map({"n", "i", "s", "v"}, "", "w", "Save file") -- Editing multiple instances +map("n", "", "*#:%s///g", "Replace word under cursor") +map("v", "", "y/\"N:%s//\"/g", "Replace selection") map("n", "", "#*", "Search word under cursor") map("v", "", "y/\"N", "Search selection") --- map("n", "", "viw", "Select word under cursor") --- map("v", "", "y/\"N", "Search selection") -map("n", "", "*#:%s///g", "Replace word under cursor") -map("v", "", "y/\"N:%s//\"/g", "Replace selection") --- Editing words -map("n", "", "ciw", "Rewrite word") -map("n", "", "ToggleWord", "Toggle word") - --- Indenting -map("n", "", "V>gv") -map("n", "", "V") -map("v", "", ">gv") -map("v", "", "", "^", "Beginning of line") +map("i", "", "^i", "Beginning of line") +map({"i", "n", "v"}, "", "", "End of line") -- Increasing and decreasing numbers map("n", "+", "", "Increase number") @@ -50,11 +28,11 @@ map("n", "-", "", "Decrease number") map("n", "", "", "Increase number") map("n", "", "", "Decrease number") --- Package manager -map("n", "l", "Lazy", "Lazy") - --- Redo -map("n", "U", "redo", "Redo") +-- Indenting +map("n", "", "V>gv") +map("n", "", "V") +map("v", "", ">gv") +map("v", "", "", "v") @@ -76,4 +54,4 @@ map("i", "", "v") map("n", "", "k", "Move to the window above") map("n", "", "j", "Move to the window below") map("n", "", "h", "Move to the window on the left") -map("n", "", "l", "Move to the window on the right") +map("n", "", "l", "Move to the window on the right") \ No newline at end of file diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/packages.lua similarity index 68% rename from .config/nvim/lua/setup.lua rename to .config/nvim/lua/packages.lua index ef6cda1..dc35abb 100644 --- a/.config/nvim/lua/setup.lua +++ b/.config/nvim/lua/packages.lua @@ -1,3 +1,20 @@ +-- Install the package manager if needed +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end + +vim.opt.rtp:prepend(lazypath) + +-- Load plugins require("lazy").setup("plugins", { defaults = { lazy = true, @@ -46,4 +63,4 @@ require("lazy").setup("plugins", { }, }, }, -}) +}) \ No newline at end of file diff --git a/.config/nvim/lua/plugins/flash.lua b/.config/nvim/lua/plugins/flash.lua index 2f69412..ea2d7d0 100644 --- a/.config/nvim/lua/plugins/flash.lua +++ b/.config/nvim/lua/plugins/flash.lua @@ -6,4 +6,4 @@ return { { "S", function() require("flash").treesitter() end, mode = { "n", "o", "x" }, desc = "Flash Treesitter" }, }, config = true, -} +} \ No newline at end of file diff --git a/.config/nvim/lua/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua index 746227e..419cbd8 100644 --- a/.config/nvim/lua/plugins/gitsigns.lua +++ b/.config/nvim/lua/plugins/gitsigns.lua @@ -2,4 +2,4 @@ return { "lewis6991/gitsigns.nvim", event = "BufReadPre", config = true, -} +} \ No newline at end of file diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 3a080cd..8f18a87 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,20 +1,14 @@ return { "nvim-telescope/telescope.nvim", - event = "VeryLazy", dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope-project.nvim", - -- "nvim-telescope/telescope-ui-select.nvim", }, keys = { {"", "Telescope buffers", desc = "Buffers"}, {"f", "Telescope find_files", desc = "Find files"}, - {"h", "Telescope help_tags", desc = "Help"}, {"p", "Telescope project", desc = "Projects"}, {"r", "Telescope oldfiles", desc = "Recent files"}, - {"w", "Telescope grep_string", desc = "Word"}, - {"ds", "Telescope lsp_document_symbols", desc = "Document symbols"}, - {"ws", "Telescope lsp_dynamic_workspace_symbols", desc = "Workspace symbols"}, }, config = function() require("telescope").setup({ @@ -36,14 +30,7 @@ return { sync_with_nvim_tree = true, theme = "dropdown", }, - -- ["ui-select"] = { - -- require("telescope.themes").get_dropdown(), - -- }, }, }) - - require("telescope").load_extension("project") - require("telescope").load_extension("notify") - -- require("telescope").load_extension("ui-select") end, } diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 3bf4ce1..78459c1 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -4,30 +4,10 @@ return { build = ":TSUpdate", opts = { ensure_installed = { - -- basics - "bash", - "json", - "markdown", - "markdown_inline", - "lua", - "regex", - "vim", - - -- go "go", "gomod", "gowork", "gosum", - - -- web dev - "html", - "css", - "javascript", - "typescript", - "svelte", - - -- game dev - "gdscript", }, highlight = { enable = true }, indent = { enable = true }, diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 2740f2e..1f769b7 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -10,6 +10,7 @@ end local opt = vim.opt opt.autowrite = false opt.clipboard = "unnamedplus" +opt.cmdheight = 0 opt.completeopt = "menu,menuone,noinsert" opt.conceallevel = 0 opt.cursorline = true @@ -50,4 +51,4 @@ opt.statusline = "%{repeat('─',winwidth('.'))}" -- Undo opt.undofile = true -opt.undolevels = 10000 +opt.undolevels = 10000 \ No newline at end of file diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc index 8500ee0..2997106 100644 --- a/.config/waybar/modules.jsonc +++ b/.config/waybar/modules.jsonc @@ -3,7 +3,7 @@ "interval": 60, "format": " {:%H : %M}", "tooltip-format": "{:%A, %Y-%m-%d}", - "on-click": "gnome-clocks", + "on-click": "$TERMINAL -e peaclock", "on-click-right": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy", }, "cpu": { @@ -73,7 +73,7 @@ "scroll-step": 5, "format-icons": ["", "", ""], "max-length": 10, - "on-click": "helvum", + "on-click": "easyeffects", }, "hyprland/window": { "format": "󰘔 {initialTitle}", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index cda4407..e27732c 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -3,7 +3,7 @@ * { border: none; font-family: "Ubuntu Nerd Font"; - font-size: 13px; + font-size: 14px; padding: 0; margin: 0; } @@ -11,10 +11,7 @@ /* ===== Waybar ===== */ #waybar { - background: rgba(32, 32, 32, 0.8); - /* background: transparent; */ - /* background: rgba(54, 137, 230, 0.8); */ - /* border-top: 1px solid rgba(54, 137, 230, 0.8); */ + background: rgb(38, 41, 44); } #waybar.hidden { @@ -44,7 +41,7 @@ #custom-updates { color: rgba(255, 255, 255, 0.8); padding: 4px 8px; - margin: 2px; + margin: 4px; margin-right: 0; border-radius: 3px; } @@ -52,7 +49,6 @@ #custom-os { font-size: 150%; color: rgb(137, 220, 235); - /* background: transparent; */ } #custom-updates.disabled { @@ -76,11 +72,11 @@ background: transparent; text-shadow: none; border-radius: 0; - opacity: 0.1; + opacity: 0.2; } #workspaces button.empty { - opacity: 0.1; + opacity: 0.2; } #workspaces button.active {