solved conflicts
This commit is contained in:
@@ -34,7 +34,7 @@ bright_white = '0xd7d7d7'
|
|||||||
|
|
||||||
|
|
||||||
[bar/top]
|
[bar/top]
|
||||||
monitor = ${env:MONITOR}
|
monitor = ${env:MONITOR:eDP-1}
|
||||||
width = 100%
|
width = 100%
|
||||||
height = 30
|
height = 30
|
||||||
;offset-x = 1%
|
;offset-x = 1%
|
||||||
@@ -135,6 +135,7 @@ format-unmounted = <label-unmounted>
|
|||||||
|
|
||||||
mount-0 = /
|
mount-0 = /
|
||||||
mount-1 = /media
|
mount-1 = /media
|
||||||
|
mount-2 = /home
|
||||||
|
|
||||||
label-mounted = %{F#55b7b7}%mountpoint%%{F-}: %free%
|
label-mounted = %{F#55b7b7}%mountpoint%%{F-}: %free%
|
||||||
label-unmounted = %mountpoint%
|
label-unmounted = %mountpoint%
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
':/media/Downloads/Old Linux Games (x86)/Heavy Metal FAKK2
|
|
||||||
v:/home/tristan/build/rineja/app/views
|
v:/home/tristan/build/rineja/app/views
|
||||||
a:/home/tristan/build/rineja/app/assets
|
a:/home/tristan/build/rineja/app/assets
|
||||||
c:/home/tristan/build/rineja/app/controllers
|
c:/home/tristan/build/rineja/app/controllers
|
||||||
|
|||||||
Reference in New Issue
Block a user