Merge branch 'master' of gitlab.com:chriscochrun/dotfiles
This commit is contained in:
commit
6aa1c37b2e
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -13,3 +13,6 @@
|
||||||
[submodule "awesome/bling"]
|
[submodule "awesome/bling"]
|
||||||
path = awesome/bling
|
path = awesome/bling
|
||||||
url = https://github.com/Nooo37/bling.git
|
url = https://github.com/Nooo37/bling.git
|
||||||
|
[submodule "scripts/ipwebcam-gst"]
|
||||||
|
path = scripts/ipwebcam-gst
|
||||||
|
url = https://github.com/bluezio/ipwebcam-gst.git
|
||||||
|
|
|
@ -111,6 +111,8 @@
|
||||||
;; utilities
|
;; utilities
|
||||||
(awful.key [] "Print" (fn [] (awful.spawn "flameshot gui"))
|
(awful.key [] "Print" (fn [] (awful.spawn "flameshot gui"))
|
||||||
{:description "screenshot" :group "utilities"})
|
{:description "screenshot" :group "utilities"})
|
||||||
|
(awful.key [modkey shift] "p" (fn [] (awful.spawn "flameshot gui"))
|
||||||
|
{:description "screenshot" :group "utilities"})
|
||||||
(awful.key [ modkey ] "." (fn [] (awful.spawn "/home/chris/.dotfiles/rofi/launchers-git/emoji.sh"))
|
(awful.key [ modkey ] "." (fn [] (awful.spawn "/home/chris/.dotfiles/rofi/launchers-git/emoji.sh"))
|
||||||
{:description "emoji picker" :group "utilities"})
|
{:description "emoji picker" :group "utilities"})
|
||||||
(awful.key [] "XF86MonBrightnessUp" (fn [] (awful.spawn
|
(awful.key [] "XF86MonBrightnessUp" (fn [] (awful.spawn
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[FileDialog]
|
[FileDialog]
|
||||||
history=file:///home/chris/Pictures/Newsletter, file:///home/chris/org, file:///home/chris/storage/digikam/Photos/Camera/Camera, file:///home/chris/Pictures, file:///home/chris
|
history=file:///home/chris/Downloads, file:///home/chris/Downloads/Takeout/Contacts/All Contacts, file:///home/chris/Pictures/Newsletter, file:///home/chris/org, file:///home/chris/storage/digikam/Photos/Camera/Camera
|
||||||
lastVisited=file:///home/chris
|
lastVisited=file:///home/chris/Downloads
|
||||||
qtVersion=5.15.2
|
qtVersion=5.15.2
|
||||||
shortcuts=file:, file:///home/chris
|
shortcuts=file:, file:///home/chris
|
||||||
sidebarWidth=116
|
sidebarWidth=116
|
||||||
|
|
|
@ -2,9 +2,17 @@
|
||||||
# which can be switched at runtime with shift+left/right
|
# which can be switched at runtime with shift+left/right
|
||||||
# root=/path/to/root
|
# root=/path/to/root
|
||||||
|
|
||||||
|
if [ $(hostname) = "chris-linuxlaptop" ]; then
|
||||||
|
style="laptop"
|
||||||
|
#echo "this is hidpi"
|
||||||
|
else
|
||||||
|
style="desktop"
|
||||||
|
#echo "this is not hidpi"
|
||||||
|
fi
|
||||||
|
|
||||||
# rofi command. Make sure to have "$@" as last argument
|
# rofi command. Make sure to have "$@" as last argument
|
||||||
_rofi () {
|
_rofi () {
|
||||||
rofi -i -no-auto-select "$@"
|
rofi -i -no-auto-select -theme launchers-git/"$style".rasi "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# default command to generate passwords
|
# default command to generate passwords
|
||||||
|
@ -16,7 +24,7 @@ _pwgen () {
|
||||||
# qrencode is needed to generate the image and a viewer
|
# qrencode is needed to generate the image and a viewer
|
||||||
# that can read from pipes. Known viewers to work are feh and display
|
# that can read from pipes. Known viewers to work are feh and display
|
||||||
_image_viewer () {
|
_image_viewer () {
|
||||||
sxiv
|
feh -g 600x600 --zoom fill -
|
||||||
# display
|
# display
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
1
scripts/ipwebcam-gst
Submodule
1
scripts/ipwebcam-gst
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 3eac81de512870bd79888556f1f7fe9ccbd35f70
|
Loading…
Reference in a new issue