updating a good number of little things
This commit is contained in:
		
							parent
							
								
									f4d4db3ba6
								
							
						
					
					
						commit
						a189f2bf8e
					
				
					 13 changed files with 61 additions and 16 deletions
				
			
		
							
								
								
									
										3
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -16,3 +16,6 @@
 | 
				
			||||||
[submodule "scripts/ipwebcam-gst"]
 | 
					[submodule "scripts/ipwebcam-gst"]
 | 
				
			||||||
	path = scripts/ipwebcam-gst
 | 
						path = scripts/ipwebcam-gst
 | 
				
			||||||
	url = https://github.com/bluezio/ipwebcam-gst.git
 | 
						url = https://github.com/bluezio/ipwebcam-gst.git
 | 
				
			||||||
 | 
					[submodule "rubato"]
 | 
				
			||||||
 | 
						path = awesome/rubato
 | 
				
			||||||
 | 
						url = https://github.com/andOrlando/rubato.git
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -62,6 +62,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(set naughty.config.defaults.position "bottom_middle")
 | 
					(set naughty.config.defaults.position "bottom_middle")
 | 
				
			||||||
(set naughty.config.defaults.margin 10)
 | 
					(set naughty.config.defaults.margin 10)
 | 
				
			||||||
 | 
					(set naughty.config.spacing (dpi 10))
 | 
				
			||||||
(set naughty.config.defaults.border_width 0)
 | 
					(set naughty.config.defaults.border_width 0)
 | 
				
			||||||
(set naughty.config.defaults.hover_timeout 3)
 | 
					(set naughty.config.defaults.hover_timeout 3)
 | 
				
			||||||
(set naughty.config.defaults.max_width (dpi 700))
 | 
					(set naughty.config.defaults.max_width (dpi 700))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
(local dpi xresources.apply_dpi)
 | 
					(local dpi xresources.apply_dpi)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(local bling (require "bling"))
 | 
					(local bling (require "bling"))
 | 
				
			||||||
;; (local awestore (require "awestore"))
 | 
					(local rubato (require "rubato"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(local terminal "alacritty")
 | 
					(local terminal "alacritty")
 | 
				
			||||||
(local modkey "Mod4")
 | 
					(local modkey "Mod4")
 | 
				
			||||||
| 
						 | 
					@ -20,15 +20,25 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; (local xcenter (screen.primary.width))
 | 
					;; (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 {
 | 
					(local agenda-scratch (bling.module.scratchpad {
 | 
				
			||||||
                                                :command "emacsclient -e '(chris/org-agenda)'"
 | 
					                                                :command "emacsclient -e '(chris/org-agenda)'"
 | 
				
			||||||
                                                :rule {:name "org-agenda"}
 | 
					                                                :rule {:name "org-agenda"}
 | 
				
			||||||
                                                :sticky true
 | 
					                                                :sticky true
 | 
				
			||||||
                                                :autoclose true
 | 
					                                                :autoclose true
 | 
				
			||||||
                                                :floating 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
 | 
					                                                :reapply true
 | 
				
			||||||
                                                :dont_focus_before_close true
 | 
					                                                :dont_focus_before_close true
 | 
				
			||||||
 | 
					                                                :rubato {:x anim-x}
 | 
				
			||||||
                                                ;; :awestore {:x anim-x :y anim-y}
 | 
					                                                ;; :awestore {:x anim-x :y anim-y}
 | 
				
			||||||
                                                }))
 | 
					                                                }))
 | 
				
			||||||
(fn get-volume [?callback]
 | 
					(fn get-volume [?callback]
 | 
				
			||||||
| 
						 | 
					@ -172,7 +182,7 @@
 | 
				
			||||||
                                {:description "select pass" :group "apps" })
 | 
					                                {:description "select pass" :group "apps" })
 | 
				
			||||||
                     (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer"))
 | 
					                     (awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer"))
 | 
				
			||||||
                                {:description "Open Writer" :group "apps" })
 | 
					                                {: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"})
 | 
					                                {:description "launch browser" :group "apps"})
 | 
				
			||||||
                     ;; rofi
 | 
					                     ;; rofi
 | 
				
			||||||
                     (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh"))
 | 
					                     (awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh"))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,5 +16,6 @@ searcher = fennel.make_searcher({
 | 
				
			||||||
table.insert(package.loaders or package.searchers, fennel.searcher)
 | 
					table.insert(package.loaders or package.searchers, fennel.searcher)
 | 
				
			||||||
debug.traceback = fennel.traceback
 | 
					debug.traceback = fennel.traceback
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- require("lib")
 | 
				
			||||||
require("init") -- load ~/.config/awesome/init.fnl
 | 
					require("init") -- load ~/.config/awesome/init.fnl
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								awesome/rubato
									
										
									
									
									
										Submodule
									
								
							
							
						
						
									
										1
									
								
								awesome/rubato
									
										
									
									
									
										Submodule
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					Subproject commit 51b4f760c9601254f4817ac90441ccd1ad0a0616
 | 
				
			||||||
| 
						 | 
					@ -50,6 +50,24 @@
 | 
				
			||||||
                            ;; :size_hints_honor false
 | 
					                            ;; :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
 | 
					              ;; Davinci Resolve is fullscreen
 | 
				
			||||||
              {
 | 
					              {
 | 
				
			||||||
               :rule_any {
 | 
					               :rule_any {
 | 
				
			||||||
| 
						 | 
					@ -236,11 +254,13 @@
 | 
				
			||||||
                                  "fp64"
 | 
					                                  "fp64"
 | 
				
			||||||
                                  "vlc"
 | 
					                                  "vlc"
 | 
				
			||||||
                                  "Vlc"
 | 
					                                  "Vlc"
 | 
				
			||||||
 | 
					                                  "OpenLP"
 | 
				
			||||||
                                  ]
 | 
					                                  ]
 | 
				
			||||||
                          :instance [
 | 
					                          :instance [
 | 
				
			||||||
                                     "fp64"
 | 
					                                     "fp64"
 | 
				
			||||||
                                     "vlc"
 | 
					                                     "vlc"
 | 
				
			||||||
                                     "Vlc"
 | 
					                                     "Vlc"
 | 
				
			||||||
 | 
					                                     "OpenLP"
 | 
				
			||||||
                                     ]
 | 
					                                     ]
 | 
				
			||||||
                          :name [
 | 
					                          :name [
 | 
				
			||||||
                                 "Display Window"
 | 
					                                 "Display Window"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								mpv/mpv.conf
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								mpv/mpv.conf
									
										
									
									
									
								
							| 
						 | 
					@ -17,3 +17,14 @@ speed=1.95
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[slow]
 | 
					[slow]
 | 
				
			||||||
speed=1
 | 
					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
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@ round-borders-exclude = [
 | 
				
			||||||
shadow = true;
 | 
					shadow = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# The blur radius for shadows, in pixels. (defaults to 12)
 | 
					# 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)
 | 
					# The opacity of shadows. (0.0 - 1.0, defaults to 0.75)
 | 
				
			||||||
shadow-opacity = 1.0;
 | 
					shadow-opacity = 1.0;
 | 
				
			||||||
| 
						 | 
					@ -87,8 +87,8 @@ shadow-exclude = [
 | 
				
			||||||
# be painted in, such as a dock window region. Use
 | 
					# be painted in, such as a dock window region. Use
 | 
				
			||||||
#    shadow-exclude-reg = "x10+0+0"
 | 
					#    shadow-exclude-reg = "x10+0+0"
 | 
				
			||||||
# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on.
 | 
					# 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 = "x40+20+1436"
 | 
				
			||||||
shadow-exclude-reg = "x0+0+0"
 | 
					# shadow-exclude-reg = "x0+0+0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Crop shadow of a window fully on a particular Xinerama screen to the screen.
 | 
					# Crop shadow of a window fully on a particular Xinerama screen to the screen.
 | 
				
			||||||
# xinerama-shadow-crop = false
 | 
					# xinerama-shadow-crop = false
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,6 +45,6 @@ settings:
 | 
				
			||||||
    https://outlook.office.com?mailtouri=%25s: false
 | 
					    https://outlook.office.com?mailtouri=%25s: false
 | 
				
			||||||
    https://staff.tfcconnection.org: true
 | 
					    https://staff.tfcconnection.org: true
 | 
				
			||||||
  tabs.show:
 | 
					  tabs.show:
 | 
				
			||||||
    global: switching
 | 
					    global: always
 | 
				
			||||||
  zoom.default:
 | 
					  zoom.default:
 | 
				
			||||||
    global: 100%
 | 
					    global: 100%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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
 | 
					## either a float value with a "pt" suffix, or an integer value with a
 | 
				
			||||||
## "px" suffix.
 | 
					## "px" suffix.
 | 
				
			||||||
## Type: String
 | 
					## Type: String
 | 
				
			||||||
# c.fonts.default_size = '10pt'
 | 
					c.fonts.default_size = '11pt'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Font used for the downloadbar.
 | 
					## Font used for the downloadbar.
 | 
				
			||||||
## Type: Font
 | 
					## Type: Font
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								scripts/webcam
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								scripts/webcam
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					mpv --profile=wc --untimed av://av4l2:/dev/video0 --title='webcam'
 | 
				
			||||||
| 
						 | 
					@ -1,15 +1,10 @@
 | 
				
			||||||
// an example to create a new mapping `ctrl-y`
 | 
					 | 
				
			||||||
mapkey('<ctrl-y>', '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.
 | 
					// an example to replace `T` with `gt`, click `Default mappings` to see how `T` works.
 | 
				
			||||||
map('gt', 'T');
 | 
					map('gt', 'T');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// an example to remove mapkey `Ctrl-i`
 | 
					// an example to remove mapkey `Ctrl-i`
 | 
				
			||||||
unmap('<ctrl-i>');
 | 
					unmap('<ctrl-i>');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
settings.smoothScroll = true;
 | 
					settings.smoothScroll = false;
 | 
				
			||||||
settings.scrollStepSize = 220;
 | 
					settings.scrollStepSize = 220;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// set theme
 | 
					// set theme
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,7 +51,7 @@ command org-capture composite get_current_url | js -p tri.excmds.exclaim_quiet('
 | 
				
			||||||
 | 
					
 | 
				
			||||||
" MPV
 | 
					" MPV
 | 
				
			||||||
command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('mpv --profile=fast ' + url))
 | 
					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
 | 
					unbind v
 | 
				
			||||||
 | 
					
 | 
				
			||||||
command torrent js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('transadd ' + url))
 | 
					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 v hint -W mpv
 | 
				
			||||||
bind gt hint -W torrent
 | 
					bind gt hint -W torrent
 | 
				
			||||||
bind gv current_url mpv
 | 
					bind gv current_url mpv
 | 
				
			||||||
bind gV hint ytdl
 | 
					bind gV hint -W ytdl
 | 
				
			||||||
bind F hint -t
 | 
					bind F hint -t
 | 
				
			||||||
bind gy hint -y
 | 
					bind gy hint -y
 | 
				
			||||||
bind gc org-capture
 | 
					bind gc org-capture
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue