lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' of ssh://git.lyte.dev:2222/lytedev/dotfiles into dev

Browse source
This commit is contained in:
Daniel Flanagan 2020-02-14 12:27:06 -06:00
commit 7ef3f33b39
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.gitignore vendored
View file

@ -3,30 +3,8 @@
*.pid *.pid
*.tmp *.tmp
*.secret *.secret
<<<<<<< HEAD
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp
# keep the pipelines but hide their results
/bin/pipelines/*/*/*
# a place to keep secrets per-env
/env/*/.hidden
# ... and a place to keep shared secrets
/env/.hidden
||||||| 0d0e131
/.repositories
/.env/
=======
fishd.tmp.* fishd.tmp.*
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp
# keep the pipelines but hide their results # keep the pipelines but hide their results
/bin/pipelines/*/*/* /bin/pipelines/*/*/*
@ -35,4 +13,7 @@ fishd.tmp.*
# ... and a place to keep shared secrets # ... and a place to keep shared secrets
/env/.hidden /env/.hidden
>>>>>>> master
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp

8
apps/de/polybar/config
View file

@ -128,10 +128,10 @@ ws-icon-9 = 10;0
ws-icon-default = - ws-icon-default = -
; misc icon: - ; misc icon: -
label-focused-font = 2 label-focused-font = 1
label-occupied-font = 2 label-occupied-font = 1
label-urgent-font = 2 label-urgent-font = 1
label-empty-font = 2 label-empty-font = 1
type = internal/bspwm type = internal/bspwm
pin-workspaces = false pin-workspaces = false