From eaf99e26b26b92a7726518b2b4972bc51c0811c1 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 14 Aug 2021 10:08:30 -0500 Subject: [PATCH] Hopefully more wayland changes that don't break awesome --- awesome/init.fnl | 14 ++++--- awesome/keybindings.fnl | 2 +- awesome/theme.lua | 6 +-- bpytop/bpytop.conf | 12 +++--- fish/config.fish | 7 +++- fish/fish_variables | 5 ++- libinput-gestures.conf | 15 +++---- lolcate/default/config.toml | 1 + mpv/mpv.conf | 2 +- nyxt/init.lisp | 4 +- picom.conf | 9 ++-- qutebrowser/qsettings/QtProject.conf | 4 +- river/init | 62 +++++++++++++++++++++++----- rofi/config.rasi | 2 +- rofi/launchers-git/blurry.rasi | 2 +- rofi/rofi-pass/config | 2 +- scripts/latte-restart | 3 ++ scripts/rofipassx | 62 ++++++++++++++++++++++++++++ sway/config | 9 +++- waybar/style.css | 22 ++++++++++ wayfire/wayfire.ini | 46 ++++++++++++++++++--- 21 files changed, 232 insertions(+), 59 deletions(-) create mode 100755 scripts/latte-restart create mode 100755 scripts/rofipassx diff --git a/awesome/init.fnl b/awesome/init.fnl index a327a91..816f001 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -182,8 +182,9 @@ :style { :bg_focus beautiful.bg_focus :fg_focus beautiful.base01 - :bg_occupied beautiful.bg_normal - :bg_empty beautiful.bg_normal + :fg_occupied beautiful.base0B + :bg_occupied beautiful.bg_light + :bg_empty beautiful.bg_light } :layout { :spacing (dpi 5) @@ -317,7 +318,7 @@ :right 10} :widget wibox.container.background :shape gears.shape.rounded_bar - :bg beautiful.bg_normal + :bg beautiful.bg_light :fg beautiful.base0B}) (set s.myemptywidget (wibox.widget { ;; an empty widget for spacing things out @@ -478,9 +479,9 @@ :stretch false :type "dock" :shape gears.shape.rounded_bar - :bg beautiful.transparent + :bg beautiful.bg_normal :fg beautiful.fg_normal - :opacity 0.65 + :opacity 0.85 :screen s })) (: s.mywibox :struts { :bottom (dpi 45) }) @@ -604,9 +605,10 @@ (awful.spawn "picom --experimental-backend") (awful.spawn "/usr/lib/polkit-kde-authentication-agent-1") -(awful.spawn "feh --bg-fill /home/chris/Pictures/wallpapers/RoyalKing.png") +(awful.spawn "feh --bg-fill /usr/share/wallpapaers/Flow/contents/images/5120x2880.jpg") (awful.spawn "caffeine") (awful.spawn "libinput-gestures-setup start") (awful.spawn "bluetoothctl power on") (awful.spawn "nextcloud --background") +(awful.spawn "rbw-agent") (awful.spawn "xset r rate 220 90") diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 83c93cf..df504eb 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -145,7 +145,7 @@ {:description "launch eshell in new emacs frame" :group "apps" }) (awful.key [ modkey ] "e" (fn [] (awful.spawn "emacsclient -c -a 'emacs'")) {:description "launch new emacs frame" :group "apps" }) - (awful.key [ modkey ] "p" (fn [] (awful.spawn "rofi-rbw")) + (awful.key [ modkey ] "p" (fn [] (awful.spawn "rofi-pass")) {:description "select pass" :group "apps" }) (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer")) {:description "Open Writer" :group "apps" }) diff --git a/awesome/theme.lua b/awesome/theme.lua index 0e4634e..4655172 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -57,7 +57,7 @@ theme.border_normal = "#00000000" theme.border_focus = "#00000000" theme.border_marked = "#00000000" -theme.master_width_factor = 0.65 +theme.master_width_factor = 0.60 -- There are other variable sets -- overriding the default one when -- defined, the sets are: @@ -109,8 +109,8 @@ theme.menu_width = dpi(100) --theme.bg_widget = "#cc0000" -- mstab -theme.mstab_bar_ontop = true -- whether you want to allow the bar to be ontop of clients -theme.mstab_dont_resize_slaves = true -- whether the tabbed stack windows should be smaller than the +theme.mstab_bar_ontop = false -- whether you want to allow the bar to be ontop of clients +theme.mstab_dont_resize_slaves = false -- whether the tabbed stack windows should be smaller than the -- currently focused stack window (set it to true if you use -- transparent terminals. False if you use shadows on solid ones theme.mstab_bar_padding = "default" -- how much padding there should be between clients and your tabbar diff --git a/bpytop/bpytop.conf b/bpytop/bpytop.conf index be0ab63..56358f9 100644 --- a/bpytop/bpytop.conf +++ b/bpytop/bpytop.conf @@ -1,4 +1,4 @@ -#? Config file for bpytop v. 1.0.65 +#? Config file for bpytop v. 1.0.67 #* Color theme, looks for a .theme file in "/usr/[local/]share/bpytop/themes" and "~/.config/bpytop/themes", "Default" for builtin default theme. #* Prefix name by a plus sign (+) for a theme located in user themes folder, i.e. color_theme="+monokai" @@ -10,7 +10,7 @@ theme_background=False #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. truecolor=True -#* Manually set which boxes to show. Available values are "cpu mem net proc", seperate values with whitespace. +#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. shown_boxes="cpu mem net proc" #* Update time in milliseconds, increases automatically if set below internal loops processing time, recommended 2000 ms or above for better sample times for graphs. @@ -22,7 +22,7 @@ proc_update_mult=2 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu responsive", #* "cpu lazy" updates top process over time, "cpu responsive" updates top process directly. -proc_sorting="cpu responsive" +proc_sorting="memory" #* Reverse sorting order, True or False. proc_reversed=False @@ -89,7 +89,7 @@ background_update=True custom_cpu_name="" #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with a comma ",". -#* Begin line with "exclude=" to change to exclude filter, oterwise defaults to "most include" filter. Example: disks_filter="exclude=/boot, /home/user" +#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot, /home/user" disks_filter="" #* Show graphs instead of meters for memory values. @@ -119,7 +119,7 @@ io_mode=False #* Set to True to show combined read/write io graphs in io mode. io_graph_combined=False -#* Set the top speed for the io graphs in MiB/s (10 by default), use format "device:speed" seperate disks with a comma ",". +#* Set the top speed for the io graphs in MiB/s (10 by default), use format "device:speed" separate disks with a comma ",". #* Example: "/dev/sda:100, /dev/sdb:20" io_graph_speeds="" @@ -133,7 +133,7 @@ net_auto=True #* Sync the scaling for download and upload to whichever currently has the highest scale net_sync=False -#* If the network graphs color gradient should scale to bandwith usage or auto scale, bandwith usage is based on "net_download" and "net_upload" values +#* If the network graphs color gradient should scale to bandwidth usage or auto scale, bandwidth usage is based on "net_download" and "net_upload" values net_color_fixed=False #* Starts with the Network Interface specified here. diff --git a/fish/config.fish b/fish/config.fish index a9030d6..5bd6e71 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,9 +1,12 @@ #!/usr/bin/env fish -set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin +set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin /opt/android-sdk/cmdline-tools/latest/bin set TERM "xterm-256color" set EDITOR "emacsclient -c -a" set VISUAL "emacsclient -c -a emacs" +set -Ux ANDROID_SDK_ROOT /opt/android-sdk +set -Ux JAVA_HOME /usr/lib/jvm/default +set -Ux CHROME_EXECUTABLE /usr/bin/qutebrowser function fish_greeting -d "what's up, fish?" # set_color $fish_color_autosuggestion[1] @@ -209,7 +212,7 @@ alias mpf "mpv --profile=fast" ### Start X at login if status is-login if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 - exec startx + exec dbus-run-session startplasma-wayland end end diff --git a/fish/fish_variables b/fish/fish_variables index b05f60a..29bc5a6 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -1,5 +1,8 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export ANDROID_SDK_ROOT:/opt/android\x2dsdk +SETUVAR --export CHROME_EXECUTABLE:/usr/bin/qutebrowser +SETUVAR --export JAVA_HOME:/usr/lib/jvm/default SETUVAR __fish_initialized:3100 SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr @@ -30,4 +33,4 @@ SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2edoom\x2demacs/bin\x1e/home/chris/\x2eemacs\x2ed/bin\x1e/home/chris/\x2ecargo/bin +SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2edoom\x2demacs/bin\x1e/home/chris/\x2eemacs\x2ed/bin\x1e/home/chris/\x2ecargo/bin\x1e/opt/android\x2dsdk/cmdline\x2dtools/latest/bin diff --git a/libinput-gestures.conf b/libinput-gestures.conf index d7a21ba..e86ed5d 100644 --- a/libinput-gestures.conf +++ b/libinput-gestures.conf @@ -54,8 +54,6 @@ # also add "-w" to the internal command to allow wrapping workspaces. # Ensure you install wmctrl if you use _internal. -# Move to next workspace (works for GNOME/KDE/etc on Wayland and Xorg) -gesture swipe up 4 _internal ws_up # NOTE ABOUT FINGER COUNT: # The above command will configure this command for all fingers (i.e. 3 @@ -68,19 +66,18 @@ gesture swipe up 4 _internal ws_up # gesture swipe up xdotool key super+Page_Down # KDE Plasma open/close overview -gesture swipe up 3 xdotool key ctrl+F10 -gesture swipe down 3 xdotool key ctrl+F10 +gesture swipe up 3 ydotool key ctrl+F10 +gesture swipe down 3 ydotool key ctrl+F10 -# Move to prev workspace (works for GNOME/KDE/etc on Wayland and Xorg) +# Move through workspaces (works for GNOME/KDE/etc on Wayland and Xorg) +gesture swipe up 4 _internal ws_up gesture swipe down 4 _internal ws_down -# gesture swipe down xdotool key super+Page_Up - gesture swipe left 4 _internal ws_left gesture swipe right 4 _internal ws_right # Browser go forward and back (works only for Xorg, and Xwayland clients) -gesture swipe left xdotool key alt+Right -gesture swipe right xdotool key alt+Left +gesture swipe left 3 ydotool key alt+Right +gesture swipe right 3 ydotool key alt+Left # NOTE: If you don't use "natural" scrolling direction for your touchpad # then you may want to swap the above default left/right and up/down diff --git a/lolcate/default/config.toml b/lolcate/default/config.toml index 71279e0..a64b0e1 100644 --- a/lolcate/default/config.toml +++ b/lolcate/default/config.toml @@ -11,6 +11,7 @@ dirs = [ "~/Videos", "~/Music", "~/ebooks", + "~/nextcloud", "~/.dotemacs", "~/.emacs.d", ] diff --git a/mpv/mpv.conf b/mpv/mpv.conf index af6caab..28c85ad 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -1,7 +1,7 @@ # Use GPU-accelerated video output by default vo=gpu af=scaletempo2 -autofit=70% +autofit=80% geometry=50%:50% # input-ipc-server="/tmp/mpvsocket" hwdec=auto diff --git a/nyxt/init.lisp b/nyxt/init.lisp index 8affe85..fe34bed 100644 --- a/nyxt/init.lisp +++ b/nyxt/init.lisp @@ -76,7 +76,6 @@ :search-url "https://search.tfcconnection.org/?q=~a" :fallback-url "https://search.tfcconnection.org"))))) - (define-configuration status-buffer ((style (str:concat @@ -84,7 +83,8 @@ (cl-css:css '((body :background "#282a36" - :color "#e2e4e5") + :color "#e2e4e5" + :line-height "1fr") ("#container" :grid-template-columns "0px 4fr 0px 2fr 0px 0px") ("#controls" diff --git a/picom.conf b/picom.conf index 8722fec..089a98f 100644 --- a/picom.conf +++ b/picom.conf @@ -20,10 +20,10 @@ round-borders-exclude = [ shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) -shadow-radius = 18; +shadow-radius = 28; # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) -shadow-opacity = .75; +shadow-opacity = .55; # The left offset for shadows, in pixels. (defaults to -15) shadow-offset-x = 2; @@ -72,7 +72,7 @@ shadow-exclude = [ # "class_g = 'Alacritty'", "class_g ?= 'Notify-osd'", "class_g = 'Cairo-clock'", - "class_g = 'awesome'", + # "class_g = 'awesome'", # "class_g = 'qutebrowser'", "class_g = 'slop'", "_GTK_FRAME_EXTENTS@:c" @@ -172,10 +172,9 @@ opacity-rule = [ "100:class_g = 'scribus'", "100:class_g = 'OpenLP'", "80:class_g = 'Polybar'", + "90:class_g = 'awesome'", "100:class_g = 'code-oss'", "100:class_g = 'Meld'", - "70:class_g = 'TelegramDesktop'", - "90:class_g = 'Joplin'", "100:class_g = 'firefox'", "100:class_g = 'Gimp-2.10'", "100:class_g = 'dolphin'", diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf index 108a1f2..0a5b84f 100644 --- a/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/qsettings/QtProject.conf @@ -1,6 +1,6 @@ [FileDialog] -history=file:///home/chris/Downloads, file:///home/chris/Pictures/Phone/Camera -lastVisited=file:///home/chris/Downloads +history=file:///home/chris/Pictures/Phone/Camera, file:///home/chris/Videos/06, file:///home/chris/Videos/camp/rules, file:///home/chris, file:///home/chris/nextcloud/tfc/Documents +lastVisited=file:///home/chris qtVersion=5.15.2 shortcuts=file:, file:///home/chris sidebarWidth=116 diff --git a/river/init b/river/init index 9e4a1bf..022a8c8 100755 --- a/river/init +++ b/river/init @@ -12,10 +12,14 @@ mod="Mod4" # Mod+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) riverctl map normal $mod Return spawn alacritty -riverctl map normal $mod E spawn emacsclient -c -a 'emacs' +riverctl map normal $mod E spawn "emacsclient -c -a 'emacs'" riverctl map normal $mod B spawn qutebrowser -riverctl map normal None Menu spawn rofi -no-lazy-grab -show drun -modi drun -riverctl map normal $mod Menu spawn rofi -no-lazy-grab -show run -modi run +riverctl map normal None Menu spawn "rofi -no-lazy-grab -show drun -modi drun" +riverctl map normal $mod Menu spawn "rofi -no-lazy-grab -show run -modi run" +riverctl map normal $mod P spawn rofipass + + +riverctl map normal $mod+Control M spawn "makoctl dismiss -a" # Mod+Q to close the focused view riverctl map normal $mod C close @@ -152,26 +156,62 @@ done riverctl set-repeat 180 200 # Set app-ids of views which should float -riverctl float-filter-add "float" +# riverctl float-filter-add "float" riverctl float-filter-add "popup" riverctl float-filter-add "dolphin" +riverctl float-filter-add "mpv" # Set app-ids of views which should use client side decorations riverctl csd-filter-add "gedit" +# riverctl csd-filter-add "emacs" + +# apps to hide decorations +# riverctl csd-filter-remove "emacs" # Set opacity and fade effect -riverctl opacity 0.8 0.45 0.0 0.1 20 +riverctl opacity 0.95 0.45 0.0 0.1 20 # Set cursor theme riverctl xcursor-theme breeze-snow +#set the decos +riverctl border-width 0 + +# set pointer speed +riverctl input 1118:1997:Microsoft_Surface_Keyboard_Touchpad tap enabled +riverctl input 1118:1997:Microsoft_Surface_Keyboard_Touchpad natural-scroll enabled +riverctl input 1118:1997:Microsoft_Surface_Keyboard_Touchpad pointer-accel 0.5 + # Set layout wlr-randr --output eDP-1 --pos 0,0 --scale 2 -# Turn on Waybar -exec waybar +riverctl spawn 'nextcloud --background' +riverctl spawn 'emacs --daemon' +riverctl spawn mako +riverctl spawn rbw-agent -# Set and exec into the default layout generator, rivertile. -# River will send the process group of the init executable SIGTERM on exit. -riverctl default-layout rivertile -exec rivertile +# Turn on Waybar +riverctl spawn waybar +riverctl spawn 'swaybg -i /usr/share/wallpapers/Flow/contents/images/5120x2880.jpg -m fill' + +riverctl spawn 'export QT_QPA_PLATFORMTHEME="qt5ct"' + +# Use kile as my layout generator allows me to create really unique layouts +# with an s-expression syntax +riverctl spawn kile +riverctl output-layout kile + +read -r -d '' DECK < KEY_K [autostart] autostart_wf_shell = false bar = waybar -bg = swaybg -i ~/Pictures/wallpapers/RoyalKing.png -m center +bg = swaybg -i /usr/share/wallpapers/Flow/contents/images/5120x2880.jpg -m fill gamma = wlsunset notifications = mako outputs = kanshi @@ -69,24 +69,34 @@ saturation = 1.000000 toggle = none [command] + binding_terminal = KEY_ENTER command_terminal = alacritty + binding_browser = KEY_B command_browser = qutebrowser & + binding_emacs = KEY_E command_emacs = emacsclient -c -a emacs + binding_launcher = KEY_COMPOSE command_launcher = rofi -show drun -modi drun + binding_run = KEY_COMPOSE command_run = rofi -show run -modi run + binding_screenshot = KEY_PRINT command_screenshot = grim $(date '+%F_%T').webp + binding_screenshot_interactive = KEY_PRINT command_screenshot_interactive = slurp | grim -g - $(date '+%F_%T').webp + command_volume_down = pactl set-sink-volume @DEFAULT_SINK@ -5% repeatable_binding_volume_down = KEY_VOLUMEDOWN + command_volume_up = pactl set-sink-volume @DEFAULT_SINK@ +5% repeatable_binding_volume_up = KEY_VOLUMEUP + binding_mute = KEY_MUTE command_mute = pactl set-sink-mute @DEFAULT_SINK@ toggle @@ -97,7 +107,32 @@ focus_button_with_modifiers = false focus_buttons = BTN_LEFT | BTN_MIDDLE | BTN_RIGHT focus_buttons_passthrough = true max_render_time = -1 -plugins = alpha animate autostart command cube decoration expo fast-switcher grid idle invert move oswitch place resize switcher vswitch window-rules wobbly zoom simple-tile blur scale alpha vswipe +plugins = alpha \ + animate \ + autostart \ + command \ + cube \ + decoration \ + expo \ + fast-switcher \ + grid \ + idle \ + invert \ + move \ + oswitch \ + place \ + resize \ + switcher \ + vswitch \ + window-rules \ + wobbly \ + zoom \ + simple-tile \ + blur \ + scale \ + alpha \ + vswipe + preferred_decoration_mode = server vheight = 2 vwidth = 2 @@ -221,7 +256,7 @@ natural_scroll = true scroll_method = default tap_to_click = true touchpad_accel_profile = default -touchpad_cursor_speed = 0.000000 +touchpad_cursor_speed = 1.000000 touchpad_scroll_speed = 1.000000 xkb_layout = us xkb_model = @@ -351,6 +386,7 @@ activate = BTN_LEFT [window-rules] rule_1 = on created if app_id is "emacs" then set alpha 0.8 +rule_2 = on created if app_id is "dolphin" then float [winzoom] dec_x_binding = KEY_LEFT @@ -365,8 +401,8 @@ zoom_step = 0.100000 [wm-actions] minimize = none toggle_always_on_top = none -toggle_fullscreen = none -toggle_maximize = none +toggle_fullscreen = KEY_F +toggle_maximize = KEY_M toggle_showdesktop = none toggle_sticky = none