From e2e8834d8c75a6630fa44d1796edf4e1e0ba8b77 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 9 Mar 2024 22:03:35 +0100 Subject: [PATCH] Updated config --- .config/fish/alias.fish | 4 + .config/hypr/autostart.conf | 1 + .config/hypr/general.conf | 4 + .config/hypr/keys.conf | 93 +++++++++++----------- .config/hypr/programs.conf | 6 +- .config/nvim/lazy-lock.json | 13 +-- .config/nvim/lua/disabled/multi-cursor.lua | 14 ---- .config/nvim/lua/keys.lua | 16 ++-- .config/nvim/lua/plugins/autopairs.lua | 2 +- .config/nvim/lua/plugins/multicursor.lua | 14 ++++ .config/nvim/lua/plugins/notify.lua | 2 + .config/vscode/settings.json | 2 + .config/waybar/config.jsonc | 1 + .config/waybar/style.css | 8 +- 14 files changed, 99 insertions(+), 81 deletions(-) delete mode 100644 .config/nvim/lua/disabled/multi-cursor.lua create mode 100644 .config/nvim/lua/plugins/multicursor.lua diff --git a/.config/fish/alias.fish b/.config/fish/alias.fish index 74507c2..495088c 100644 --- a/.config/fish/alias.fish +++ b/.config/fish/alias.fish @@ -21,6 +21,10 @@ alias l2 "ls -T -L2" alias lu "ls -l --total-size --sort=size --reverse --no-permissions --no-user --no-time" alias lp "ls -l --no-filesize --no-time" +# Lsof +alias tcp "lsof -PniTCP" +alias udp "lsof -PniUDP" + # Neovim alias e "nvim" alias n "nvim" diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf index 5dcc83f..441beee 100644 --- a/.config/hypr/autostart.conf +++ b/.config/hypr/autostart.conf @@ -1,3 +1,4 @@ exec-once = dunst exec-once = waypaper --restore exec-once = wl-paste --watch cliphist store +exec-once = [workspace special:magic silent;float;size 960 540;center] $terminal diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index a6bd71c..8659fe8 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -29,6 +29,10 @@ input { accel_profile = flat } +debug { + overlay = false +} + decoration { rounding = 6 diff --git a/.config/hypr/keys.conf b/.config/hypr/keys.conf index 546f7ff..b3c24fe 100644 --- a/.config/hypr/keys.conf +++ b/.config/hypr/keys.conf @@ -1,31 +1,32 @@ -$leader = SUPER -$movews = CTRL ALT +$main = SUPER # Apps -bind = $leader, T, exec, $terminal -bind = $leader, B, exec, $browser -bind = $leader, E, exec, $files -bind = $leader, D, exec, $terminal -e $editor -bind = $leader, L, exec, $lockscreen -bind = $leader, Space, exec, $menu +bind = $main, B, exec, $browser +bind = $main, D, exec, $editor +bind = $main, E, exec, $files +bind = $main, L, exec, $lockscreen +bind = $main, T, exec, $terminal +bind = $main, M, exec, pkill $statusbar || $statusbar +bind = $main, Space, exec, $menu +bind = $main SHIFT, T, exec, [float;size 960 540;center] $terminal bind = , Print, exec, $screenshot -# Session management -bind = $leader, Backspace, exit, -bind = $leader, F12, exec, $logout - # Window management -bind = $leader, C, killactive, -bind = $leader, F, fullscreen, -bind = $leader, V, togglefloating, -bind = $leader, P, pseudo, -bind = $leader, J, togglesplit, +bind = $main, C, killactive, +bind = $main, F, fullscreen, +bind = $main, V, togglefloating, +bind = $main, P, pseudo, +bind = $main, J, togglesplit, -# Move focus with leader + arrow keys -bind = $leader, left, movefocus, l -bind = $leader, right, movefocus, r -bind = $leader, up, movefocus, u -bind = $leader, down, movefocus, d +# Session management +bind = $main, Backspace, exit, +bind = $main, F12, exec, $logout + +# Window focus +bind = $main, left, movefocus, l +bind = $main, right, movefocus, r +bind = $main, up, movefocus, u +bind = $main, down, movefocus, d # Switch workspaces with numpad bind =, KP_Home, workspace, 1 @@ -38,35 +39,35 @@ bind =, KP_End, workspace, 7 bind =, KP_Down, workspace, 8 bind =, KP_Next, workspace, 9 -# Move active window to an adjacent workspace -bind = $movews, right, movetoworkspace, +1 -bind = $movews, left, movetoworkspace, -1 +# Move window to a specific workspace +bind = $main, 1, movetoworkspace, 1 +bind = $main, 2, movetoworkspace, 2 +bind = $main, 3, movetoworkspace, 3 +bind = $main, 4, movetoworkspace, 4 +bind = $main, 5, movetoworkspace, 5 +bind = $main, 6, movetoworkspace, 6 +bind = $main, 7, movetoworkspace, 7 +bind = $main, 8, movetoworkspace, 8 +bind = $main, 9, movetoworkspace, 9 -# Move active window to a specific workspace -bind = $movews, 1, movetoworkspace, 1 -bind = $movews, 2, movetoworkspace, 2 -bind = $movews, 3, movetoworkspace, 3 -bind = $movews, 4, movetoworkspace, 4 -bind = $movews, 5, movetoworkspace, 5 -bind = $movews, 6, movetoworkspace, 6 -bind = $movews, 7, movetoworkspace, 7 -bind = $movews, 8, movetoworkspace, 8 -bind = $movews, 9, movetoworkspace, 9 +# Move window to an adjacent workspace +bind = $main ALT, right, movetoworkspace, +1 +bind = $main ALT, left, movetoworkspace, -1 -# Example special workspace (scratchpad) -bind = $leader, S, togglespecialworkspace, magic -bind = $leader SHIFT, S, movetoworkspace, special:magic +# Special workspace (scratchpad) +bind = $main, Z, togglespecialworkspace, magic +bind = $main SHIFT, Z, movetoworkspace, special:magic -# Move/resize windows with leader + LMB/RMB and dragging -bindm = $leader, mouse:272, movewindow -bindm = $leader, mouse:273, resizewindow +# Move and resize windows (main + LMB/RMB and drag) +bindm = $main, mouse:272, movewindow +bindm = $main, mouse:273, resizewindow + +# Media player control +bindl =, XF86AudioPlay, exec, playerctl play-pause +bindl =, XF86AudioNext, exec, playerctl next +bindl =, XF86AudioPrev, exec, playerctl previous # Volume control bindle =, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+ bindle =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05- bindl =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle - -# Media keys -bindl =, XF86AudioPlay, exec, playerctl play-pause -bindl =, XF86AudioNext, exec, playerctl next -bindl =, XF86AudioPrev, exec, playerctl previous diff --git a/.config/hypr/programs.conf b/.config/hypr/programs.conf index b1099d2..d69b469 100644 --- a/.config/hypr/programs.conf +++ b/.config/hypr/programs.conf @@ -1,10 +1,10 @@ $browser = firefox -$editor = nvim -$email = geary +$email = evolution $files = nautilus $logout = wlogout $lockscreen = swaylock $menu = pkill fuzzel || fuzzel $screenshot = IMG=~/pictures/screenshots/$(date +%Y-%m-%d_%H-%M-%S).png && grim -g "$(slurp -d)" $IMG && wl-copy < $IMG -$statusbar = ~/.bin/launch-waybar +$statusbar = waybar $terminal = alacritty +$editor = $terminal -e nvim diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 6fe65fe..983f1d9 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -2,19 +2,20 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "mini.completion": { "branch": "main", "commit": "0cf6c4e257b5e8189ac6b3ffa2064a319c4eb8a8" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, - "nvim-lspconfig": { "branch": "master", "commit": "e5e600232188ed9fb960f5df6bb06084ae8bf3ec" }, + "nvim-lspconfig": { "branch": "master", "commit": "16295b79410f131c4fa7870c663b4ace6a761fb2" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, - "nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" }, - "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, + "nvim-tree.lua": { "branch": "master", "commit": "041dbd18f440207ad161503a384e7c82d575db66" }, + "nvim-treesitter": { "branch": "master", "commit": "7ff51f53b0efb6228df2e8539b51bb2e737b77f3" }, + "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, - "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" } + "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, + "vim-visual-multi": { "branch": "master", "commit": "fe1ec7e430013b83c8c2dee85ae496251b71e253" } } \ No newline at end of file diff --git a/.config/nvim/lua/disabled/multi-cursor.lua b/.config/nvim/lua/disabled/multi-cursor.lua deleted file mode 100644 index 71016ca..0000000 --- a/.config/nvim/lua/disabled/multi-cursor.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "brenton-leighton/multiple-cursors.nvim", - event = "VeryLazy", - keys = { - {"", "MultipleCursorsAddDown", mode = {"n", "i"}}, - {"", "MultipleCursorsAddDown"}, - {"", "MultipleCursorsAddUp", mode = {"n", "i"}}, - {"", "MultipleCursorsAddUp"}, - {"", "MultipleCursorsMouseAddDelete", mode = {"n", "i"}}, - {"a", "MultipleCursorsAddBySearch", mode = {"n", "x"}}, - {"A", "MultipleCursorsAddBySearchV", mode = {"n", "x"}}, - }, - config = true, -} diff --git a/.config/nvim/lua/keys.lua b/.config/nvim/lua/keys.lua index a0ef0d2..b4a1f48 100644 --- a/.config/nvim/lua/keys.lua +++ b/.config/nvim/lua/keys.lua @@ -8,9 +8,9 @@ map({ "i", "n" }, "", "noh", "Clear search") map({"n", "v"}, "q", "qa!", "Quit all") -- Buffer management -map("n", "", "enew", "New file") +map("n", "", "enew", "New file") map({ "i", "n", "s", "v" }, "", "w", "Save file") -map("n", "", "bd", "Delete buffer") +map("n", "", "close", "Close window") -- Copy and paste map("v", "", "y") @@ -27,10 +27,10 @@ map("n", "", "i", "Split line") map({"n", "v"}, "", "ggVG", "Select all") -- Editing multiple instances -map("n", "", "*#", "Search word under cursor") +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", "", "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") @@ -71,3 +71,9 @@ map("i", "", "v") map("i", "", "v") map("i", "", "v") map("i", "", "v") + +-- Window switching +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") diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua index 21a5161..8a37d4a 100644 --- a/.config/nvim/lua/plugins/autopairs.lua +++ b/.config/nvim/lua/plugins/autopairs.lua @@ -1,5 +1,5 @@ return { "windwp/nvim-autopairs", event = "InsertEnter", - config = true + config = true, } diff --git a/.config/nvim/lua/plugins/multicursor.lua b/.config/nvim/lua/plugins/multicursor.lua new file mode 100644 index 0000000..e168951 --- /dev/null +++ b/.config/nvim/lua/plugins/multicursor.lua @@ -0,0 +1,14 @@ +return { + "mg979/vim-visual-multi", + keys = { + { "", mode = { "n", "x" }, desc = "Multicursor (word)" }, + { "", mode = { "n", "x" }, desc = "Multicursor (next line)" }, + { "", mode = { "n", "x" }, desc = "Multicursor (previous line)" }, + }, + init = function() + vim.g.VM_maps = { + ["Find Under"] = "", + ["Find Subword Under"] = "", + } + end, +} diff --git a/.config/nvim/lua/plugins/notify.lua b/.config/nvim/lua/plugins/notify.lua index d80c307..27ffe6a 100644 --- a/.config/nvim/lua/plugins/notify.lua +++ b/.config/nvim/lua/plugins/notify.lua @@ -3,6 +3,8 @@ return { event = "VeryLazy", opts = { background_colour = "#000000", + fps = 60, + render = "compact", timeout = 0, }, config = true, diff --git a/.config/vscode/settings.json b/.config/vscode/settings.json index 4287ffb..b6acb52 100644 --- a/.config/vscode/settings.json +++ b/.config/vscode/settings.json @@ -14,6 +14,7 @@ "editor.scrollbar.verticalScrollbarSize": 0, "editor.scrollBeyondLastLine": false, "editor.showFoldingControls": "never", + "editor.stickyScroll.enabled": false, "explorer.compactFolders": false, "explorer.confirmDelete": false, "explorer.openEditors.visible": 1, @@ -44,4 +45,5 @@ "workbench.layoutControl.enabled": false, "workbench.startupEditor": "none", "workbench.statusBar.visible": false, + "workbench.tree.enableStickyScroll": false, } diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 2e1ef24..9b76cbd 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -6,6 +6,7 @@ ], "modules-center": [], "modules-right": [ + "group/hardware", "custom/updates", "wireplumber", "clock", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 296ab89..7d31b36 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -42,7 +42,7 @@ margin: 4px; } -#cpu { +/*#cpu { background: rgb(50.15%, 92.07%, 99.48%); } @@ -60,11 +60,7 @@ #network { background: rgb(92.54%, 81.78%, 100%); -} - -#wireplumber { - /* background: rgb(90.34%, 85.77%, 59.65%); */ -} +}*/ #custom-updates.disabled { opacity: 0;