resolve conflict
This commit is contained in:
commit
adf2951049
7 changed files with 39 additions and 18 deletions
|
|
@ -1,14 +1,34 @@
|
||||||
(defvar reveal_scratchpad false)
|
(defvar reveal_scratchpad false)
|
||||||
(defwidget scratchpad []
|
(defwidget scratchpad []
|
||||||
(revealer-on-hover
|
; (revealer-on-hover
|
||||||
:class "${reveal_scratchpad} scratchpad"
|
; :class "${reveal_scratchpad} scratchpad"
|
||||||
:revealvar reveal_scratchpad
|
; :revealvar reveal_scratchpad
|
||||||
:revealvar-name "reveal_scratchpad"
|
; :revealvar-name "reveal_scratchpad"
|
||||||
|
; (label
|
||||||
|
; :class "revealer-preview"
|
||||||
|
; :tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}"
|
||||||
|
; :text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}")
|
||||||
|
; (scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')})))
|
||||||
|
;
|
||||||
|
(box
|
||||||
|
:class "${reveal_scratchpad} scratchpad revealer-on-hover"
|
||||||
|
:orientation "h"
|
||||||
|
:space-evenly false
|
||||||
|
(eventbox
|
||||||
|
:onhover "${EWW_CMD} update reveal_scratchpad=true"
|
||||||
|
:onhoverlost "${EWW_CMD} update reveal_scratchpad=false"
|
||||||
|
(box
|
||||||
|
:space-evenly false
|
||||||
|
; (children :nth 0)
|
||||||
(label
|
(label
|
||||||
:class "revealer-preview"
|
:class "revealer-preview"
|
||||||
:tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}"
|
:tooltip "${jq(sway_info,'.scratchpad_info[] | "\\(.title) (\\(.name)) \\n"','r')}"
|
||||||
:text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}")
|
:text " ${jq(sway_info,'.scratchpad_info | length')} ${reveal_scratchpad ? '' : ''}")
|
||||||
(scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')})))
|
(revealer
|
||||||
|
:reveal reveal_scratchpad
|
||||||
|
:transition "slideright"
|
||||||
|
:duration "500ms"
|
||||||
|
(scratchpad_children :array {jq(sway_info,'.scratchpad_info','r')}))))))
|
||||||
|
|
||||||
(defwidget scratchpad_children [array]
|
(defwidget scratchpad_children [array]
|
||||||
(box :orientation "h"
|
(box :orientation "h"
|
||||||
|
|
|
||||||
|
|
@ -173,8 +173,8 @@ SetEditor=false
|
||||||
1920x1200 screen: Width=1025
|
1920x1200 screen: Width=1025
|
||||||
2 screens: Height=1119
|
2 screens: Height=1119
|
||||||
2 screens: Width=490
|
2 screens: Width=490
|
||||||
2048x1280 screen: Height=1030
|
2048x1280 screen: Height=1199
|
||||||
2048x1280 screen: Width=1005
|
2048x1280 screen: Width=357
|
||||||
3 screens: Height=672
|
3 screens: Height=672
|
||||||
3 screens: Width=1056
|
3 screens: Width=1056
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@ Show hidden files=false
|
||||||
Sort by=Date
|
Sort by=Date
|
||||||
Sort directories first=true
|
Sort directories first=true
|
||||||
Sort hidden files last=false
|
Sort hidden files last=false
|
||||||
Sort reversed=true
|
Sort reversed=false
|
||||||
Speedbar Width=218
|
Speedbar Width=218
|
||||||
View Style=Detail
|
View Style=Simple
|
||||||
|
|
||||||
[KShortcutsDialog Settings]
|
[KShortcutsDialog Settings]
|
||||||
Dialog Size=600,480
|
Dialog Size=600,480
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@ window_icons = [
|
||||||
[programs.browser]
|
[programs.browser]
|
||||||
name = "Librewolf"
|
name = "Librewolf"
|
||||||
command = "librewolf"
|
command = "librewolf"
|
||||||
arguments = ["--no-remote", "-P"]
|
# arguments = ["--no-remote", "-P"]
|
||||||
|
arguments = ["-P"]
|
||||||
[programs.browser_newtab]
|
[programs.browser_newtab]
|
||||||
name = "Librewolf (New Tab)"
|
name = "Librewolf (New Tab)"
|
||||||
command = "librewolf"
|
command = "librewolf"
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ bindsym {
|
||||||
#sway notification center
|
#sway notification center
|
||||||
$mod+Shift+n exec swaync-client -t -sw
|
$mod+Shift+n exec swaync-client -t -sw
|
||||||
#power menu
|
#power menu
|
||||||
$mod+Shift+e exec sdu power | wofi --show dmenu | cut -d' ' -f2- | xargs -I "{}" -- sdu power "{}"
|
$mod+Shift+e exec sdu power | wofi --show dmenu | awk '{print tolower($2)}' | xargs -I "{}" -- sdu power "{}"
|
||||||
#screenshot
|
#screenshot
|
||||||
$mod+Shift+s exec sp-screenshot
|
$mod+Shift+s exec sp-screenshot
|
||||||
#clipboard
|
#clipboard
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ Locked=1
|
||||||
Name=Development
|
Name=Development
|
||||||
IsRelative=1
|
IsRelative=1
|
||||||
Path=development
|
Path=development
|
||||||
StoreID=2ccf13ae
|
StoreID=aa80ffcc
|
||||||
ShowSelector=1
|
ShowSelector=1
|
||||||
|
|
||||||
[Profile0]
|
[Profile0]
|
||||||
|
|
@ -19,7 +19,7 @@ Name=Penelope
|
||||||
IsRelative=1
|
IsRelative=1
|
||||||
Path=penelope
|
Path=penelope
|
||||||
Default=1
|
Default=1
|
||||||
StoreID=a61d59be
|
StoreID=0585997e
|
||||||
ShowSelector=0
|
ShowSelector=0
|
||||||
|
|
||||||
[General]
|
[General]
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ process_search(){
|
||||||
fi
|
fi
|
||||||
ps aux | grep -ie "${1}"
|
ps aux | grep -ie "${1}"
|
||||||
}
|
}
|
||||||
|
alias nowrap='sed -E "s/(.{$((COLUMNS - 2))}).*$/\1 >/"'
|
||||||
#alias devbox-stable="TERM=xterm-256color toolbox enter debian-toolbox-12"
|
#alias devbox-stable="TERM=xterm-256color toolbox enter debian-toolbox-12"
|
||||||
#alias devbox-testing="TERM=xterm-256color toolbox enter debian-toolbox-testing"
|
#alias devbox-testing="TERM=xterm-256color toolbox enter debian-toolbox-testing"
|
||||||
#git shortcut to quickly push all changes with comment
|
#git shortcut to quickly push all changes with comment
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue