Goyslop/voidrice
1
0
Fork 0
mirror of https://github.com/LukeSmithxyz/voidrice.git synced 2026-03-20 01:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Conflict

Browse Source
This commit is contained in:
Dr. Amr Osman 2019-04-18 11:24:46 +02:00
commit 8c21131dbb
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/dunst/dunstrc
View File

@ -24,7 +24,7 @@
sort = yes sort = yes
idle_threshold = 120 idle_threshold = 120
font = UbuntuMono Nerd Font 10 font = Ubuntu Mono 10
line_height = 0 line_height = 0
markup = full markup = full

6
.config/i3/config
View File

@ -10,7 +10,7 @@
# #---Basic Definitions---# # # #---Basic Definitions---# #
# Needed for i3-gaps # Needed for i3-gaps
#new_window normal #new_window normal
for_window [class="^.*"] border pixel 3 for_window [class="^.*"] border pixel 1
for_window [class="mpv"] floating enable for_window [class="mpv"] floating enable
for_window [title="^nmtui$"] floating enable for_window [title="^nmtui$"] floating enable
for_window [class="^Pavucontrol$"] floating enable for_window [class="^Pavucontrol$"] floating enable
@ -96,7 +96,7 @@ client.background $black
bar { bar {
#font pango: SFNS Display:style=Regular 10 #font pango: SFNS Display:style=Regular 10
font pango:Source Sans Pro 10 font pango:Ubuntu 10
colors { colors {
background $darkblack background $darkblack
statusline $darkwhite statusline $darkwhite
@ -439,7 +439,7 @@ bindsym XF86WLAN exec $netrefresh
bindsym $mod+period exec /usr/lib/virtualbox/VirtualBoxVM --comment 'w7litex86' --startvm '{196d2f4b-8a17-44fb-b05f-4a20cc87a212}' bindsym $mod+period exec /usr/lib/virtualbox/VirtualBoxVM --comment 'w7litex86' --startvm '{196d2f4b-8a17-44fb-b05f-4a20cc87a212}'
exec_always --no-startup-id notify-send -i ~/.scripts/pix/larbs.png '<b>Welcome to LARBS:</b> Press Super+F1 for the manual.' -t 10000 exec_always --no-startup-id notify-send -i ~/.scripts/pix/larbs.png "Welcome to LARBS:" "Press Super+F1 for the manual." -t 10000
bindsym $mod+section exec --no-startup-id xkblayout-state set +1 && pkill -RTMIN+18 i3blocks bindsym $mod+section exec --no-startup-id xkblayout-state set +1 && pkill -RTMIN+18 i3blocks
bindsym $mod+grave exec --no-startup-id xkblayout-state set +1 && pkill -RTMIN+18 i3blocks bindsym $mod+grave exec --no-startup-id xkblayout-state set +1 && pkill -RTMIN+18 i3blocks

5
.config/vifm/vifmrc
View File

@ -89,6 +89,7 @@ fileviewer *.md,*.xml,*.css,*.py,*.c,*.h,*.sh,*.diff,*.tex,*.md,*.bib,*.sty,*.de
fileviewer *.html w3m -dump %c fileviewer *.html w3m -dump %c
filextype *.html,*.htm firefox %f 2>/dev/null & filextype *.html,*.htm firefox %f 2>/dev/null &
<<<<<<< HEAD
set history=100 set history=100
" Automatically resolve symbolic links on l or Enter. " Automatically resolve symbolic links on l or Enter.
@ -241,6 +242,10 @@ filextype *.ps,*.eps,*.ps.gz
\ zathura %f, \ zathura %f,
\ {View in gv} \ {View in gv}
\ gv %c %i &, \ gv %c %i &,
=======
fileviewer *.docx docx2txt %c -
fileviewer *.odt odt2txt %c -
>>>>>>> x250
" Djvu " Djvu
filextype *.djvu filextype *.djvu