large update
This commit is contained in:
parent
fbabd724c5
commit
16a0f6a67d
@ -22,7 +22,7 @@
|
|||||||
*.color15: #F6F6F6
|
*.color15: #F6F6F6
|
||||||
|
|
||||||
! Rofi
|
! Rofi
|
||||||
rofi.font: Ubuntu Mono 12
|
rofi.font: DejaVu Sans Mono 12
|
||||||
rofi.padding: 20
|
rofi.padding: 20
|
||||||
rofi.line-padding: 2
|
rofi.line-padding: 2
|
||||||
rofi.color-enabled: true
|
rofi.color-enabled: true
|
||||||
@ -32,8 +32,8 @@ rofi.color-window: #EFF1F5, #2b303b, #EFF1F5
|
|||||||
rofi.color-normal: #EFF1F5, #2b303b, #EFF1F5, #8fa1b3, #2b303b
|
rofi.color-normal: #EFF1F5, #2b303b, #EFF1F5, #8fa1b3, #2b303b
|
||||||
|
|
||||||
! xterm
|
! xterm
|
||||||
xterm*font: Ubuntu Mono
|
xterm*font: DejaVu Sana Mono
|
||||||
xterm*faceName: Ubuntu Mono:size=11:antialias=false
|
xterm*faceName: DejaVu Sana Mono:size=10:antialias=false
|
||||||
xterm*loginShell: true
|
xterm*loginShell: true
|
||||||
xterm*vt100*geometry: 90x34
|
xterm*vt100*geometry: 90x34
|
||||||
xterm*saveLines: 2000
|
xterm*saveLines: 2000
|
||||||
@ -46,13 +46,13 @@ URxvt*saveline: 15000
|
|||||||
URxvt*termName: rxvt-256color
|
URxvt*termName: rxvt-256color
|
||||||
URxvt*iso14755: false
|
URxvt*iso14755: false
|
||||||
URxvt*depth: 32
|
URxvt*depth: 32
|
||||||
URxvt*background: [90]#2b303b
|
URxvt*background: [95]#2b303b
|
||||||
URxvt*scrollBar: false
|
URxvt*scrollBar: false
|
||||||
URxvt*scrollBar_right: false
|
URxvt*scrollBar_right: false
|
||||||
URxvt*internalBorder: 0
|
URxvt*internalBorder: 0
|
||||||
URxvt*externalBorder: 0
|
URxvt*externalBorder: 0
|
||||||
URxvt*letterSpace: -1
|
URxvt*letterSpace: -1
|
||||||
URxvt.font: xft:Ubuntu Mono:size=11
|
URxvt.font: xft:DejaVu Sana Mono:size=10
|
||||||
URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
|
URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
|
||||||
URxvt.copyCommand: xclip -i -selection clipboard
|
URxvt.copyCommand: xclip -i -selection clipboard
|
||||||
URxvt.pasteCommand: xclip -o -selection clipboard
|
URxvt.pasteCommand: xclip -o -selection clipboard
|
||||||
@ -72,8 +72,8 @@ URxvt*buffered: false
|
|||||||
UXTerm*termName: xterm-256color
|
UXTerm*termName: xterm-256color
|
||||||
UXTerm*cursorColor: white
|
UXTerm*cursorColor: white
|
||||||
UXTerm*VT100.geometry: 90x30
|
UXTerm*VT100.geometry: 90x30
|
||||||
UXTerm*font: Ubuntu Mono
|
UXTerm*font: DejaVu Sana Mono
|
||||||
UXTerm*faceSize: 12
|
UXTerm*faceSize: 10
|
||||||
UXTerm*dynamicColors: true
|
UXTerm*dynamicColors: true
|
||||||
UXTerm*utf8: 2
|
UXTerm*utf8: 2
|
||||||
UXTerm*eightBitInput: true
|
UXTerm*eightBitInput: true
|
||||||
|
@ -37,12 +37,11 @@ do
|
|||||||
local in_error = false
|
local in_error = false
|
||||||
awesome.connect_signal("debug::error", function (err)
|
awesome.connect_signal("debug::error", function (err)
|
||||||
-- Make sure we don't go into an endless error loop
|
-- Make sure we don't go into an endless error loop
|
||||||
if in_error then return end
|
if in_error then
|
||||||
|
return
|
||||||
|
end
|
||||||
in_error = true
|
in_error = true
|
||||||
|
naughty.notify({ preset = naughty.config.presets.critical, title = "Oops, an error happened!", text = err })
|
||||||
naughty.notify({ preset = naughty.config.presets.critical,
|
|
||||||
title = "Oops, an error happened!",
|
|
||||||
text = err })
|
|
||||||
in_error = false
|
in_error = false
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
@ -181,8 +180,8 @@ menu_items = freedesktop.menu.new()
|
|||||||
myawesomemenu = {
|
myawesomemenu = {
|
||||||
{ "manual", terminal .. " -e man awesome", freedesktop.utils.lookup_icon({ icon = 'help' }) },
|
{ "manual", terminal .. " -e man awesome", freedesktop.utils.lookup_icon({ icon = 'help' }) },
|
||||||
{ "restart", awesome.restart, freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) },
|
{ "restart", awesome.restart, freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) },
|
||||||
|
{ "quit", awesome.quit, freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) }
|
||||||
}
|
}
|
||||||
-- { "quit", awesome.quit, freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) }
|
|
||||||
|
|
||||||
table.insert(menu_items, { "Awesome", myawesomemenu, beautiful.awesome_icon })
|
table.insert(menu_items, { "Awesome", myawesomemenu, beautiful.awesome_icon })
|
||||||
table.insert(menu_items, { "Wallpaper", wallmenu, freedesktop.utils.lookup_icon({ icon = 'gnome-settings-background' })})
|
table.insert(menu_items, { "Wallpaper", wallmenu, freedesktop.utils.lookup_icon({ icon = 'gnome-settings-background' })})
|
||||||
|
@ -12,6 +12,17 @@ al-compositor --start &
|
|||||||
# panel
|
# panel
|
||||||
sleep 1; al-polybar-session &
|
sleep 1; al-polybar-session &
|
||||||
|
|
||||||
|
# polkit, required for authentication
|
||||||
|
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
||||||
|
|
||||||
|
# keyring for storing saved passwords
|
||||||
|
gnome-keyring-daemon --start --components=pkcs11 &
|
||||||
|
|
||||||
|
# pressing super key alone simulates pressing Alt-F1
|
||||||
|
ksuperkey -e 'Super_L=Alt_L|F1' &
|
||||||
|
ksuperkey -e 'Super_R=Alt_L|F1' &
|
||||||
|
|
||||||
|
|
||||||
# Set some bsp specific stuff
|
# Set some bsp specific stuff
|
||||||
bspc monitor -d I II III IV V VI VII VIII IX X
|
bspc monitor -d I II III IV V VI VII VIII IX X
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[global]
|
[global]
|
||||||
font = Ubuntu 11
|
font = DejaVu Sans Mono 11
|
||||||
markup = yes
|
markup = yes
|
||||||
format = "<b>%s</b>\n%b"
|
format = "<b>%s</b>\n%b"
|
||||||
sort = yes
|
sort = yes
|
||||||
@ -26,7 +26,7 @@ frame_color = "#c0c5ce"
|
|||||||
separator_color = frame
|
separator_color = frame
|
||||||
frame_width = 1
|
frame_width = 1
|
||||||
startup_notification = false
|
startup_notification = false
|
||||||
dmenu = /usr/bin/dmenu -p dunst:
|
dmenu = /usr/bin/rofi -dmenu -p dunst:
|
||||||
browser = /usr/bin/firefox
|
browser = /usr/bin/firefox
|
||||||
icon_position = left
|
icon_position = left
|
||||||
icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
|
icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
|
||||||
|
@ -69,6 +69,16 @@ exec_always --no-startup-id xrdb -load ~/.Xresources
|
|||||||
exec --no-startup-id xfsettingsd
|
exec --no-startup-id xfsettingsd
|
||||||
exec --no-startup-id al-compositor --start
|
exec --no-startup-id al-compositor --start
|
||||||
|
|
||||||
|
# polkit, required for authentication
|
||||||
|
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||||
|
|
||||||
|
# keyring for storing saved passwords
|
||||||
|
exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11
|
||||||
|
|
||||||
|
# pressing super key alone simulates pressing Alt-F1
|
||||||
|
exec --no-startup-id ksuperkey -e 'Super_L=Alt_L|F1' &
|
||||||
|
exec --no-startup-id ksuperkey -e 'Super_R=Alt_L|F1' &
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
############# Bindings ##################
|
############# Bindings ##################
|
||||||
###########################################################
|
###########################################################
|
||||||
@ -256,6 +266,3 @@ assign [class="(?i)(?:thunar)"] → $WS3
|
|||||||
# focus, floating, & sticky
|
# focus, floating, & sticky
|
||||||
for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
|
for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
|
||||||
for_window [window_role="(?i)(?:pop-up|setup)"] floating enable
|
for_window [window_role="(?i)(?:pop-up|setup)"] floating enable
|
||||||
|
|
||||||
# set trayer to be borderless
|
|
||||||
for_window [class="(?i)trayer"] border pixel 0
|
|
||||||
|
@ -10,7 +10,7 @@ keys=(
|
|||||||
"35F52A02854DCCAEC9DD5CC410443C7F54B00041"
|
"35F52A02854DCCAEC9DD5CC410443C7F54B00041"
|
||||||
)
|
)
|
||||||
|
|
||||||
setup() {
|
setup_keyring() {
|
||||||
sudo dirmngr </dev/null
|
sudo dirmngr </dev/null
|
||||||
sudo pacman-key --init
|
sudo pacman-key --init
|
||||||
sudo pacman-key --populate archlinux
|
sudo pacman-key --populate archlinux
|
||||||
@ -24,10 +24,11 @@ setup() {
|
|||||||
sudo pacman-key --populate archlabs
|
sudo pacman-key --populate archlabs
|
||||||
}
|
}
|
||||||
|
|
||||||
while ! ping -c1 8.8.8.8 &>/dev/null; do
|
while ! ping -c 1 www.github.com &>/dev/null; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
setup
|
setup_keyring &
|
||||||
|
|
||||||
sed -i '/keypack/d' "$HOME/.config/openbox/autostart"
|
sed -i '/keypack/d' "$HOME/.config/openbox/autostart"
|
||||||
rm -f "$HOME/.config/keypack"
|
rm -f "$HOME/.config/keypack"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[dmenu]
|
[dmenu]
|
||||||
dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "Ubuntu 10" -padding 20 -line-padding 4 -hide-scrollbar -password
|
dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 10" -padding 20 -line-padding 4 -hide-scrollbar -password
|
||||||
|
|
||||||
[editor]
|
[editor]
|
||||||
terminal = termite
|
terminal = termite
|
||||||
|
@ -5,6 +5,16 @@ al-compositor --start &
|
|||||||
# enable numlock, commented out for laptop users
|
# enable numlock, commented out for laptop users
|
||||||
# numlockx &
|
# numlockx &
|
||||||
|
|
||||||
|
# polkit, required for authentication
|
||||||
|
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
||||||
|
|
||||||
|
# keyring for storing saved passwords
|
||||||
|
gnome-keyring-daemon --start --components=pkcs11 &
|
||||||
|
|
||||||
|
# pressing super key alone simulates pressing Alt-F1
|
||||||
|
ksuperkey -e 'Super_L=Alt_L|F1' &
|
||||||
|
ksuperkey -e 'Super_R=Alt_L|F1' &
|
||||||
|
|
||||||
# restore wallpaper
|
# restore wallpaper
|
||||||
nitrogen --restore &
|
nitrogen --restore &
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ type = internal/cpu
|
|||||||
interval = 3
|
interval = 3
|
||||||
format-padding = 1
|
format-padding = 1
|
||||||
format = <label><ramp-coreload>
|
format = <label><ramp-coreload>
|
||||||
label = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
|
label = %percentage%%
|
||||||
ramp-coreload-0 = ▂
|
ramp-coreload-0 = ▂
|
||||||
ramp-coreload-1 = ▃
|
ramp-coreload-1 = ▃
|
||||||
ramp-coreload-2 = ▄
|
ramp-coreload-2 = ▄
|
||||||
@ -194,7 +194,7 @@ type = internal/memory
|
|||||||
interval = 3
|
interval = 3
|
||||||
format = <label>
|
format = <label>
|
||||||
label-padding = 1
|
label-padding = 1
|
||||||
label = %{A1:termite --exec=htop & disown:} %percentage_used%%%{A}
|
label = %percentage_used%%
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;
|
;;;;;;;;;
|
||||||
@ -204,7 +204,7 @@ label = %{A1:termite --exec=htop & disown:} %percentage_used%%%{A}
|
|||||||
type = custom/script
|
type = custom/script
|
||||||
exec = updates.sh
|
exec = updates.sh
|
||||||
exec-if = "ping -q -w 2 -c 1 176.34.135.167 > /dev/null"
|
exec-if = "ping -q -w 2 -c 1 176.34.135.167 > /dev/null"
|
||||||
label = %{A1:termite --exec=pacli & disown:} %{A3:termite --exec=pacli & disown:}%output%%{A} %{A}
|
label = %output%
|
||||||
tail = true
|
tail = true
|
||||||
|
|
||||||
|
|
||||||
@ -230,7 +230,7 @@ thermal-zone = 0
|
|||||||
warn-temperature = 70
|
warn-temperature = 70
|
||||||
format = <ramp><label>
|
format = <ramp><label>
|
||||||
format-padding = 1
|
format-padding = 1
|
||||||
label = %{A1:termite --exec='watch sensors' & disown:} %temperature%%{A}
|
label = %temperature%
|
||||||
ramp-0 = ""
|
ramp-0 = ""
|
||||||
ramp-1 = ""
|
ramp-1 = ""
|
||||||
ramp-2 = ""
|
ramp-2 = ""
|
||||||
@ -332,12 +332,10 @@ menu-1-3-exec = exo-open --launch FileManager
|
|||||||
menu-2-0 = " "
|
menu-2-0 = " "
|
||||||
menu-2-0-exec = menu-open-0
|
menu-2-0-exec = menu-open-0
|
||||||
menu-2-0-foreground = ${colors.urgent}
|
menu-2-0-foreground = ${colors.urgent}
|
||||||
menu-2-1 = " "
|
menu-2-1 = " "
|
||||||
menu-2-1-exec = termite --exec=pacli &
|
menu-2-1-exec = xfce4-settings-manager &
|
||||||
menu-2-2 = " "
|
menu-2-2 = " |"
|
||||||
menu-2-2-exec = xfce4-settings-manager &
|
menu-2-2-exec = pavucontrol &
|
||||||
menu-2-3 = " |"
|
|
||||||
menu-2-3-exec = pavucontrol &
|
|
||||||
# 3
|
# 3
|
||||||
menu-3-0 = " "
|
menu-3-0 = " "
|
||||||
menu-3-0-exec = menu-open-0
|
menu-3-0-exec = menu-open-0
|
||||||
|
@ -14,6 +14,9 @@ files=(
|
|||||||
"$HOME/.mozilla/firefox/archlabs.default/sessionstore.js"
|
"$HOME/.mozilla/firefox/archlabs.default/sessionstore.js"
|
||||||
)
|
)
|
||||||
|
|
||||||
for f in "${files[@]}"; do sed -i "s/liveuser/${USER}/g" "$f"; done
|
for f in "${files[@]}"; do
|
||||||
|
sed -i "s/liveuser/${USER}/g" "$f"
|
||||||
|
done
|
||||||
|
|
||||||
sed -i '/setup/d' "$HOME/.config/openbox/autostart"
|
sed -i '/setup/d' "$HOME/.config/openbox/autostart"
|
||||||
rm -f "$HOME/.config/setup"
|
rm -f "$HOME/.config/setup"
|
||||||
|
@ -19,7 +19,7 @@ browser = exo-open
|
|||||||
filter_unmatched_urls = true
|
filter_unmatched_urls = true
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
background = rgba(43,48,59,0.80)
|
background = rgba(43,48,59,0.95)
|
||||||
foreground = #c0c5ce
|
foreground = #c0c5ce
|
||||||
foreground_bold = #c0c5ce
|
foreground_bold = #c0c5ce
|
||||||
cursor = #c0c5ce
|
cursor = #c0c5ce
|
||||||
|
@ -4,8 +4,8 @@ Version=1.0
|
|||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Type=X-XFCE-Helper
|
Type=X-XFCE-Helper
|
||||||
X-XFCE-Category=TerminalEmulator
|
X-XFCE-Category=TerminalEmulator
|
||||||
X-XFCE-CommandsWithParameter=termite "%s"
|
X-XFCE-CommandsWithParameter=st "%s"
|
||||||
Icon=utilities-terminal
|
Icon=utilities-terminal
|
||||||
Name=Termite
|
Name=St
|
||||||
X-XFCE-Commands=termite
|
X-XFCE-Commands=st
|
||||||
GenericName=Termite
|
GenericName=Simple Terminal
|
||||||
|
@ -36,7 +36,7 @@ nnoremap n nzzzv
|
|||||||
nnoremap N Nzzzv
|
nnoremap N Nzzzv
|
||||||
nnoremap <Tab> ==j
|
nnoremap <Tab> ==j
|
||||||
|
|
||||||
" j=gj k=gk but preserve numbered jumps ie. 12j or 30k
|
" j = gj :: k = gk while preserving numbered jumps ie. 12j or 30k
|
||||||
nnoremap <buffer><silent><expr>j v:count ? 'j' : 'gj'
|
nnoremap <buffer><silent><expr>j v:count ? 'j' : 'gj'
|
||||||
nnoremap <buffer><silent><expr>k v:count ? 'k' : 'gk'
|
nnoremap <buffer><silent><expr>k v:count ? 'k' : 'gk'
|
||||||
|
|
||||||
|
@ -25,13 +25,24 @@ fi
|
|||||||
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
|
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
|
||||||
[ -f ~/.xprofile ] && source ~/.xprofile
|
[ -f ~/.xprofile ] && source ~/.xprofile
|
||||||
|
|
||||||
# keyring for storing passwords
|
# some things to start for awesome wm, other wm already have these started elsewhere
|
||||||
if hash gnome-keyring &>/dev/null; then
|
if [[ $session == "awesome" ]]; then
|
||||||
gnome-keyring-daemon --start --components=pkcs11 &
|
|
||||||
fi
|
# keyring for storing passwords
|
||||||
# gnome polkit
|
if hash gnome-keyring &>/dev/null; then
|
||||||
if [[ -x /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 ]]; then
|
gnome-keyring-daemon --start --components=pkcs11 &
|
||||||
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
fi
|
||||||
|
|
||||||
|
# gnome polkit
|
||||||
|
if [[ -x /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 ]]; then
|
||||||
|
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
|
||||||
|
fi
|
||||||
|
|
||||||
|
# simulate Alt+F1 with just pressing Super
|
||||||
|
if hash ksuperkey &>/dev/null; then
|
||||||
|
ksuperkey -e 'Super_L=Alt_L|F1' &
|
||||||
|
ksuperkey -e 'Super_R=Alt_L|F1' &
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# display timeout and sleep
|
# display timeout and sleep
|
||||||
@ -42,12 +53,6 @@ xset dpms 3600 3700 4000
|
|||||||
xset r rate 400 50
|
xset r rate 400 50
|
||||||
kbdrate -d 400 -r 50
|
kbdrate -d 400 -r 50
|
||||||
|
|
||||||
# simulate Alt+F1 with just pressing Super
|
|
||||||
if hash ksuperkey &>/dev/null; then
|
|
||||||
ksuperkey -e 'Super_L=Alt_L|F1' &
|
|
||||||
ksuperkey -e 'Super_R=Alt_L|F1' &
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 1/1 mouse acceleration
|
# 1/1 mouse acceleration
|
||||||
xset m 1/1
|
xset m 1/1
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ _usage() {
|
|||||||
OPTIONS:
|
OPTIONS:
|
||||||
-h,--help Display this message
|
-h,--help Display this message
|
||||||
-v,--version Display script version
|
-v,--version Display script version
|
||||||
-t,--terminal Toggle a floating work terminal, no additional options
|
|
||||||
-p,--polybar Toggle the configured polybar session, no additional options
|
-p,--polybar Toggle the configured polybar session, no additional options
|
||||||
-c,--compton Toggle compton or daemon monitoring icon, can use toggle option
|
-c,--compton Toggle compton or daemon monitoring icon, can use toggle option
|
||||||
-r,--redshift Toggle redshift or daemon monitoring icon, can use toggle option
|
-r,--redshift Toggle redshift or daemon monitoring icon, can use toggle option
|
||||||
@ -23,16 +22,6 @@ _usage() {
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
toggle_terminal() {
|
|
||||||
if pgrep --full "termite --title=Work --class=Work" &>/dev/null; then
|
|
||||||
pkill --full "termite --title=Work --class=Work"
|
|
||||||
else
|
|
||||||
termite --title=Work --class=Work &
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
toggle_polybar() {
|
toggle_polybar() {
|
||||||
if [[ $(pidof polybar) ]]; then
|
if [[ $(pidof polybar) ]]; then
|
||||||
pkill polybar
|
pkill polybar
|
||||||
@ -116,9 +105,6 @@ toggle_caffeine() {
|
|||||||
|
|
||||||
# Catch command line options
|
# Catch command line options
|
||||||
case $1 in
|
case $1 in
|
||||||
-t|--terminal)
|
|
||||||
toggle_terminal
|
|
||||||
;;
|
|
||||||
-p|--polybar)
|
-p|--polybar)
|
||||||
toggle_polybar
|
toggle_polybar
|
||||||
;;
|
;;
|
||||||
|
Reference in New Issue
Block a user