From 4be5494d9d02c0cf328ba32783622ad7acee03e0 Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Fri, 31 Mar 2023 09:34:13 -0400 Subject: [PATCH] updated --- new-config/.config/gtk-3.0/settings.ini | 2 +- new-config/.config/hypr/hyprland.conf | 131 ++++++++++++++---- new-config/.config/lvim/config.lua | 7 +- new-config/.config/qt5ct/qt5ct.conf | 6 +- new-config/.config/qt6ct/qt6ct.conf | 4 +- new-config/.config/qutebrowser/bookmarks/urls | 3 +- new-config/.config/waybar/config | 24 +++- new-config/.config/waybar/style.css | 12 +- new-config/.gtkrc-2.0 | 2 +- new-config/.local/bin/lvim | 4 +- new-config/.winitrc | 8 +- 11 files changed, 154 insertions(+), 49 deletions(-) diff --git a/new-config/.config/gtk-3.0/settings.ini b/new-config/.config/gtk-3.0/settings.ini index 5f2c16e93..7b4e43bc1 100644 --- a/new-config/.config/gtk-3.0/settings.ini +++ b/new-config/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-theme-name=gruvbox-dark-gtk gtk-icon-theme-name=gruvbox-dark-icons-gtk -gtk-font-name=mononoki Nerd Font 10 +gtk-font-name=Cantarell 10 gtk-cursor-theme-name=Simp1e-Gruvbox-Dark gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH diff --git a/new-config/.config/hypr/hyprland.conf b/new-config/.config/hypr/hyprland.conf index 99d64417c..5508ee27a 100644 --- a/new-config/.config/hypr/hyprland.conf +++ b/new-config/.config/hypr/hyprland.conf @@ -2,7 +2,7 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = /usr/lib/xdg-desktop-portal -exec-once = /usr/lib/xdg-desktop-portal-wlr +exec-once = /usr/lib/xdg-desktop-portal-hyprland exec-once = dunst --config ~/.config/dunst/dunstrc exec-once = $HOME/.wbg exec-once = wl-paste --type text --watch cliphist store #Stores only text data @@ -28,20 +28,20 @@ general { gaps_in = 5 gaps_out = 10 border_size = 3 - col.active_border = rgb(9d0006) rgb(fb4934) 45deg + col.active_border = rgb(cc241d) rgb(d3869b) 45deg col.inactive_border = rgb(504945) layout = master } # Decorations decoration { - rounding = 7 - blur = no - blur_size = 3 - blur_passes = 1 - blur_new_optimizations = on + rounding = 4 + blur = yes + blur_size = 4 + blur_passes = 1.5 + blur_new_optimizations = no drop_shadow = yes - shadow_range = 4 + shadow_range = 5 shadow_render_power = 3 col.shadow = rgba(1a1a1aee) } @@ -51,11 +51,13 @@ animations { enabled = yes bezier = myBezier, 0.05, 0.9, 0.1, 1.05 animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% + animation = windowsOut, 1, 5, default, slide + animation = windowsIn, 1, 5, default, slide + animation = windowsMove, 1, 5, default animation = border, 1, 10, default - animation = borderangle, 1, 8, default + animation = borderangle, 1, 5, default, once animation = fade, 1, 7, default - animation = workspaces, 1, 6, default + animation = workspaces, 1, 5, default, slide } # Dwindle layout config @@ -66,7 +68,7 @@ dwindle { # Master layout config master { - no_gaps_when_only = true + no_gaps_when_only = false new_is_master = false mfact = 0.50 } @@ -89,6 +91,72 @@ device:epic mouse V1 { sensitivity = -0.5 } +# Window rules +windowrule = float, ^(qalculate-gtk)$ +windowrule = workspace 1, ^(org.qutebrowser.qutebrowser)$ +windowrule = workspace 1, ^(newsboat)$ +windowrule = workspace 1, ^(firefox)$ +windowrule = workspace 1, ^(Librewolf)$ +windowrule = workspace 1, ^(Chromium)$ +windowrule = workspace 1, ^(Brave-browser)$ +windowrule = workspace 1, ^(tut)$ +windowrule = workspace 2, ^(file_manager)$ +windowrule = workspace 2, ^(Pcmanfm)$ +windowrule = workspace 3, ^(text_editor)$ +windowrule = workspace 4, ^(chat_client)$ +windowrule = workspace 4, ^(whatsapp-for-linux)$ +windowrule = workspace 4, ^(Element)$ +windowrule = workspace 4, ^(Signal)$ +windowrule = workspace 4, ^(revolt-desktop)$ +windowrule = workspace 5, ^(music_player)$ +windowrule = workspace 5, ^(ytfzf_music)$ +windowrule = workspace 5, ^(audacity)$ +windowrule = workspace 5, ^(Ardour)$ +windowrule = workspace 5, ^(carla)$ +windowrule = workspace 5, ^(carla-control)$ +windowrule = workspace 5, ^(hydrogen)$ +windowrule = workspace 5, ^(guitarix)$ +windowrule = workspace 5, ^(lsp-plugins)$ +windowrule = workspace 5, ^(QjackCtl)$ +windowrule = workspace 5, ^(org.rncbc.qpwgraph)$ +windowrule = workspace 5, ^(soundconverter)$ +windowrule = workspace 5, ^(kid3-qt)$ +windowrule = workspace 6, ^(pitivi)$ +windowrule = workspace 6, ^(org.kde.kdenlive)$ +windowrule = workspace 6, ^(mpv)$ +windowrule = workspace 6, ^(ytfzf)$ +windowrule = workspace 6, ^(flix_cli)$ +windowrule = workspace 6, ^(ani_cli)$ +windowrule = workspace 6, ^(blender)$ +windowrule = workspace 6, ^(com.obsproject.Studio)$ +windowrule = workspace 6, ^(fr.handbrake.ghb)$ +windowrule = workspace 7, ^(org.inkscape.Inkscape)$ +windowrule = workspace 7, ^(Gimp-2.10)$ +windowrule = workspace 7, ^(xournalpp)$ +windowrule = workspace 7, ^(krita)$ +windowrule = workspace 8, ^(libreoffice-writer)$ +windowrule = workspace 8, ^(libreoffice-calc)$ +windowrule = workspace 8, ^(libreoffice-impress)$ +windowrule = workspace 8, ^(libreoffice-base)$ +windowrule = workspace 8, ^(libreoffice-draw)$ +windowrule = workspace 8, ^(libreoffice-math)$ +windowrule = workspace 8, ^(soffice)$ +windowrule = workspace 8, ^(GeoGebra)$ +windowrule = workspace 9, ^(org.libretro.RetroArch)$ +windowrule = workspace 9, ^(DarkPlaces)$ +windowrule = workspace 9, ^(pyrogenesis)$ +windowrule = workspace 9, ^(wesnoth)$ +windowrule = workspace 9, ^(Minetest)$ +windowrule = workspace 10, ^(btop)$ +windowrule = workspace 10, ^(htop)$ +windowrule = workspace 10, ^(pulsemixer)$ +windowrule = workspace 10, ^(alsamixer)$ +windowrule = workspace 10, ^(geek-life)$ +windowrule = workspace 10, ^(wdisplays)$ +windowrule = workspace 10, ^(font-manager)$ +windowrule = workspace 10, ^(org.qbittorrent.qBittorrent)$ +windowrule = workspace 10, ^(org.keepassxc.KeePassXC)$ + $supMod = SUPER $altMod = ALT $conMod = CONTROL @@ -136,21 +204,29 @@ bind = $supMod, 9, workspace, 9 bind = $supMod, 0, workspace, 10 # Move active window to a workspace with supMod + SHIFT + [0-9] -bind = $supMod SHIFT, 1, movetoworkspace, 1 -bind = $supMod SHIFT, 2, movetoworkspace, 2 -bind = $supMod SHIFT, 3, movetoworkspace, 3 -bind = $supMod SHIFT, 4, movetoworkspace, 4 -bind = $supMod SHIFT, 5, movetoworkspace, 5 -bind = $supMod SHIFT, 6, movetoworkspace, 6 -bind = $supMod SHIFT, 7, movetoworkspace, 7 -bind = $supMod SHIFT, 8, movetoworkspace, 8 -bind = $supMod SHIFT, 9, movetoworkspace, 9 -bind = $supMod SHIFT, 0, movetoworkspace, 10 +bind = $supMod_SHIFT, 1, movetoworkspace, 1 +bind = $supMod_SHIFT, 2, movetoworkspace, 2 +bind = $supMod_SHIFT, 3, movetoworkspace, 3 +bind = $supMod_SHIFT, 4, movetoworkspace, 4 +bind = $supMod_SHIFT, 5, movetoworkspace, 5 +bind = $supMod_SHIFT, 6, movetoworkspace, 6 +bind = $supMod_SHIFT, 7, movetoworkspace, 7 +bind = $supMod_SHIFT, 8, movetoworkspace, 8 +bind = $supMod_SHIFT, 9, movetoworkspace, 9 +bind = $supMod_SHIFT, 0, movetoworkspace, 10 # Scroll through existing workspaces with supMod + scroll bind = $supMod, mouse_down, workspace, e+1 bind = $supMod, mouse_up, workspace, e-1 +# Scroll through existing workspaces with supMod + arrow keys +bind = $supMod, Left, workspace, e+1 +bind = $supMod, Right, workspace, e-1 + +# Move active window through existing workspaces with supMod + arrow keys +bind = $supMod_SHIFT, Left, movetoworkspace, e+1 +bind = $supMod_SHIFT, Right, movetoworkspace, e-1 + # Move/resize windows with supMod + LMB/RMB and dragging bindm = $supMod, mouse:272, movewindow bindm = $supMod, mouse:273, resizewindow @@ -192,19 +268,20 @@ binde = $supMod_$conMod, C, exec, hyprpicker -n -a binde = $supMod_$altMod, T, exec, wezterm start --class tut -- tut binde = $supMod_$altMod, F, exec, wezterm start --class flix_cli -- flix-cli binde = $supMod_$altMod, A, exec, wezterm start --class ani_cli -- ani-cli -binde = $supMod_$altMod, Y, exec, wezterm start --class ytfzf -- ytfzf -flstT imv -binde = $supMod_$altMod, M, exec, wezterm start --class ytfzf_music -- ytfzf -mlstT imv +binde = $supMod_$altMod, Y, exec, wezterm start --class ytfzf -- ytfzf -flstT chafa +binde = $supMod_$altMod, M, exec, wezterm start --class ytfzf_music -- ytfzf -mlstT chafa binde = $supMod_$altMod, P, exec, wezterm start --class pulsemixer -- pulsemixer binde = $supMod_$altMod, O, exec, wezterm start --class alsamixer -- alsamixer +binde = $supMod_$altMod, G, exec, wezterm start --class geek-life -- geek-life binde = $supMod_$altMod, R, exec, wezterm start --class newsboat -- newsboat binde = $supMod_$altMod, B, exec, wezterm start --class btop -- btop binde = $supMod_$altMod, H, exec, wezterm start --class htop -- htop # Apps -binde = $supMod, E, exec, wezterm start --class editor -- "$HOME/.local/bin/lvim" -binde = $supMod, W, exec, qutebrowser +binde = $supMod, E, exec, wezterm start --class text_editor -- "$HOME/.local/bin/lvim" +binde = $supMod, W, exec, brave binde = $supMod, F, exec, wezterm start --class file_manager -- vifm binde = $supMod, M, exec, wezterm start --class music_player -- cmus -binde = $supMod, C, exec, wezterm start --class gomuks -- gomuks +binde = $supMod, C, exec, wezterm start --class chat_client -- gomuks binde = $supMod, P, exec, keepassxc binde = $supMod, G, exec, retroarch diff --git a/new-config/.config/lvim/config.lua b/new-config/.config/lvim/config.lua index 241055115..d3dfaa2ad 100644 --- a/new-config/.config/lvim/config.lua +++ b/new-config/.config/lvim/config.lua @@ -10,6 +10,10 @@ an executable -- general vim.opt.guifont = { "mononoki Nerd Font", ":h7" } +vim.g.vimspector_enable_mappings = 'HUMAN' +vim.g.vimspector_enable_mappings_for_mode = { + [''] = { 'n', 'v' }, +} lvim.log.level = "warn" lvim.format_on_save.enabled = false lvim.colorscheme = "gruvbox" @@ -170,7 +174,8 @@ lvim.builtin.treesitter.highlight.enable = true lvim.plugins = { {"lunarvim/colorschemes"}, {"iamcco/markdown-preview.nvim"}, - {"morhetz/gruvbox"}, + {"ellisonleao/gruvbox.nvim"}, + {"puremourning/vimspector"}, } -- Autocommands (https://neovim.io/doc/user/autocmd.html) diff --git a/new-config/.config/qt5ct/qt5ct.conf b/new-config/.config/qt5ct/qt5ct.conf index 25ebe2528..c2c56296a 100644 --- a/new-config/.config/qt5ct/qt5ct.conf +++ b/new-config/.config/qt5ct/qt5ct.conf @@ -6,8 +6,8 @@ standard_dialogs=gtk2 style=gtk2 [Fonts] -fixed=@Variant(\0\0\0@\0\0\0$\0m\0o\0n\0o\0n\0o\0k\0i\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0K\x10) -general=@Variant(\0\0\0@\0\0\0$\0m\0o\0n\0o\0n\0o\0k\0i\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0K\x10) +fixed="mononoki Nerd Font,10,-1,5,75,0,0,0,0,0" +general="Cantarell,10,-1,5,50,0,0,0,0,0" [Interface] activate_item_on_single_click=1 @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x3\xc0\0\0\0\x32\0\0\a\x7f\0\0\x4\x37\0\0\x3\xc1\0\0\0\x33\0\0\a~\0\0\x4\x36\0\0\0\0\0\0\0\0\a\x80\0\0\x3\xc1\0\0\0\x33\0\0\a~\0\0\x4\x36) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\0\0\x3\xbd\0\0\x4\x3\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10) [Troubleshooting] force_raster_widgets=1 diff --git a/new-config/.config/qt6ct/qt6ct.conf b/new-config/.config/qt6ct/qt6ct.conf index aa88b4acf..28a057661 100644 --- a/new-config/.config/qt6ct/qt6ct.conf +++ b/new-config/.config/qt6ct/qt6ct.conf @@ -6,7 +6,7 @@ style=qt6gtk2 [Fonts] fixed="mononoki Nerd Font,10,-1,5,700,0,0,0,0,0,0,0,0,0,0,1,Bold" -general="mononoki Nerd Font,10,-1,5,700,0,0,0,0,0,0,0,0,0,0,1,Bold" +general="Cantarell,10,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Bold" [Interface] activate_item_on_single_click=1 @@ -24,7 +24,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x32\0\0\a\x7f\0\0\x4\x37\0\0\0\0\0\0\0\x32\0\0\a\x7f\0\0\x4\x37\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\x32\0\0\a\x7f\0\0\x4\x37) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x10) [Troubleshooting] force_raster_widgets=1 diff --git a/new-config/.config/qutebrowser/bookmarks/urls b/new-config/.config/qutebrowser/bookmarks/urls index da9c3df54..26e69e7a7 100644 --- a/new-config/.config/qutebrowser/bookmarks/urls +++ b/new-config/.config/qutebrowser/bookmarks/urls @@ -1,7 +1,7 @@ https://mail.google.com/ gmail https://mail.tutanota.com/ tutanota https://odysee.com/ odysee -https://inv.vern.cc/ youtube +https://youtube.com/ youtube https://beatbump.ml/home youtube-music https://fosstodon.org/ fosstodon https://pixelfed.social/ pixelfed @@ -17,3 +17,4 @@ https://www.netacad.com/portal/learning intec-netacad https://learning.edx.org/course/course-v1:HarvardX+CS50+X/home cs50 https://libgen.rs/ libgen https://es.annas-archive.org/ annas-archive +https://chat.openai.com/ chatgpt diff --git a/new-config/.config/waybar/config b/new-config/.config/waybar/config index 64b5d548e..a0ab7d9f1 100644 --- a/new-config/.config/waybar/config +++ b/new-config/.config/waybar/config @@ -9,10 +9,26 @@ "modules-right": ["idle_inhibitor", "hyprland/language", "pulseaudio", "backlight", "battery", "custom/powerprofiles", "network"], "wlr/workspaces": { - "on-click": "activate", - "sort-by-number": true, - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1" + "on-click": "activate", + "sort-by-number": true, + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "format": "{icon}", + "format-icons": { + "1": "\udb80\udd8b", + "2": "\udb80\ude4b", + "3": "\udb83\udc8b", + "4": "\udb82\udf79", + "5": "\udb81\udf5a", + "6": "\udb82\ude1c", + "7": "\udb80\udee9", + "8": "\udb80\ude19", + "9": "\udb80\ude96", + "10": "\udb80\udf7b", + "urgent": "", + "focused": "", + "default": "" + } }, "hyprland/language": { diff --git a/new-config/.config/waybar/style.css b/new-config/.config/waybar/style.css index e587229bd..6fa4851c5 100644 --- a/new-config/.config/waybar/style.css +++ b/new-config/.config/waybar/style.css @@ -3,12 +3,11 @@ margin-bottom: 2.5px; margin-right: 2.5px; margin-left: 2.5px; - font-family: mononoki Nerd Font, mononoki Nerd Font Mono; - font-size: 16px; + /* font-family: mononoki Nerd Font; */ } window#waybar { - background-color: rgba(29, 32, 33, 0.9); + background-color: rgb(29, 32, 33); color: #ebdbb2; transition-property: background-color; transition-duration: .5s; @@ -41,6 +40,11 @@ button:hover { box-shadow: inset 0 -3px #ffffff; } +#workspaces { + font-family: Symbols Nerd Font Mono; + font-size: 20px; +} + #workspaces button { padding: 0 5px; background-color: transparent; @@ -85,6 +89,8 @@ button:hover { #language, #mode, #idle_inhibitor { + font-family: mononoki Nerd Font; + font-size: 16px; padding: 0 10px; color: #ffffff; } diff --git a/new-config/.gtkrc-2.0 b/new-config/.gtkrc-2.0 index 1f33b6126..d86312397 100644 --- a/new-config/.gtkrc-2.0 +++ b/new-config/.gtkrc-2.0 @@ -1,6 +1,6 @@ gtk-theme-name="gruvbox-dark-gtk" gtk-icon-theme-name="gruvbox-dark-icons-gtk" -gtk-font-name="mononoki Nerd Font 10" +gtk-font-name="Cantarell 10" gtk-cursor-theme-name="Simp1e-Gruvbox-Dark" gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH diff --git a/new-config/.local/bin/lvim b/new-config/.local/bin/lvim index 08e700cf2..d7d2a0b97 100755 --- a/new-config/.local/bin/lvim +++ b/new-config/.local/bin/lvim @@ -5,5 +5,5 @@ export LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-"/home/drk/.config/lvim"}" export LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-"/home/drk/.cache/lvim"}" export LUNARVIM_BASE_DIR="${LUNARVIM_BASE_DIR:-"/home/drk/.local/share/lunarvim/lvim"}" -sleep 0.1 -exec -a lvim nvim -u "$LUNARVIM_BASE_DIR/init.lua" "$@" + +sleep 0.1 && exec -a lvim nvim -u "$LUNARVIM_BASE_DIR/init.lua" "$@" diff --git a/new-config/.winitrc b/new-config/.winitrc index 6406f4ec6..a90c71a2e 100755 --- a/new-config/.winitrc +++ b/new-config/.winitrc @@ -12,7 +12,7 @@ export XCURSOR_THEME=Simp1e-Gruvbox-Dark gsettings set org.gnome.desktop.interface gtk-theme 'gruvbox-dark-gtk' gsettings set org.gnome.desktop.interface icon-theme 'gruvbox-dark-icons-gtk' gsettings set org.gnome.desktop.interface cursor-theme 'Simp1e-Gruvbox-Dark' -gsettings set org.gnome.desktop.interface font-name 'mononoki Nerd Font' +gsettings set org.gnome.desktop.interface font-name 'Cantarell' # Set a cursor size export XCURSOR_SIZE=16 @@ -32,9 +32,9 @@ export WM=Hyprland export SDL_VIDEODRIVER=wayland export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export XKB_DEFAULT_LAYOUT="us" -export EDITOR="emacsclient -t -a ''" # $EDITOR use Emacs in terminal -export VISUAL="emacsclient -c -a emacs" # $VISUAL use Emacs in GUI mode -export BROWSER="firefox" +export EDITOR="$HOME/.local/bin/lvim" # $EDITOR use lunarvim in terminal +export VISUAL="wezterm start --class editor -- $HOME/.local/bin/lvim" # $VISUAL use lunarvim in new terminal window +export BROWSER="qutebrowser" export VIEWER="zathura" exec Hyprland