From 6f97ae2d337edb5e22e9c8652a9f2b8f439d6aaa Mon Sep 17 00:00:00 2001 From: Clay Gomera Date: Wed, 22 Feb 2023 16:46:06 -0400 Subject: [PATCH] updated --- new-config/.bash_profile | 6 - new-config/.config/fish/config.fish | 4 +- new-config/.config/gtk-2.0/gtkfilechooser.ini | 11 ++ new-config/.config/gtk-3.0/settings.ini | 4 +- new-config/.config/hypr/hyprland.conf | 10 ++ new-config/.config/waybar/config | 147 ++++++++++-------- new-config/.config/waybar/style.css | 42 +++-- new-config/.gtkrc-2.0 | 8 +- new-config/.local/bin/hyprland_session | 19 +++ 9 files changed, 154 insertions(+), 97 deletions(-) create mode 100644 new-config/.config/gtk-2.0/gtkfilechooser.ini diff --git a/new-config/.bash_profile b/new-config/.bash_profile index ab0979338..42a289acd 100644 --- a/new-config/.bash_profile +++ b/new-config/.bash_profile @@ -10,21 +10,15 @@ if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ] then #startx -- vt1 -keeptty &>/dev/null - export MOZ_ENABLE_WAYLAND=1 sh "./.local/bin/hyprland_session" logout fi ### ENVIRONMENT VARIABLES export EDITOR="lvim" # $EDITOR use lunarvim in terminal -export VISUAL="neovide --neovim-bin ./.local/bin/lvim" # $VISUAL use neovide for lunarvim in GUI export XDG_DATA_HOME="${XDG_DATA_HOME:="$HOME/.local/share"}" export XDG_CACHE_HOME="${XDG_CACHE_HOME:="$HOME/.cache"}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:="$HOME/.config"}" -export XDG_CURRENT_DESKTOP=hyprland -export XDG_SESSION_TYPE=wayland -export QT_QPA_PLATFORMTHEME=qt5ct -export QT_QPA_PLATFORM=wayland ### BASHRC source "$HOME"/.bashrc # Load the bashrc diff --git a/new-config/.config/fish/config.fish b/new-config/.config/fish/config.fish index 4e45f647f..1b88e97a9 100644 --- a/new-config/.config/fish/config.fish +++ b/new-config/.config/fish/config.fish @@ -14,8 +14,8 @@ set -U fish_user_paths $HOME/.bin $HOME/.local/bin $HOME/.config/emacs/bin $HOM ### EXPORT ### set fish_greeting # Supresses fish's intro message set TERM "xterm-256color" # Sets the terminal type -set EDITOR "lvim" # $EDITOR use lvim in terminal -set VISUAL "neovide --neovim-bin ./.local/bin/lvim" # $VISUAL use neovide for lvim in GUI mode +set EDITOR "./.local/bin/lvim" # $EDITOR use lvim in terminal +set VISUAL "wezterm start --class editor ./.local/bin/lvim" # $VISUAL open wezterm with lvim ### SET BAT AS MANPAGER set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" diff --git a/new-config/.config/gtk-2.0/gtkfilechooser.ini b/new-config/.config/gtk-2.0/gtkfilechooser.ini new file mode 100644 index 000000000..873fcf1c7 --- /dev/null +++ b/new-config/.config/gtk-2.0/gtkfilechooser.ini @@ -0,0 +1,11 @@ +[Filechooser Settings] +LocationMode=path-bar +ShowHidden=false +ShowSizeColumn=true +GeometryX=0 +GeometryY=0 +GeometryWidth=1000 +GeometryHeight=1000 +SortColumn=name +SortOrder=ascending +StartupMode=recent diff --git a/new-config/.config/gtk-3.0/settings.ini b/new-config/.config/gtk-3.0/settings.ini index f183132cf..5f2c16e93 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=oomox-gruvbox-dark -gtk-font-name=Mononoki Nerd Font 10 +gtk-icon-theme-name=gruvbox-dark-icons-gtk +gtk-font-name=mononoki Nerd Font 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 bcd6da64c..74da1e13a 100644 --- a/new-config/.config/hypr/hyprland.conf +++ b/new-config/.config/hypr/hyprland.conf @@ -4,6 +4,8 @@ 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 = dunst --config ~/.config/dunst/dunstrc +exec-once = wl-paste --type text --watch cliphist store #Stores only text data +exec-once = wl-paste --type image --watch cliphist store #Stores only image data exec-once = hyprpaper exec-once = waybar @@ -165,6 +167,7 @@ bind = $supMod_SHIFT, E, exec, $HOME/.config/rofi/scripts/rofi_emoji bind = $supMod_SHIFT, S, exec, $HOME/.config/rofi/scripts/rofi_scrot bind = $supMod_$conMod_SHIFT, S, exec, $HOME/.config/rofi/scripts/rofi_scrot -s bind = $supMod_SHIFT, Q, exec, $HOME/.config/rofi/scripts/rofi_power +bind = $supMod_SHIFT, C, exec, cliphist list | rofi -dmenu -p "  Clipboard " | cliphist decode | wl-copy # Move active window to a workspace with supMod + SHIFT + [0-9] bind = $supMod SHIFT, 1, movetoworkspace, 1 @@ -191,6 +194,13 @@ bindl=, XF86AudioRaiseVolume, exec, pamixer -i 5 bindl=, XF86AudioLowerVolume, exec, pamixer -d 5 bindl=, XF86AudioMute, exec, pamixer -t bindl=, XF86AudioMicMute, exec, pamixer --default-source -t +bindl=, XF86AudioPause, exec, playerctl play-pause +bindl=, XF86AudioPlay, exec, playerctl play-pause +bindl=, XF86AudioNext, exec, playerctl next +bindl=, XF86AudioPrev, exec, playerctl previous +bindl=, XF86AudioStop, exec, playerctl stop +bindl=, XF86News, exec, wezterm start --class newsboat -- newsboat + # Brightness control bindl=, XF86MonBrightnessUp, exec, light -A 10 diff --git a/new-config/.config/waybar/config b/new-config/.config/waybar/config index 2b7b943ac..f2c6dd999 100644 --- a/new-config/.config/waybar/config +++ b/new-config/.config/waybar/config @@ -1,76 +1,87 @@ { - "position": "top", - "height": 28, - //"width": 1280, - "spacing": 0, + "position": "top", + "height": 26, + "spacing": 3, - // Choose the order of the modules - "modules-left": ["wlr/workspaces"], - "modules-right": ["idle_inhibitor", "pulseaudio", "backlight", "battery", "network", "clock"], + // Choose the order of the modules + "modules-left": ["wlr/workspaces"], + "modules-center": ["clock"], + "modules-right": ["idle_inhibitor", "hyprland/language", "pulseaudio", "backlight", "battery", "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" - }, + "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" + }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } + "hyprland/language": { + "format": "{}  ", + "format-en": "US", + "format-es": "ES", + "keyboard-name": "at-translated-set-2-keyboard", + "on-click": "hyprctl switchxkblayout at-translated-set-2-keyboard next" + }, + + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "⏽", + "deactivated": "󰤄" + } + }, + + "clock": { + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "󰥔 {:%H:%M}", + "format-alt": " {:%Y-%m-%d}" + }, + + "backlight": { + "format": "{percent}% {icon}", + "format-icons": ["󱠃", "󱠃", "󱠃", "󱠃", "󱠃", "󱠂", "󱠂", "󱠂", "󱠂"] + }, + + "battery": { + "states": { + "warning": 30, + "critical": 15 }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["󰃞 ", "󰃞 ", "󰃞 ", "󰃟 ", "󰃟 ", "󰃟 ", "󰃠 ", "󰃠 ", "󰃠 "] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% 󱐋", - "format-plugged": "{capacity}% 󰚥", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": [" ", " ", " ", " ", " "] - }, - "pulseaudio": { - "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "󰖁 {icon} {format_source}", - "format-muted": "󰖁 {format_source}", - "format-source": "{volume}% 󰍬", - "format-source-muted": "󰍭", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󱡏", - "headset": "󰋎", - "phone": "󰏲", - "portable": "󰏲", - "car": "󰄋", - "default": ["󰕿", "󰖀", "󰕾"] - }, - "on-click": "wezterm start -- pulsemixer" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) 󱚻 ", - "format-ethernet": "{ipaddr}/{cidr} 󰈀 ", - "format-disconnected": "Disconnected 󱛅 ", - "format-alt": "{ifname}: {ipaddr}/{cidr}" + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% 󱐋", + "format-plugged": "{capacity}% 󰚥", + "format-alt": "{time} {icon}", + "format-critical": "{capacity}% {icon}", + "format-warning": "{capacity}% {icon}", + "format-icons": [" ", " ", " ", " ", " "] + }, + + "pulseaudio": { + "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon} {format_source}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": "󰖁 {icon} {format_source}", + "format-muted": "󰖁 {format_source}", + "format-source": "{volume}% 󰍬", + "format-source-muted": "󰍭", + "format-icons": { + "headphone": "󰋋", + "hands-free": "󱡏", + "headset": "󰋎", + "phone": "󰏲", + "portable": "󰏲", + "car": "󰄋", + "default": ["󰕿", "󰖀", "󰕾"] }, + "on-click": "wezterm start -- pulsemixer" + }, + + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) 󱚻 ", + "format-ethernet": "{ipaddr}/{cidr} 󰈀 ", + "format-disconnected": "Disconnected 󱛅 ", + "format-alt": "{ifname}: {ipaddr}/{cidr}" + }, } diff --git a/new-config/.config/waybar/style.css b/new-config/.config/waybar/style.css index 90e265088..600da930a 100644 --- a/new-config/.config/waybar/style.css +++ b/new-config/.config/waybar/style.css @@ -1,10 +1,14 @@ * { + margin-top: 2.5px; + margin-bottom: 2.5px; + margin-right: 2.5px; + margin-left: 2.5px; font-family: mononoki Nerd Font, mononoki Nerd Font Mono; font-size: 18px; } window#waybar { - background-color: rgba(29, 32, 33, 0.90); + background-color: rgba(29, 32, 33, 0.9); color: #ebdbb2; transition-property: background-color; transition-duration: .5s; @@ -44,12 +48,12 @@ button:hover { } #workspaces button.active { - background-color: rgba(204, 36, 29, 0.5); + background-color: rgba(204, 36, 29, 0.3); color: #ebdbb2; } #workspaces button:hover { - background: rgba(29, 32, 33, 1); + background: #9d0006; } #workspaces button.focused { @@ -71,6 +75,7 @@ button:hover { #backlight, #network, #pulseaudio, +#language, #mode, #idle_inhibitor { padding: 0 10px; @@ -93,18 +98,21 @@ button:hover { } #clock { - background-color: #8f3f71; - color: #ebdbb2 + background-color: #3c3836; + color: #ebdbb2; + border-radius: 15px; } #battery { background-color: #79740e; color: #ebdbb2; + border-radius: 6px; } #battery.charging, #battery.plugged { color: #ebdbb2; background-color: #689d6a; + border-radius: 6px; } @keyframes blink { @@ -122,6 +130,7 @@ button:hover { animation-timing-function: linear; animation-iteration-count: infinite; animation-direction: alternate; + border-radius: 6px; } label:focus { @@ -130,40 +139,47 @@ label:focus { #backlight { background-color: #b57614; + color: #ebdbb2; + border-radius: 6px; } #network { background-color: #9d0006; - color: #ebdbb2 + color: #ebdbb2; + border-radius: 6px; } #network.disconnected { - background-color: #f53c3c; + background-color: #cc241d; + border-radius: 6px; } #pulseaudio { background-color: #458588; color: #ebdbb2; + border-radius: 6px; } #pulseaudio.muted { background-color: #90b1b1; color: #2a5c45; + border-radius: 6px; } #idle_inhibitor { background-color: #d65d0e; + color: #ebdbb2; + border-radius: 6px; } #idle_inhibitor.activated { background-color: #fe8019; - color: #2d3436; + color: #3c3836; + border-radius: 6px; } #language { - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; + background-color: #8f3f71; + color: #ebdbb2; + border-radius: 6px; } diff --git a/new-config/.gtkrc-2.0 b/new-config/.gtkrc-2.0 index f511d7718..1f33b6126 100644 --- a/new-config/.gtkrc-2.0 +++ b/new-config/.gtkrc-2.0 @@ -1,10 +1,6 @@ -# DO NOT EDIT! This file will be overwritten by nwg-look. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/home/drk/.gtkrc-2.0.mine" gtk-theme-name="gruvbox-dark-gtk" -gtk-icon-theme-name="oomox-gruvbox-dark" -gtk-font-name="Mononoki Nerd Font 10" +gtk-icon-theme-name="gruvbox-dark-icons-gtk" +gtk-font-name="mononoki Nerd Font 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/hyprland_session b/new-config/.local/bin/hyprland_session index 296f9bb46..cf7b4e4da 100755 --- a/new-config/.local/bin/hyprland_session +++ b/new-config/.local/bin/hyprland_session @@ -8,6 +8,12 @@ export HYPRLAND_LOG_WLR=1 # Tell XWayland to use a cursor theme export XCURSOR_THEME=Simp1e-Gruvbox-Dark +# GTK shit +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' + # Set a cursor size export XCURSOR_SIZE=16 @@ -17,5 +23,18 @@ export QT_IM_MODULE=fcitx export XMODIFIERS=@im=fcitx export SDL_IM_MODULE=fcitx export GLFW_IM_MODULE=ibus +export XDG_CURRENT_DESKTOP=Hyprland +export XDG_SESSION_TYPE=wayland +export QT_QPA_PLATFORMTHEME=qt5ct +export MOZ_ENABLE_WAYLAND=1 +export GDK_BACKEND=wayland +export WM=Hyprland +export SDL_VIDEODRIVER=wayland +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +export XKB_DEFAULT_LAYOUT="us" +export EDITOR="$HOME/.local/bin/lvim" +export VISUAL="wezterm start --class editor -- $HOME/.local/bin/lvim" +export BROWSER="firefox" +export VIEWER="zathura" exec Hyprland