diff --git a/environment.d/envvars.conf b/environment.d/envvars.conf index 740b5ce..1c04120 100644 --- a/environment.d/envvars.conf +++ b/environment.d/envvars.conf @@ -1,13 +1,3 @@ -GTK_CSD=0 -QT_QPA_PLATFORM=wayland -QT_QPA_PLATFORMTHEME=qt5ct -QT_WAYLAND_FORCE_DPI=96 -QT_AUTO_SCREEN_SCALE_FACTOR=0 -QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -QT_SCALE_FACTOR=1 -XCURSOR_SIZE=24 -WAYLAND_DISPLAY=wayland-1 -XDG_CURRENT_DESKTOP=wlr GPG_TTY=$(tty) PATH=$PATH:$HOME/.local/bin TEXMFHOME=$HOME/.texmf diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index b6ff8b2..1aa5d77 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -40,13 +40,15 @@ https://github.com/GradienceTeam/Gradience @define-color shade_color rgba(0, 0, 0, 0.36); @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); @define-color secondary_sidebar_backdrop_color #1a1b26; -@define-color secondary_sidebar_shade_color #000000; +@define-color secondary_sidebar_shade_color rgba(0,0,0,0.5); @define-color sidebar_backdrop_color #1a1b26; -@define-color sidebar_shade_color #000000; -@define-color secondary_sidebar_bg_color #1a1b26; -@define-color secondary_sidebar_fg_color #c0caf5; +@define-color sidebar_shade_color rgba(0,0,0,0.5); @define-color sidebar_bg_color #1a1b26; @define-color sidebar_fg_color #c0caf5; +@define-color secondary_sidebar_bg_color #1a1b26; +@define-color secondary_sidebar_fg_color #c0caf5; +@define-color thumbnail_bg_color #1a1b26; +@define-color thumbnail_fg_color #c0caf5; @define-color blue_1 #99c1f1; @define-color blue_2 #62a0ea; @define-color blue_3 #3584e4; diff --git a/gtk-3.0/gtk.css.bak b/gtk-3.0/gtk.css.bak index 47eb8d1..1f6ab50 100644 --- a/gtk-3.0/gtk.css.bak +++ b/gtk-3.0/gtk.css.bak @@ -40,11 +40,15 @@ https://github.com/GradienceTeam/Gradience @define-color shade_color rgba(0, 0, 0, 0.36); @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); @define-color secondary_sidebar_backdrop_color #1a1b26; -@define-color secondary_sidebar_shade_color #000000; +@define-color secondary_sidebar_shade_color #c0caf5; @define-color sidebar_backdrop_color #1a1b26; @define-color sidebar_shade_color #c0caf5; +@define-color sidebar_bg_color #1a1b26; +@define-color sidebar_fg_color #c0caf5; @define-color secondary_sidebar_bg_color #1a1b26; @define-color secondary_sidebar_fg_color #c0caf5; +@define-color thumbnail_bg_color #1a1b26; +@define-color thumbnail_fg_color #c0caf5; @define-color blue_1 #99c1f1; @define-color blue_2 #62a0ea; @define-color blue_3 #3584e4; diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini deleted file mode 100644 index efb1803..0000000 --- a/gtk-3.0/settings.ini +++ /dev/null @@ -1 +0,0 @@ -gtk-icon-theme-name = Papirus diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index b6ff8b2..3d750d1 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -40,13 +40,15 @@ https://github.com/GradienceTeam/Gradience @define-color shade_color rgba(0, 0, 0, 0.36); @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); @define-color secondary_sidebar_backdrop_color #1a1b26; -@define-color secondary_sidebar_shade_color #000000; +@define-color secondary_sidebar_shade_color rgba(0,0,0,0.5); @define-color sidebar_backdrop_color #1a1b26; -@define-color sidebar_shade_color #000000; -@define-color secondary_sidebar_bg_color #1a1b26; -@define-color secondary_sidebar_fg_color #c0caf5; +@define-color sidebar_shade_color rgba(0,0,0,0.5); @define-color sidebar_bg_color #1a1b26; @define-color sidebar_fg_color #c0caf5; +@define-color secondary_sidebar_bg_color #1a1b26; +@define-color secondary_sidebar_fg_color #c0caf5; +@define-color thumbnail_bg_color #1a1b26; +@define-color thumbnail_fg_color #c0caf5; @define-color blue_1 #99c1f1; @define-color blue_2 #62a0ea; @define-color blue_3 #3584e4; @@ -92,3 +94,11 @@ https://github.com/GradienceTeam/Gradience @define-color dark_3 #3d3846; @define-color dark_4 #241f31; @define-color dark_5 #000000; +/* +Generated with Gradience + +Issues caused by theming should be reported to Gradience repository, and not to upstream + +https://github.com/GradienceTeam/Gradience +*/ + diff --git a/gtk-4.0/gtk.css.bak b/gtk-4.0/gtk.css.bak index 84029be..1f6ab50 100644 --- a/gtk-4.0/gtk.css.bak +++ b/gtk-4.0/gtk.css.bak @@ -40,11 +40,15 @@ https://github.com/GradienceTeam/Gradience @define-color shade_color rgba(0, 0, 0, 0.36); @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5); @define-color secondary_sidebar_backdrop_color #1a1b26; -@define-color secondary_sidebar_shade_color #000000; +@define-color secondary_sidebar_shade_color #c0caf5; @define-color sidebar_backdrop_color #1a1b26; @define-color sidebar_shade_color #c0caf5; +@define-color sidebar_bg_color #1a1b26; +@define-color sidebar_fg_color #c0caf5; @define-color secondary_sidebar_bg_color #1a1b26; @define-color secondary_sidebar_fg_color #c0caf5; +@define-color thumbnail_bg_color #1a1b26; +@define-color thumbnail_fg_color #c0caf5; @define-color blue_1 #99c1f1; @define-color blue_2 #62a0ea; @define-color blue_3 #3584e4; @@ -90,11 +94,3 @@ https://github.com/GradienceTeam/Gradience @define-color dark_3 #3d3846; @define-color dark_4 #241f31; @define-color dark_5 #000000; -/* -Generated with Gradience - -Issues caused by theming should be reported to Gradience repository, and not to upstream - -https://github.com/GradienceTeam/Gradience -*/ - diff --git a/gtk-4.0/servers b/gtk-4.0/servers index b08f253..c6d9e92 100644 --- a/gtk-4.0/servers +++ b/gtk-4.0/servers @@ -3,12 +3,12 @@ xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" > - + Windows shares on 192.168.1.4 - + diff --git a/gtk-4.0/settings.ini b/gtk-4.0/settings.ini index 5dbd750..d289a6a 100644 --- a/gtk-4.0/settings.ini +++ b/gtk-4.0/settings.ini @@ -1,2 +1,3 @@ [Settings] gtk-application-prefer-dark-theme=true +gtk-hint-font-metrics=1 diff --git a/hypr_desktop/conf/env.conf b/hypr_desktop/conf/env.conf index 1d3b180..092f811 100644 --- a/hypr_desktop/conf/env.conf +++ b/hypr_desktop/conf/env.conf @@ -1,6 +1,21 @@ # #fix the fucking portal exec-once=systemctl --user import-environment -exec-once=dbus-update-activation-environment --all +exec-once=dbus-update-activation-environment --systemd --all # +env=GTK_CSD,0 +env=TERM,"kitty /bin/fish" +env=XDG_CURRENT_DESKTOP=Hyprland +env=XDG_SESSION_TYPE=wayland +env=XDG_SESSION_DESKTOP=Hyprland +env=QT_QPA_PLATFORM,wayland +env=QT_WAYLAND_FORCE_DPI,96 +env=QT_AUTO_SCREEN_SCALE_FACTOR,0 +env=QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +env=QT_SCALE_FACTOR,1 +# env=XCURSOR_SIZE,24 +env=PKG_CONFIG_PATH,/usr/local/lib/pkgconfig +env=LD_LIBRARY_PATH,/usr/local/lib +env=EDITOR,"neovide --novsync --nofork" + diff --git a/hypr_desktop/conf/keybinds.conf b/hypr_desktop/conf/keybinds.conf index ac1dcf0..6e1d999 100644 --- a/hypr_desktop/conf/keybinds.conf +++ b/hypr_desktop/conf/keybinds.conf @@ -2,12 +2,12 @@ bind=SUPER,S,exec,grim -g "$(slurp)" - | wl-copy bind=SUPERSHIFTALT,S,exec, grim -g "$(slurp)" $HOME/gits/ost-5semester/Screenshots/$(date +'%Y_%m_%d_%I_%M_%S.png') && (date +'%Y_%m_%d_%I_%M_%S.png') | wl-copy bind=SUPERSHIFT,S,exec,grim -g "$(slurp)" - | swappy -f - -bind=SUPERCONTROLSHIFT,S,exec,grim -g "0,0 3440x1440" - | wl-copy +bind=SUPERCONTROLSHIFT,S,exec,grim -c -g "0,0 3440x1440" - | wl-copy bind=SUPER,F,exec,firefox bind=SUPER,T,exec,kitty -1 bind=SUPER,Q,killactive, bind=SUPERSHIFTALT,M,exit, -bind=SUPER,E,exec,nautilus --new-window +bind=SUPER,E,exec,nautilus -w bind=SUPER,N,exec,neovide --novsync bind=SUPER,M,exec,oxidash bind=SUPER,V,togglefloating, @@ -28,7 +28,8 @@ bind=,XF86MonBrightnessUp,exec, $HOME/.config/scripts/change-brightness brightne bind=SUPER,D,exec,oxishut bind=SUPER,A,exec,copyq toggle bind=SUPERSHIFT,W,togglespecialworkspace -bind=SUPER,W,movetoworkspace,special +# bind=SUPER,W,movetoworkspace,special +bind = SUPER,W,hycov:toggleoverview binde=SUPER,J,movefocus,l diff --git a/hypr_desktop/conf/monitor.conf b/hypr_desktop/conf/monitor.conf index 33eb2c1..e46ea69 100644 --- a/hypr_desktop/conf/monitor.conf +++ b/hypr_desktop/conf/monitor.conf @@ -8,3 +8,15 @@ workspace=DP-3,1 workspace=DP-1,2 workspace=DP-2,3 +workspace = 2,monitor:DP-1 +workspace = 4,monitor:DP-1 +workspace = 6,monitor:DP-1 +workspace = 8,monitor:DP-1 +workspace = 9,monitor:DP-1 +workspace = 10,monitor:DP-1 + +workspace = 1,monitor:DP-3 +workspace = 5,monitor:DP-3 +workspace = 3,monitor:DP-2 +workspace = 7,monitor:DP-2 + diff --git a/hypr_desktop/conf/plugins.conf b/hypr_desktop/conf/plugins.conf new file mode 100644 index 0000000..dd675c9 --- /dev/null +++ b/hypr_desktop/conf/plugins.conf @@ -0,0 +1,10 @@ +plugin = $HOME/.config/hypr/plugins/libhycov.so + +plugin { + hycov { + overview_gappo = 30 #gas width from screem + overview_gappi = 10 #gas width from clients + hotarea_size = 0 #hotarea size in bottom left,10x10 + enable_hotarea = 0 # enable mouse cursor hotarea + } +} diff --git a/hypr_desktop/conf/rules.conf b/hypr_desktop/conf/rules.conf index 676e66d..4c6af1d 100644 --- a/hypr_desktop/conf/rules.conf +++ b/hypr_desktop/conf/rules.conf @@ -4,7 +4,11 @@ windowrule=float,^(.*)(OxiCalc)(.*)$ windowrule=float,^(.*)(winecfg.exe)(.*)$ windowrule=float,^(.*)(speed.exe)(.*)$ windowrule=float,^(.*)(copyq)(.*)$ -windowrule=center,^(.*)(gnome)(.*)$ -windowrule=size 1200 800,^(org.gnome.NautilusPreviewer)$ +# windowrule=center,^(.*)(gnome)(.*)$ +# windowrule=size 1200 800,^(org.gnome.NautilusPreviewer)$ windowrule=center,^(.*)(swappy)(.*)$ windowrule=float,title:^(.*)(Spirit)(.*)$ +windowrule=workspace 10 silent,^(.*)(steam)(.*)$ +windowrule=workspace 9 silent,^(.*)(dota)(.*)$ +windowrule=workspace 9 silent,^(.*)(battlebits)(.*)$ +windowrule=workspace 9 silent,^(.*)(aoe)(.*)$ diff --git a/hypr_desktop/hyprgreet.conf b/hypr_desktop/hyprgreet.conf new file mode 100644 index 0000000..3dc2214 --- /dev/null +++ b/hypr_desktop/hyprgreet.conf @@ -0,0 +1,17 @@ +exec-once=gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' +exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' + +monitor=DP-1,3440x1440@180,0x0,1 +monitor=DP-2,disable +monitor=DP-3,disable + +input { + force_no_accel = true +} + +misc { + disable_splash_rendering = true + disable_hyprland_logo = true +} + +exec-once=regreet --config /home/dashie/.config/hypr/regreet.toml --style /home/dashie/.config/gtk-3.0/gtk.css; hyprctl dispatch exit diff --git a/hypr_desktop/hyprland.conf b/hypr_desktop/hyprland.conf index faacd81..21697c3 100644 --- a/hypr_desktop/hyprland.conf +++ b/hypr_desktop/hyprland.conf @@ -1,6 +1,7 @@ -source=~/.config/hypr/conf/env.conf -source=~/.config/hypr/conf/monitor.conf -source=~/.config/hypr/conf/general.conf -source=~/.config/hypr/conf/rules.conf -source=~/.config/hypr/conf/keybinds.conf -source=~/.config/hypr/conf/autostart.conf +source=/home/dashie/.config/hypr/conf/env.conf +source=/home/dashie/.config/hypr/conf/plugins.conf +source=/home/dashie/.config/hypr/conf/monitor.conf +source=/home/dashie/.config/hypr/conf/general.conf +source=/home/dashie/.config/hypr/conf/rules.conf +source=/home/dashie/.config/hypr/conf/keybinds.conf +source=/home/dashie/.config/hypr/conf/autostart.conf diff --git a/hypr_desktop/hyprlandd.conf b/hypr_desktop/hyprlandd.conf index eaef5ca..be972a5 100644 --- a/hypr_desktop/hyprlandd.conf +++ b/hypr_desktop/hyprlandd.conf @@ -1,55 +1,4 @@ - - -input { - repeat_delay=200 - natural_scroll=false - follow_mouse=1 - force_no_accel=true - - touchpad { - natural_scroll=yes - tap-to-click=yes - } -} - -general { - sensitivity=1.0 - - gaps_in=5 - gaps_out=10 - border_size=3 - col.active_border=0x66ee1111 - col.inactive_border=0x66333333 - - apply_sens_to_raw=0 - -} - -decoration { - rounding=10 - blur=1 - blur_size=3 - blur_passes=1 - blur_new_optimizations=true -} - -animations { - enabled=1 -} - -dwindle { - preserve_split=true - pseudotile=0 -} - -gestures { -} - -misc { - animate_manual_resizes = 1 - } - -bind=SUPERALT,H,exec,alacritty +bind=SUPERALT,T,exec,kitty bind=SUPERALT,left,movewindow,l bind=SUPERALT,right,movewindow,r diff --git a/hypr_desktop/plugins/libhycov.so b/hypr_desktop/plugins/libhycov.so new file mode 100755 index 0000000..816c716 Binary files /dev/null and b/hypr_desktop/plugins/libhycov.so differ diff --git a/hypr_desktop/regreet.toml b/hypr_desktop/regreet.toml new file mode 100644 index 0000000..8874886 --- /dev/null +++ b/hypr_desktop/regreet.toml @@ -0,0 +1,17 @@ +[background] +# path = "/usr/share/backgrounds/greeter.jpg" +fit = "Contain" + +[env] +PATH = "/home/dashie/.config/:$HOME/.local/bin:/home/dashie/.cargo/bin:$PATH" +QT_QPA_PLATFORMTHEME = "qt5ct" + +[GTK] +application_prefer_dark_theme = true +cursor_theme_name = "Adwaita" +icon_theme_name = "Adwaita" +theme_name = "adw-gtk3" + +[commands] +reboot = ["systemctl", "reboot"] +poweroff = ["systemctl", "poweroff"] diff --git a/nvim/ftplugin/yuck.lua b/nvim/ftplugin/yuck.lua deleted file mode 100644 index 71bae6a..0000000 --- a/nvim/ftplugin/yuck.lua +++ /dev/null @@ -1 +0,0 @@ --- require("yuck.vim").setup() diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 97fce4b..420389a 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,72 +1,79 @@ { - "LazyVim": { "branch": "main", "commit": "e996eed750aabdfaa976357450f9ccbcd333a785" }, - "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" }, + "LazyVim": { "branch": "main", "commit": "68ff818a5bb7549f90b05e412b76fe448f605ffb" }, + "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" }, "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, - "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, - "catppuccin": { "branch": "main", "commit": "dcef0a062de380885193fb0f919217d58b979753" }, + "bufferline.nvim": { "branch": "main", "commit": "9e8d2f695dd50ab6821a6a53a840c32d2067a78a" }, + "catppuccin": { "branch": "main", "commit": "d7521f6050b94cb0e23067f63829d86886f870fe" }, "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "7f5ff6d253ae3543f186787bccafdc411d3f4b0a" }, + "conform.nvim": { "branch": "master", "commit": "161d95bfbb1ad1a2b89ba2ea75ca1b5e012a111e" }, "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" }, - "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" }, + "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "git-blame.nvim": { "branch": "master", "commit": "1792125237260dc2a03ba57d31c39179e6049f07" }, + "git-blame.nvim": { "branch": "master", "commit": "c9d778a95af2380f27eeaf6420dca406e64046b0" }, + "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, "harpoon": { "branch": "master", "commit": "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a" }, - "indent-blankline.nvim": { "branch": "master", "commit": "8a7b48f5823cc924f815129192288ec2e2b9288f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, - "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "09be3766669bfbabbe2863c624749d8da392c916" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" }, - "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, - "mini.ai": { "branch": "main", "commit": "10ad2ed049fb681a829b44aeb23443c0a9c910ae" }, - "mini.comment": { "branch": "main", "commit": "e4320af992cd053a7da2f33d9f63a86c2ab6ce59" }, - "mini.hipatterns": { "branch": "main", "commit": "9a66da0cad22677f76e55bbf529a932bfed9c07b" }, - "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" }, - "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" }, - "mini.surround": { "branch": "main", "commit": "68ce058ef9716d7d955b79363845d2dd003d6500" }, - "neoconf.nvim": { "branch": "main", "commit": "ae08076a9d69721c99985b9e13fd6ba78767d280" }, - "neodev.nvim": { "branch": "main", "commit": "d617d9eb27e73e701e446874c6ea2cb528719260" }, + "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, + "mini.ai": { "branch": "main", "commit": "4a2e387b121352dfb478f440c9a5313a9d97006c" }, + "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" }, + "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" }, + "mini.indentscope": { "branch": "main", "commit": "c8fdafa7bf603d758986a27eb546c55a5c73b1a3" }, + "mini.pairs": { "branch": "main", "commit": "71f117fd57f930da6ef4126b24f594dd398bac26" }, + "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" }, + "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, + "neodev.nvim": { "branch": "main", "commit": "80487e4f7bfa11c2ef2a1b461963db019aad6a73" }, "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, "neotest": { "branch": "master", "commit": "901891484db3d46ce43d56871273dc7d40621356" }, - "neotest-dotnet": { "branch": "main", "commit": "cee23e39d941b2deb14182d5a890144be6aa6164" }, + "neotest-dotnet": { "branch": "main", "commit": "f7bdb60c3d7716f75fb04582f64dae8efb7716f1" }, "neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" }, "neotest-java": { "branch": "main", "commit": "5b915ad065e24149983a672c63e7273fe742fc0e" }, "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, "neotest-rust": { "branch": "main", "commit": "03e036a310379f132d4e39387e9076396132ce3f" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "null.nvim": { "branch": "main", "commit": "bc6ea9deac03b791cdd980d8c84a5d923a26381c" }, - "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, - "nvim-dap": { "branch": "master", "commit": "b595c820018a15b6d54bf53b5cbeaa6f2d7a27e2" }, + "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-dap": { "branch": "master", "commit": "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-jdtls": { "branch": "master", "commit": "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f" }, - "nvim-lint": { "branch": "master", "commit": "a4b0511a9e757e78c8c9f9d3f201e0d8ff158b42" }, - "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, - "nvim-tree.lua": { "branch": "master", "commit": "83b699533b279af6d207d6c3860d4301556d65b4" }, - "nvim-treesitter": { "branch": "master", "commit": "0179a89656b4ce395a4487c07ae385b8425524ae" }, - "nvim-treesitter-context": { "branch": "master", "commit": "8aa32aa6b84dda357849dbc0f775e69f2e04c041" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "eb208bfdfcf76efea0424747e23e44641e13aaa6" }, + "nvim-jdtls": { "branch": "master", "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" }, + "nvim-lint": { "branch": "master", "commit": "7746f952827dabfb70194518c99c93d5651b8f19" }, + "nvim-lspconfig": { "branch": "master", "commit": "37457f268af5cd6765e589b0dcd7cbd192d8da00" }, + "nvim-spectre": { "branch": "master", "commit": "37c3c04a5fbab09c64b6c66dd9a93c92039e93fd" }, + "nvim-tree.lua": { "branch": "master", "commit": "4ee6366ff1fc5d66231516ed05beffb50004261b" }, + "nvim-treesitter": { "branch": "master", "commit": "9a746b4b6a1ef215943f07e6aa2ec35fb14097d4" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "e1e670a86274d5cb681e475d4891ea1afe605ced" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" }, + "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" }, - "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3044ff9e38d1ed8d7818d72d9f951ed9d1b0563d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-project.nvim": { "branch": "master", "commit": "5460c6c60d48618c5c746e5b1cad4c3e8262fdae" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" }, - "tokyonight.nvim": { "branch": "main", "commit": "531b04704fc9ff994d8b9c0720428fdc3c7d49d1" }, - "typst.vim": { "branch": "main", "commit": "a0f2bb167617d871dc067b75ab72640f265990e4" }, + "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, + "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "typst.vim": { "branch": "main", "commit": "2fddf2beeec265e0a41dd24ac668d825f8f3657a" }, + "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, - "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }, - "vimtex": { "branch": "master", "commit": "e6264120d31d0b5e69d06041b52d40f9ec5ffec5" }, + "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, + "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 0537d60..dbd795d 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -82,10 +82,10 @@ map("n", "ga", function() require("telescope.builtin").git_stash() end, { desc = "Git stash" }) map("n", "gg", function() - Util.float_term({ "gitui" }, { cwd = Util.get_root() }) + Util.terminal({ "gitui" }, { cwd = Util.root() }) end, { desc = "gitui (root dir)" }) map("n", "gG", function() - Util.float_term({ "gitui" }) + Util.terminal({ "gitui" }) end, { desc = "gitui (cwd)" }) map("n", "gb", function() require("gitblame") diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 330fc4d..ed5b07f 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -12,6 +12,7 @@ local options = { relativenumber = false, scrolloff = 5, scrolljump = 5, + wrap = false, } vim.o.guifont = "JetBrainsMono Nerd Font:h14" vim.g.neovide_refresh_rate_idle = 180 diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index 7de8404..d227b4b 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -106,7 +106,7 @@ return { { name = "crates" }, }), sorting = { - priority_weight = 1, + priority_weight = 90, comparators = { compare.exact, compare.score, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 981adfb..7ff852e 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -1,22 +1,6 @@ return { { "neovim/nvim-lspconfig", - lazy = true, - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - { "folke/neoconf.nvim", cmd = "Neoconf", config = false, dependencies = { "nvim-lspconfig" } }, - { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, - "mason.nvim", - "williamboman/mason-lspconfig.nvim", - "mfussenegger/nvim-jdtls", - { - "hrsh7th/cmp-nvim-lsp", - cond = function() - return require("lazyvim.util").has("nvim-cmp") - end, - }, - { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true }, - }, ---@class PluginLspOpts opts = { -- options for vim.diagnostic.config() @@ -182,138 +166,12 @@ return { end, }, }, - config = function(_, opts) + setup = function(_, _) local Util = require("lazyvim.util") - - if Util.has("neoconf.nvim") then - local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"] - require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false)) - end - - -- setup autoformat - Util.format.register(Util.lsp.formatter()) - - -- deprectaed options - if opts.autoformat ~= nil then - vim.g.autoformat = opts.autoformat - end - - -- setup formatting and keymaps Util.lsp.on_attach(function(client, buffer) require("config.lsp-keymap").on_attach(client, buffer) end) - local register_capability = vim.lsp.handlers["client/registerCapability"] - - vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx) - local ret = register_capability(err, res, ctx) - local client_id = ctx.client_id - ---@type lsp.Client - local client = vim.lsp.get_client_by_id(client_id) - local buffer = vim.api.nvim_get_current_buf() - require("config.lsp-keymap").on_attach(client, buffer) - return ret - end - - -- diagnostics - for name, icon in pairs(require("lazyvim.config").icons.diagnostics) do - name = "DiagnosticSign" .. name - vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) - end - - local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint - - if opts.inlay_hints.enabled and inlay_hint then - Util.lsp.on_attach(function(client, buffer) - if client.supports_method("textDocument/inlayHint") then - inlay_hint(buffer, true) - end - end) - end - - if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then - opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●" - or function(diagnostic) - local icons = require("lazyvim.config").icons.diagnostics - for d, icon in pairs(icons) do - if diagnostic.severity == vim.diagnostic.severity[d:upper()] then - return icon - end - end - end - end - - vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) - - local servers = opts.servers - local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") - local capabilities = vim.tbl_deep_extend( - "force", - {}, - vim.lsp.protocol.make_client_capabilities(), - has_cmp and cmp_nvim_lsp.default_capabilities() or {}, - opts.capabilities or {} - ) - - local function setup(server) - local server_opts = vim.tbl_deep_extend("force", { - capabilities = vim.deepcopy(capabilities), - }, servers[server] or {}) - - if opts.setup[server] then - if opts.setup[server](server, server_opts) then - return - end - elseif opts.setup["*"] then - if opts.setup["*"](server, server_opts) then - return - end - end - require("lspconfig")[server].setup(server_opts) - end - - -- get all the servers that are available through mason-lspconfig - local have_mason, mlsp = pcall(require, "mason-lspconfig") - local all_mslp_servers = {} - if have_mason then - all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package) - end - - local ensure_installed = {} ---@type string[] - for server, server_opts in pairs(servers) do - if server_opts then - server_opts = server_opts == true and {} or server_opts - -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig - if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then - setup(server) - else - ensure_installed[#ensure_installed + 1] = server - end - end - end - - if have_mason then - mlsp.setup({ ensure_installed = ensure_installed, handlers = { setup } }) - end - - if Util.lsp.get_config("denols") and Util.lsp.get_config("tsserver") then - local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc") - Util.lsp.disable("tsserver", is_deno) - Util.lsp.disable("denols", function(root_dir) - return not is_deno(root_dir) - end) - end - - require("lspconfig").ltex.setup({ - capabilities = capabilities, - on_attach = Util.lsp.on_attach(function(client, buffer) - require("config.lsp-keymap").on_attach(client, buffer) - require("ltex_extra").setup({ - path = vim.fn.expand("~") .. "/.local/share/ltex", - }) - end), - }) - vim.cmd([[highlight LspInlayHint guibg=#1A1B26]]) end, }, diff --git a/nvim/lua/plugins/lspbackup b/nvim/lua/plugins/lspbackup.lua similarity index 57% rename from nvim/lua/plugins/lspbackup rename to nvim/lua/plugins/lspbackup.lua index dca57d1..981adfb 100644 --- a/nvim/lua/plugins/lspbackup +++ b/nvim/lua/plugins/lspbackup.lua @@ -4,11 +4,10 @@ return { lazy = true, event = { "BufReadPre", "BufNewFile" }, dependencies = { - { "folke/neoconf.nvim", cmd = "Neoconf", config = true }, - { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, + { "folke/neoconf.nvim", cmd = "Neoconf", config = false, dependencies = { "nvim-lspconfig" } }, + { "folke/neodev.nvim", opts = { experimental = { pathStrict = true } } }, "mason.nvim", "williamboman/mason-lspconfig.nvim", - "lvimuser/lsp-inlayhints.nvim", "mfussenegger/nvim-jdtls", { "hrsh7th/cmp-nvim-lsp", @@ -16,6 +15,7 @@ return { return require("lazyvim.util").has("nvim-cmp") end, }, + { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true }, }, ---@class PluginLspOpts opts = { @@ -23,14 +23,15 @@ return { diagnostics = { underline = true, update_in_insert = false, - virtual_text = { spacing = 4, prefix = "●" }, + virtual_text = { spacing = 4, source = "if_many", prefix = "●" }, severity_sort = true, }, - -- Automatically format on save + inlay_hints = { + enabled = true, + }, + capabilities = {}, autoformat = false, - -- options for vim.lsp.buf.format - -- `bufnr` and `filter` is handled by the LazyVim formatter, - -- but can be also overridden when specified + format_notify = false, format = { formatting_options = nil, timeout_ms = nil, @@ -69,7 +70,31 @@ return { ansiblels = {}, marksman = {}, asm_lsp = {}, - omnisharp = {}, + omnisharp = { + handlers = { + ["textDocument/definition"] = function(...) + return require("omnisharp_extended").handler(...) + end, + }, + inlayHintsOptions = { + enableForParameters = true, + forLiteralParameters = true, + forIndexerParameters = true, + forObjectCreationParameters = true, + forOtherParameters = true, + suppressForParametersThatDifferOnlyBySuffix = false, + suppressForParametersThatMatchMethodIntent = false, + suppressForParametersThatMatchArgumentName = false, + enableForTypes = true, + forImplicitVariableTypes = true, + forLambdaParameterTypes = true, + forImplicitObjectCreation = true, + }, + enable_roslyn_analyzers = true, + organize_imports_on_format = true, + enable_import_completion = true, + }, + rnix = {}, rust_analyzer = { diagnostics = { enable = true, @@ -108,6 +133,7 @@ return { exportPdf = "onSave", }, }, + texlab = {}, ltex = { settings = { ltex = { @@ -128,7 +154,6 @@ return { "typ", }, }, - texlab = {}, gopls = { staticcheck = true, }, @@ -158,44 +183,81 @@ return { }, }, config = function(_, opts) + local Util = require("lazyvim.util") + + if Util.has("neoconf.nvim") then + local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"] + require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false)) + end + -- setup autoformat - require("lazyvim.plugins.lsp.format").autoformat = opts.autoformat + Util.format.register(Util.lsp.formatter()) + + -- deprectaed options + if opts.autoformat ~= nil then + vim.g.autoformat = opts.autoformat + end + -- setup formatting and keymaps - require("lazyvim.util").on_attach(function(client, buffer) - require("lazyvim.plugins.lsp.format").setup(opts) + Util.lsp.on_attach(function(client, buffer) require("config.lsp-keymap").on_attach(client, buffer) end) + local register_capability = vim.lsp.handlers["client/registerCapability"] + + vim.lsp.handlers["client/registerCapability"] = function(err, res, ctx) + local ret = register_capability(err, res, ctx) + local client_id = ctx.client_id + ---@type lsp.Client + local client = vim.lsp.get_client_by_id(client_id) + local buffer = vim.api.nvim_get_current_buf() + require("config.lsp-keymap").on_attach(client, buffer) + return ret + end + -- diagnostics for name, icon in pairs(require("lazyvim.config").icons.diagnostics) do name = "DiagnosticSign" .. name vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) end - vim.diagnostic.config(opts.diagnostics) - require("lsp-inlayhints").setup({}) + local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint + + if opts.inlay_hints.enabled and inlay_hint then + Util.lsp.on_attach(function(client, buffer) + if client.supports_method("textDocument/inlayHint") then + inlay_hint(buffer, true) + end + end) + end + + if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then + opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●" + or function(diagnostic) + local icons = require("lazyvim.config").icons.diagnostics + for d, icon in pairs(icons) do + if diagnostic.severity == vim.diagnostic.severity[d:upper()] then + return icon + end + end + end + end + + vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) + local servers = opts.servers + local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") local capabilities = vim.tbl_deep_extend( "force", {}, vim.lsp.protocol.make_client_capabilities(), - require("cmp_nvim_lsp").default_capabilities(), + has_cmp and cmp_nvim_lsp.default_capabilities() or {}, opts.capabilities or {} ) - local on_attach = function(client, bufnr) - vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") - vim.api.nvim_buf_set_option(bufnr, "tagfunc", "v:lua.vim.lsp.tagfunc") - require("lsp-inlayhints").on_attach(client, bufnr, true) - end local function setup(server) local server_opts = vim.tbl_deep_extend("force", { capabilities = vim.deepcopy(capabilities), - on_attach = on_attach, - vim.lsp.diagnostic.on_publish_diagnostics, - { - virtual_text = true, - }, }, servers[server] or {}) if opts.setup[server] then @@ -210,15 +272,19 @@ return { require("lspconfig")[server].setup(server_opts) end - local mlsp = require("mason-lspconfig") - local available = mlsp.get_available_servers() + -- get all the servers that are available through mason-lspconfig + local have_mason, mlsp = pcall(require, "mason-lspconfig") + local all_mslp_servers = {} + if have_mason then + all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package) + end local ensure_installed = {} ---@type string[] for server, server_opts in pairs(servers) do if server_opts then server_opts = server_opts == true and {} or server_opts -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig - if server_opts.mason == false or not vim.tbl_contains(available, server) then + if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then setup(server) else ensure_installed[#ensure_installed + 1] = server @@ -226,20 +292,40 @@ return { end end - require("mason-lspconfig").setup({ ensure_installed = ensure_installed }) - require("mason-lspconfig").setup_handlers({ setup }) + if have_mason then + mlsp.setup({ ensure_installed = ensure_installed, handlers = { setup } }) + end + + if Util.lsp.get_config("denols") and Util.lsp.get_config("tsserver") then + local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc") + Util.lsp.disable("tsserver", is_deno) + Util.lsp.disable("denols", function(root_dir) + return not is_deno(root_dir) + end) + end + + require("lspconfig").ltex.setup({ + capabilities = capabilities, + on_attach = Util.lsp.on_attach(function(client, buffer) + require("config.lsp-keymap").on_attach(client, buffer) + require("ltex_extra").setup({ + path = vim.fn.expand("~") .. "/.local/share/ltex", + }) + end), + }) vim.cmd([[highlight LspInlayHint guibg=#1A1B26]]) end, }, { - "jose-elias-alvarez/null-ls.nvim", + "DashieTM/null.nvim", event = { "BufReadPre", "BufNewFile" }, dependencies = { "mason.nvim" }, opts = function() local nls = require("null-ls") return { root_dir = require("null-ls.utils").root_pattern(".null-ls-root", ".neoconf.json", "Makefile", ".git"), + sources = { nls.builtins.formatting.fish_indent, nls.builtins.diagnostics.fish, @@ -248,6 +334,7 @@ return { nls.builtins.diagnostics.flake8, nls.builtins.formatting.autopep8, nls.builtins.formatting.prettierd, + nls.builtins.formatting.typst, }, } end, diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 3b3bdd1..ef35632 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -86,10 +86,6 @@ return { ) end, }, - { - "echasnovski/mini.ai", - diabled = true, - }, { "rcarriga/nvim-notify", opts = { @@ -265,76 +261,6 @@ return { { "tS", function() require("neotest").run.stop() end, desc = "Stop" }, }, }, - { - "echasnovski/mini.hipatterns", - event = "BufReadPre", - opts = function() - local hi = require("mini.hipatterns") - return { - -- custom LazyVim option to enable the tailwind integration - tailwind = { - enabled = true, - ft = { "typescriptreact", "javascriptreact", "css", "javascript", "typescript", "html" }, - -- full: the whole css class will be highlighted - -- compact: only the color will be highlighted - style = "full", - }, - highlighters = { - hex_color = hi.gen_highlighter.hex_color({ priority = 2000 }), - }, - } - end, - config = function(_, opts) - -- backward compatibility - if opts.tailwind == true then - opts.tailwind = { - enabled = true, - ft = { "typescriptreact", "javascriptreact", "css", "javascript", "typescript", "html" }, - style = "full", - } - end - if type(opts.tailwind) == "table" and opts.tailwind.enabled then - -- reset hl groups when colorscheme changes - vim.api.nvim_create_autocmd("ColorScheme", { - callback = function() - M.hl = {} - end, - }) - opts.highlighters.tailwind = { - pattern = function() - if not vim.tbl_contains(opts.tailwind.ft, vim.bo.filetype) then - return - end - if opts.tailwind.style == "full" then - return "%f[%w:-]()[%w:-]+%-[a-z%-]+%-%d+()%f[^%w:-]" - elseif opts.tailwind.style == "compact" then - return "%f[%w:-][%w:-]+%-()[a-z%-]+%-%d+()%f[^%w:-]" - end - end, - group = function(_, _, m) - ---@type string - local match = m.full_match - ---@type string, number - local color, shade = match:match("[%w-]+%-([a-z%-]+)%-(%d+)") - shade = tonumber(shade) - local bg = vim.tbl_get(M.colors, color, shade) - if bg then - local hl = "MiniHipatternsTailwind" .. color .. shade - if not M.hl[hl] then - M.hl[hl] = true - local bg_shade = shade == 500 and 950 or shade < 500 and 900 or 100 - local fg = vim.tbl_get(M.colors, color, bg_shade) - vim.api.nvim_set_hl(0, hl, { bg = "#" .. bg, fg = "#" .. fg }) - end - return hl - end - end, - priority = 2000, - } - end - require("mini.hipatterns").setup(opts) - end, - }, { "barreiroleo/ltex_extra.nvim", ft = { "markdown", "tex", "typst", "typ" }, diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index a02c2b9..e73d46f 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -31,7 +31,7 @@ geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10\0 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\x2\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\xe3\0\0\x3l\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x5\x61\0\0\0\0\x2\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x4\xe3\0\0\x3l) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3O\0\0\x2\xd9\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x5\x61\0\0\0\0\x2\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x3O\0\0\x2\xd9) [Troubleshooting] force_raster_widgets=1 diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..b0ce21b --- /dev/null +++ b/xdg-desktop-portal/portals.conf @@ -0,0 +1,2 @@ +[preferred] +default=hyprland;gtk