a/dotfiles
1
0
Fork 0
mirror of https://codeberg.org/andyscott/dotfiles.git synced 2024-11-13 15:50:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix rebase conflicts

Browse source
This commit is contained in:
Andrew Scott 2021-12-30 18:12:27 -05:00
parent 07fcd58bea
commit 1114dfb1ed
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/bspwm/bspwmrc
View file

@ -41,7 +41,6 @@ bspc rule -a teams-for-linux desktop='^9'
bspc rule -a tutanota-desktop desktop='^10' bspc rule -a tutanota-desktop desktop='^10'
bspc rule -a Thunderbird desktop='^10' bspc rule -a Thunderbird desktop='^10'
### Focus on 1st workspace by default ### Focus on 1st workspace by default
bspc desktop -f 1 bspc desktop -f 1

6
config/polybar/config.ini
View file

@ -34,9 +34,15 @@ dim-value = 1.0
locale = en_US.UTF-8 locale = en_US.UTF-8
font-0 = Hack:size=10;3 font-0 = Hack:size=10;3
<<<<<<< HEAD
font-1 = Font Awesome 6 Free:style=Solid:size=12;3 font-1 = Font Awesome 6 Free:style=Solid:size=12;3
font-2 = Font Awesome 6 Free:style=Regular:size=12;3 font-2 = Font Awesome 6 Free:style=Regular:size=12;3
font-3 = Font Awesome 6 Brands:style=Regular:size=12;3 font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
=======
font-1 = Font Awesome 5 Free:style=Solid:size=12;3
font-2 = Font Awesome 5 Free:style=Regular:size=12;3
font-3 = Font Awesome 5 Brands:style=Regular:size=12;3
>>>>>>> fd658c5 (Fix rebase conflicts)
modules-left = workspaces sep title modules-left = workspaces sep title
modules-center = spotify modules-center = spotify