diff --git a/.gitmodules b/.gitmodules index ce3e7b5..cfaa3f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "scripts/ipwebcam-gst"] path = scripts/ipwebcam-gst url = https://github.com/bluezio/ipwebcam-gst.git +[submodule "rubato"] + path = awesome/rubato + url = https://github.com/andOrlando/rubato.git diff --git a/awesome/init.fnl b/awesome/init.fnl index 52a00ec..f5cc837 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -62,6 +62,7 @@ (set naughty.config.defaults.position "bottom_middle") (set naughty.config.defaults.margin 10) +(set naughty.config.spacing (dpi 10)) (set naughty.config.defaults.border_width 0) (set naughty.config.defaults.hover_timeout 3) (set naughty.config.defaults.max_width (dpi 700)) diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index 961f1d5..aae894b 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -6,7 +6,7 @@ (local dpi xresources.apply_dpi) (local bling (require "bling")) -;; (local awestore (require "awestore")) +(local rubato (require "rubato")) (local terminal "alacritty") (local modkey "Mod4") @@ -20,15 +20,25 @@ ;; (local xcenter (screen.primary.width)) +(local anim-x (rubato.timed { + :pos 1930 + :rate 90 + :easing rubato.quadratic + :intro 0.1 + :duration 0.2 + :awestore_compat true + })) + (local agenda-scratch (bling.module.scratchpad { :command "emacsclient -e '(chris/org-agenda)'" :rule {:name "org-agenda"} :sticky true :autoclose true :floating true - :geometry {:height (dpi 950) :width (dpi 900) :x (dpi 560) :y (dpi 73)} + :geometry {:height (dpi 850) :width (dpi 700) :x (dpi 800) :y (dpi 53)} :reapply true :dont_focus_before_close true + :rubato {:x anim-x} ;; :awestore {:x anim-x :y anim-y} })) (fn get-volume [?callback] @@ -172,7 +182,7 @@ {:description "select pass" :group "apps" }) (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer")) {:description "Open Writer" :group "apps" }) - (awful.key [modkey] "b" (fn [] (awful.spawn "fflof")) + (awful.key [modkey] "b" (fn [] (awful.spawn "qblof")) {:description "launch browser" :group "apps"}) ;; rofi (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh")) diff --git a/awesome/rc.lua b/awesome/rc.lua index 0419d69..a29adfd 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -16,5 +16,6 @@ searcher = fennel.make_searcher({ table.insert(package.loaders or package.searchers, fennel.searcher) debug.traceback = fennel.traceback +-- require("lib") require("init") -- load ~/.config/awesome/init.fnl diff --git a/awesome/rubato b/awesome/rubato new file mode 160000 index 0000000..51b4f76 --- /dev/null +++ b/awesome/rubato @@ -0,0 +1 @@ +Subproject commit 51b4f760c9601254f4817ac90441ccd1ad0a0616 diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 4cdef0d..f794f49 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -50,6 +50,24 @@ ;; :size_hints_honor false } } + { + :rule_any { + :name [ + "webcam" + ] + } + :properties { + :floating true + :raise true + :height (dpi 400) + :screen (if (= (screen.count) 3) + 2 + (screen.count)) + :sticky true + :ontop true + :placement awful.placement.centered + } + } ;; Davinci Resolve is fullscreen { :rule_any { @@ -236,11 +254,13 @@ "fp64" "vlc" "Vlc" + "OpenLP" ] :instance [ "fp64" "vlc" "Vlc" + "OpenLP" ] :name [ "Display Window" diff --git a/mpv/mpv.conf b/mpv/mpv.conf index 442eebe..5b5ec74 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -17,3 +17,14 @@ speed=1.95 [slow] speed=1 + +[wc] +speed=1 +osd-level=0 +osc=no +load-scripts=no +profile=low-latency +demuxer-lavf-format=video4linux2 +demuxer-lavf-o-set=input_format=mjpeg +untimed=yes +fps=60 \ No newline at end of file diff --git a/picom.conf b/picom.conf index b4eaaee..cc551ef 100644 --- a/picom.conf +++ b/picom.conf @@ -21,7 +21,7 @@ round-borders-exclude = [ shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) -shadow-radius = 24; +shadow-radius = 30; # The opacity of shadows. (0.0 - 1.0, defaults to 0.75) shadow-opacity = 1.0; @@ -87,8 +87,8 @@ shadow-exclude = [ # be painted in, such as a dock window region. Use # shadow-exclude-reg = "x10+0+0" # for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. -# shadow-exclude-reg = "x40+20+1436" -shadow-exclude-reg = "x0+0+0" +shadow-exclude-reg = "x40+20+1436" +# shadow-exclude-reg = "x0+0+0" # Crop shadow of a window fully on a particular Xinerama screen to the screen. # xinerama-shadow-crop = false diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml index 231e11c..28ab6b0 100644 --- a/qutebrowser/autoconfig.yml +++ b/qutebrowser/autoconfig.yml @@ -45,6 +45,6 @@ settings: https://outlook.office.com?mailtouri=%25s: false https://staff.tfcconnection.org: true tabs.show: - global: switching + global: always zoom.default: global: 100% diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 66a2d8a..466ca5d 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -1335,7 +1335,7 @@ c.fonts.default_family = ['VictorMono Nerd Font'] ## either a float value with a "pt" suffix, or an integer value with a ## "px" suffix. ## Type: String -# c.fonts.default_size = '10pt' +c.fonts.default_size = '11pt' ## Font used for the downloadbar. ## Type: Font diff --git a/scripts/webcam b/scripts/webcam new file mode 100755 index 0000000..e7bca6e --- /dev/null +++ b/scripts/webcam @@ -0,0 +1,3 @@ +#!/bin/sh + +mpv --profile=wc --untimed av://av4l2:/dev/video0 --title='webcam' diff --git a/surfingkeys/conf.js b/surfingkeys/conf.js index 37fb179..14f6ea3 100644 --- a/surfingkeys/conf.js +++ b/surfingkeys/conf.js @@ -1,15 +1,10 @@ -// an example to create a new mapping `ctrl-y` -mapkey('', 'Show me the money', function() { - Front.showPopup('a well-known phrase uttered by characters in the 1996 film Jerry Maguire (Escape to close).'); -}); - // an example to replace `T` with `gt`, click `Default mappings` to see how `T` works. map('gt', 'T'); // an example to remove mapkey `Ctrl-i` unmap(''); -settings.smoothScroll = true; +settings.smoothScroll = false; settings.scrollStepSize = 220; // set theme diff --git a/tridactyl/tridactylrc b/tridactyl/tridactylrc index dff1a40..420ae1e 100644 --- a/tridactyl/tridactylrc +++ b/tridactyl/tridactylrc @@ -51,7 +51,7 @@ command org-capture composite get_current_url | js -p tri.excmds.exclaim_quiet(' " MPV command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('mpv --profile=fast ' + url)) - +"" Unbind this key to rebind it later unbind v command torrent js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('transadd ' + url)) @@ -64,7 +64,7 @@ command ytdl js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim bind v hint -W mpv bind gt hint -W torrent bind gv current_url mpv -bind gV hint ytdl +bind gV hint -W ytdl bind F hint -t bind gy hint -y bind gc org-capture