From 58a4cd397ed2487f2528707af815051a2d8d47f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Mon, 4 Dec 2023 16:39:27 +0100 Subject: [PATCH 01/10] Remap alt and super --- hypr/hyprland.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index e042622..39a09b6 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -6,6 +6,7 @@ monitor=DP-1,preferred,1920x0,1,bitdepth,10 monitor=HDMI-A-1,preferred,5760x550,1 exec-once=wl-paste --type text --watch cliphist store exec-once=wl-paste --type image --watch cliphist store +exec-once=sleep 2 && hyprctl dispatch workspace 11 workspace=DP-1,11 workspace=DP-2,21 @@ -55,7 +56,7 @@ binds { input { kb_layout = us follow_mouse = 1 - kb_options = compose:rctrl, caps:super + kb_options = compose:rctrl, caps:super, altwin:swap_alt_win numlock_by_default = true } @@ -115,6 +116,7 @@ $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bindr = $mainMod, SUPER_L, exec, /home/user/.config/scripts/toggle_rofi.sh +bindr = $mainMod, SUPER_R, exec, /home/user/.config/scripts/toggle_rofi.sh bind = $mainMod, return, exec, /home/user/.config/scripts/launch_alacritty.sh $(hyprctl activewindow -j | jq .pid) bind = $mainMod SHIFT, return, exec, alacritty bind = $mainMod, Q, killactive, From f1458b718284107926540618b0275f5a9acfcdd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 5 Dec 2023 15:02:32 +0100 Subject: [PATCH 02/10] Add rules for steam and screenshots --- hypr/hyprland.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 39a09b6..f6d23ee 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -45,6 +45,8 @@ workspace=29,monitor:DP-2 windowrule = float,title:^(rofi)(.*)$ windowrule = center,title:^(rofi)(.*)$ windowrule = noborder,title:^(rofi)(.*)$ +windowrulev2 = stayfocused, title:^()$,class:^(steam)$ +windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ windowrule = noanim,waybar exec-once=waybar @@ -145,6 +147,7 @@ bind = ,XF86AudioPrev, exec, playerctl previous bind = $mainMod,XF86AudioMute, exec, playerctl play-pause bind = $mainMod,XF86AudioRaiseVolume, exec, playerctl next bind = $mainMod,XF86AudioLowerVolume, exec, playerctl previous +bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy # Move focus with mainMod + arrow keys bind = $mainMod, H, movefocus, l @@ -187,7 +190,6 @@ bind = $mainMod SHIFT, 9, exec, hyprsome movefocus 9 bind = $mainMod SHIFT, T, exec, hyprsome move-empty bind = $mainMod, T, exec, hyprsome focus-empty - # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, TAB, workspace, m+1 bind = $mainMod SHIFT, TAB, workspace, m-1 From f4b102cd359c2d07d971f3e54cd63ef4b24dad2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 5 Dec 2023 15:03:14 +0100 Subject: [PATCH 03/10] Fix rofi for wayland --- rofi/material-ocean.rasi | 3 +-- rofi/rofi-ykman.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rofi/material-ocean.rasi b/rofi/material-ocean.rasi index ced3b03..b285966 100644 --- a/rofi/material-ocean.rasi +++ b/rofi/material-ocean.rasi @@ -16,7 +16,6 @@ window { background-color: @background; text-color: @foreground; width: 800px; - y-offset: -25%; border-radius: 5px; } @@ -63,7 +62,7 @@ listview { cycle: true; dynamic: true; layout: vertical; - fixed-height:false; + fixed-height:true; lines: 5; } diff --git a/rofi/rofi-ykman.sh b/rofi/rofi-ykman.sh index 6a6b78c..b53072e 100755 --- a/rofi/rofi-ykman.sh +++ b/rofi/rofi-ykman.sh @@ -57,7 +57,7 @@ main() { IFS=', ' read -r -a code <<< "$code" case $command in - clipboard) echo -n "${code[-1]}" | clipboard;; + clipboard) echo -n "${code[-1]}" | wl-copy;; type) echo -n "${code[-1]}" | type;; esac } From eafe416805551bd8bb827ebf594848992199b383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 5 Dec 2023 18:19:50 +0100 Subject: [PATCH 04/10] Add vim-hypr-nav --- hypr/hyprland.conf | 23 ++++++++------- nvim/lazy-lock.json | 2 +- nvim/lua/plugins.lua | 2 +- scripts/vim-hypr-nav.sh | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 12 deletions(-) create mode 100755 scripts/vim-hypr-nav.sh diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index f6d23ee..07de4b0 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,6 +1,9 @@ -exec-once=hyprpaper env = WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1 env = WLR_NO_HARDWARE_CURSORS,1 + +$scripts = /home/user/.config/scripts + +exec-once=hyprpaper monitor=DP-2,preferred,0x550,1 monitor=DP-1,preferred,1920x0,1,bitdepth,10 monitor=HDMI-A-1,preferred,5760x550,1 @@ -117,9 +120,9 @@ gestures { $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bindr = $mainMod, SUPER_L, exec, /home/user/.config/scripts/toggle_rofi.sh -bindr = $mainMod, SUPER_R, exec, /home/user/.config/scripts/toggle_rofi.sh -bind = $mainMod, return, exec, /home/user/.config/scripts/launch_alacritty.sh $(hyprctl activewindow -j | jq .pid) +bindr = $mainMod, SUPER_L, exec, $scripts/toggle_rofi.sh +bindr = $mainMod, SUPER_R, exec, $scripts/toggle_rofi.sh +bind = $mainMod, return, exec, $scripts/launch_alacritty.sh $(hyprctl activewindow -j | jq .pid) bind = $mainMod SHIFT, return, exec, alacritty bind = $mainMod, Q, killactive, bind = $mainMod, A, exec, nautilus @@ -132,9 +135,9 @@ bind = CONTROL_L ALT_L, L, exec, swaylock bind = $mainMod, C, exec, cliphist list | awk '{print $0, "\0icon\x1fcom.github.davidmhewitt.clipped"}' | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy bind = $mainMod, Y, exec, /home/user/.config/rofi/rofi-ykman.sh bind = Super_L Control_L, Q, exec, systemctl suspend -bind = $mainMod, Escape, exec, rofi -show power-menu -modi power-menu:/home/user/.config/scripts/rofi-power-menu +bind = $mainMod, Escape, exec, rofi -show power-menu -modi power-menu:$scripts/rofi-power-menu -bind = ,XF86PowerOff, exec, rofi -show power-menu -modi power-menu:/home/user/.config/scripts/rofi-power-menu +bind = ,XF86PowerOff, exec, rofi -show power-menu -modi power-menu:$scripts/rofi-power-menu bind = ,XF86MonBrightnessUp, exec, xbacklight -inc 10 bind = ,XF86MonBrightnessDown, exec, xbacklight -dec 10 bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0 @@ -150,10 +153,10 @@ bind = $mainMod,XF86AudioLowerVolume, exec, playerctl previous bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy # Move focus with mainMod + arrow keys -bind = $mainMod, H, movefocus, l -bind = $mainMod, L, movefocus, r -bind = $mainMod, K, movefocus, u -bind = $mainMod, J, movefocus, d +bind = $mainMod, H, exec, $scripts/vim-hypr-nav.sh l +bind = $mainMod, L, exec, $scripts/vim-hypr-nav.sh r +bind = $mainMod, K, exec, $scripts/vim-hypr-nav.sh u +bind = $mainMod, J, exec, $scripts/vim-hypr-nav.sh d bind = $mainMod CONTROL_L, H, swapwindow, l bind = $mainMod CONTROL_L, L, swapwindow, r bind = $mainMod CONTROL_L, K, swapwindow, u diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index cbd24bb..c2b9387 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "awesomewm-vim-tmux-navigator": { "branch": "master", "commit": "b56319dc9378564d2e1d2123751d6b4a893abfc2" }, "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -31,6 +30,7 @@ "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" }, + "vim-hypr-nav": { "branch": "main", "commit": "6ab4865a7eb5aad35305298815a4563c9d48556a" }, "vim-rooter": { "branch": "master", "commit": "1353fa47ee3a81083c284e28ff4f7d92655d7c9e" }, "vim-snippets": { "branch": "master", "commit": "b039190177d97a968d80518470910aae7faf182a" }, "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index b31154d..63f6d59 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -15,8 +15,8 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup({ 'ConradIrwin/vim-bracketed-paste', 'airblade/vim-rooter', + 'nuchs/vim-hypr-nav', 'debugloop/telescope-undo.nvim', - 'intrntbrn/awesomewm-vim-tmux-navigator', 'mhartington/formatter.nvim', {'vimwiki/vimwiki', init = function () vim.g.vimwiki_list = {{path = '~/Workspace/DnD/Lumentis Campaign Setting/', syntax = 'markdown', ext = '.md'}} diff --git a/scripts/vim-hypr-nav.sh b/scripts/vim-hypr-nav.sh new file mode 100755 index 0000000..1eca3b0 --- /dev/null +++ b/scripts/vim-hypr-nav.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# +# vim-hypr-nav - Use the same bindings to move focus between hyprland windows +# and vim splits. Requires the accompanying vim plugin and jq. + +dir="$1" + +case "$dir" in + u) ;; + r) ;; + d) ;; + l) ;; + *) + echo "USAGE: $0 u|r|d|l" + exit 1 +esac + +get_descendant_vim_pid() { + pid="$1" + terms="$2" + + if grep -iqE '^g?(view|n?vim?x?)(diff)?$' "/proc/$pid/comm"; then + if embed_pid="$(pgrep --parent "$pid" --full 'nvim --embed')"; then + echo "$embed_pid" + else + echo "$pid" + fi + + return 0 + fi + + for child in $(pgrep --runstates D,I,R,S --terminal "$terms" --parent "$pid"); do + if get_descendant_vim_pid "$child" "$terms"; then + # already echo'd PID in recursive call + return 0 + fi + done + + return 1 +} + +if focused_pid="$(hyprctl activewindow -j | jq -e '.pid')"; then + terms="$(find /dev/pts -type c -not -name ptmx | sed s#^/dev/## | tr '\n' ,)" + if vim_pid="$(get_descendant_vim_pid "$focused_pid" "$terms")"; then + servername_file="${XDG_RUNTIME_DIR:-/tmp}/vim-hypr-nav.$vim_pid.servername" + read -r program servername <"$servername_file" + + if [ "$program" = vim ]; then + serverarg=--servername + elif [ "$program" = nvim ]; then + serverarg=--server + fi + + if [ -n "$serverarg" ] && [ -n "$servername" ]; then + "$program" "$serverarg" "$servername" \ + --remote-expr "VimHyprNav('$dir')" >/dev/null 2>&1 \ + && exit 0 + fi + fi +fi + +hyprctl dispatch movefocus "$dir" From 0df578a98766078d919b1deaca8e34d42ea6f930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 20:35:14 +0100 Subject: [PATCH 05/10] Use Adwaita GTK theme --- hypr/hyprland.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 07de4b0..4b2d42f 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,5 +1,6 @@ env = WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1 env = WLR_NO_HARDWARE_CURSORS,1 +env = GTK_THEME, Adwaita $scripts = /home/user/.config/scripts From c783887d3c936081f2cd11719b18723761f2e848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 20:35:27 +0100 Subject: [PATCH 06/10] Add HyprLand Treesitter config --- nvim/lua/plugins.lua | 1 + nvim/lua/treesitter_config.lua | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 63f6d59..d9949c3 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -16,6 +16,7 @@ require('lazy').setup({ 'ConradIrwin/vim-bracketed-paste', 'airblade/vim-rooter', 'nuchs/vim-hypr-nav', + 'luckasRanarison/tree-sitter-hypr', 'debugloop/telescope-undo.nvim', 'mhartington/formatter.nvim', {'vimwiki/vimwiki', init = function () diff --git a/nvim/lua/treesitter_config.lua b/nvim/lua/treesitter_config.lua index 99adf10..8802894 100644 --- a/nvim/lua/treesitter_config.lua +++ b/nvim/lua/treesitter_config.lua @@ -24,3 +24,13 @@ treesitter.setup({ }, additional_vim_regex_highlighting = false, }) + +local parser_config = require("nvim-treesitter.parsers").get_parser_configs() +parser_config.hypr = { + install_info = { + url = "https://github.com/luckasRanarison/tree-sitter-hypr", + files = { "src/parser.c" }, + branch = "master", + }, + filetype = "hypr", +} From f5ed9606b66096a183fff0d36b5948ff07084126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 20:36:17 +0100 Subject: [PATCH 07/10] Update lazy lock --- nvim/lazy-lock.json | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c2b9387..703d292 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,38 +1,39 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, + "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" }, - "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" }, + "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, - "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, - "neogit": { "branch": "master", "commit": "29583c2bd0c4b552fbb16e93bf4f26febbe4a3c2" }, + "lush.nvim": { "branch": "main", "commit": "f76741886b356586f9dfe8e312fbd1ab0fd1084f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, + "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neogit": { "branch": "master", "commit": "d0ed65ec632f8ed0f85e6af061e3c12392f5a835" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, - "nvim-lspconfig": { "branch": "master", "commit": "37457f268af5cd6765e589b0dcd7cbd192d8da00" }, - "nvim-snippy": { "branch": "master", "commit": "c3e289ee651957c44d5f62b1daa92bc1ac80ebf4" }, + "nvim-lspconfig": { "branch": "master", "commit": "6c797ff9324094e333e2ace9526ca4a62ad9d1ca" }, + "nvim-snippy": { "branch": "master", "commit": "7c8f18e90cad4f56c4e22a49101668735639f286" }, "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" }, - "nvim-treesitter": { "branch": "master", "commit": "9a746b4b6a1ef215943f07e6aa2ec35fb14097d4" }, - "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, - "oil.nvim": { "branch": "master", "commit": "6175bd646272335c8db93264760760d8f2a611d5" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-treesitter": { "branch": "master", "commit": "f861bc6148e7bc715f6a09bd34bb1f577b62a248" }, + "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "oil.nvim": { "branch": "master", "commit": "b3c24f4b3b2d38483241292a330cd6eb00734dac" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, + "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, + "tree-sitter-hypr": { "branch": "master", "commit": "da3c1d780c8e04446722ece04beadb6a44eb442d" }, "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" }, "vim-hypr-nav": { "branch": "main", "commit": "6ab4865a7eb5aad35305298815a4563c9d48556a" }, "vim-rooter": { "branch": "master", "commit": "1353fa47ee3a81083c284e28ff4f7d92655d7c9e" }, - "vim-snippets": { "branch": "master", "commit": "b039190177d97a968d80518470910aae7faf182a" }, - "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, + "vim-snippets": { "branch": "master", "commit": "ec4ff7e9c9b274e93295924e59c82b4f51e2ae42" }, + "vimtex": { "branch": "master", "commit": "8dad59abe76c7a9ad3485d3015b8101b2e737892" }, "vimwiki": { "branch": "dev", "commit": "0bb1b4945bb205a076a35b66174e5d66be8eaafe" } } \ No newline at end of file From 67f8d82cbef8320f3a242284d13c5461be2c4dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 20:37:56 +0100 Subject: [PATCH 08/10] update dictionary --- nvim/spell/ltex.dictionary.en-GB.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/spell/ltex.dictionary.en-GB.txt b/nvim/spell/ltex.dictionary.en-GB.txt index f2613f1..37178c5 100644 --- a/nvim/spell/ltex.dictionary.en-GB.txt +++ b/nvim/spell/ltex.dictionary.en-GB.txt @@ -1,3 +1,4 @@ logits logits OpenSwarm +Lumentis From 8e009f91c1fc494d62665d11b00554138b61fd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 21:49:49 +0100 Subject: [PATCH 09/10] Temporarily fix neogit to working version --- nvim/lazy-lock.json | 2 +- nvim/lua/plugins.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 703d292..f3339f8 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "lush.nvim": { "branch": "main", "commit": "f76741886b356586f9dfe8e312fbd1ab0fd1084f" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "neogit": { "branch": "master", "commit": "d0ed65ec632f8ed0f85e6af061e3c12392f5a835" }, + "neogit": { "branch": "master", "commit": "ec9aa050790301d92ae1f588652f8577bdd31082" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-lspconfig": { "branch": "master", "commit": "6c797ff9324094e333e2ace9526ca4a62ad9d1ca" }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index d9949c3..6e131fe 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -45,7 +45,7 @@ require('lazy').setup({ }, dependencies = { "nvim-tree/nvim-web-devicons" }, lazy = true}, {'windwp/nvim-autopairs', event = "InsertEnter", opts = {}}, {"folke/flash.nvim", event = "VeryLazy", opts = {highlight = {backdrop=false}, modes = {char = {highlight = {backdrop = false}}, search = {enabled = false}}, prompt = {enabled = false}}, keys = {{"s", mode = {"n","x","o"}, function() require("flash").jump() end}}}, - {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true}, + {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true, commit = "ec9aa050790301d92ae1f588652f8577bdd31082"}, {'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons'}, {'cappyzawa/trim.nvim', config = function () require("trim").setup({ ft_blocklist= {"markdown", "vimwiki"}, patterns = { [[%s/\s\+$//e]], [[%s/\($\n\s*\)\+\%$//]], [[%s/\%^\n\+//]], }, }) end}, {'folke/trouble.nvim', dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () require('trouble').setup() end, lazy = true}, From 9ac8555df191b58039609b6be47c90abe2ca4fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 7 Dec 2023 22:24:13 +0100 Subject: [PATCH 10/10] Start all windows in tiled mode --- hypr/hyprland.conf | 3 +++ waybar/config | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 4b2d42f..f5c388d 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -52,6 +52,8 @@ windowrule = noborder,title:^(rofi)(.*)$ windowrulev2 = stayfocused, title:^()$,class:^(steam)$ windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ windowrule = noanim,waybar +windowrulev2 = stayfocused, title:^()$,class:^(steam)$ +windowrulev2 = tile, class:.* exec-once=waybar @@ -143,6 +145,7 @@ bind = ,XF86MonBrightnessUp, exec, xbacklight -inc 10 bind = ,XF86MonBrightnessDown, exec, xbacklight -dec 10 bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0 bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%- +bind = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle bind = ,mouse_right, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0 bind = ,mouse_left, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%- bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle diff --git a/waybar/config b/waybar/config index c2982d3..9a108fc 100644 --- a/waybar/config +++ b/waybar/config @@ -67,10 +67,9 @@ "critical": 15 }, "format": "{icon}", + "tooltip-format": "{capacity}% ({time})", "format-plugged": "{capacity}% ", "format-alt": "{capacity}% {time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", "format-icons": [" ", " ", " ", " ", " "] }, }