Merge branch 'dev' of ssh://git.lyte.dev:2222/lytedev/dotfiles into dev
This commit is contained in:
commit
d48567987d
6 changed files with 11 additions and 9 deletions
|
@ -6,8 +6,8 @@ if has('nvim')
|
||||||
let $vimdir = $XDG_CONFIG_HOME.'/nvim'
|
let $vimdir = $XDG_CONFIG_HOME.'/nvim'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if filereadable($ENV_PATH."/vim")
|
if filereadable("$ENV_PATH/vim")
|
||||||
source $ENV_PATH."/vim"
|
source "$ENV_PATH/vim"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call plug#begin($vimdir.'/bundle')
|
call plug#begin($vimdir.'/bundle')
|
||||||
|
|
|
@ -10,6 +10,7 @@ set -U fish_user_paths \
|
||||||
$ENV_PATH/.hidden/bin \
|
$ENV_PATH/.hidden/bin \
|
||||||
$HOME/.bin \
|
$HOME/.bin \
|
||||||
$HOME/.cargo/bin \
|
$HOME/.cargo/bin \
|
||||||
|
$HOME/.nimble/bin \
|
||||||
$HOME/.yarn/bin
|
$HOME/.yarn/bin
|
||||||
|
|
||||||
test -d $HOME/.local/bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths
|
test -d $HOME/.local/bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths
|
||||||
|
|
|
@ -7,6 +7,7 @@ PATH="$DOTFILES_PATH/bin":$PATH
|
||||||
PATH="$ENV_PATH/bin":$PATH
|
PATH="$ENV_PATH/bin":$PATH
|
||||||
[ -d "$HOME/.bin" ] && PATH=$PATH:"$HOME/.bin"
|
[ -d "$HOME/.bin" ] && PATH=$PATH:"$HOME/.bin"
|
||||||
PATH=$PATH:"$HOME/.cargo/bin"
|
PATH=$PATH:"$HOME/.cargo/bin"
|
||||||
|
PATH=$PATH:"$HOME/.nimble/bin"
|
||||||
PATH=$PATH:"$HOME/.yarn/bin"
|
PATH=$PATH:"$HOME/.yarn/bin"
|
||||||
PATH=$PATH:"$GOPATH/bin"
|
PATH=$PATH:"$GOPATH/bin"
|
||||||
[ -d "$HOME/.local/bin" ] && PATH=$PATH:"$HOME/.local/bin"
|
[ -d "$HOME/.local/bin" ] && PATH=$PATH:"$HOME/.local/bin"
|
||||||
|
|
2
env/laptop/bin/undock
vendored
2
env/laptop/bin/undock
vendored
|
@ -3,7 +3,7 @@
|
||||||
resrc
|
resrc
|
||||||
"${DOTFILES_PATH}/apps/de/x/loadresources"
|
"${DOTFILES_PATH}/apps/de/x/loadresources"
|
||||||
autorandr --change
|
autorandr --change
|
||||||
"${DOTFILES_PATH}/apps/de/bspwm/bspwmrc"
|
"${DOTFILES_PATH}/apps/de/bspwm/rc"
|
||||||
"${DOTFILES_PATH}/apps/de/x/loadresources"
|
"${DOTFILES_PATH}/apps/de/x/loadresources"
|
||||||
restartbar
|
restartbar
|
||||||
"${HOME}/.fehbg"
|
"${HOME}/.fehbg"
|
||||||
|
|
3
env/laptop/bin/workdock
vendored
3
env/laptop/bin/workdock
vendored
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
autorandr --change
|
autorandr --change
|
||||||
xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800
|
xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800
|
||||||
"${DOTFILES_PATH}/apps/de/x/loadresources"
|
|
||||||
xrdb -merge "$ENV_PATH/x/docked.resources"
|
|
||||||
"${DOTFILES_PATH}/apps/de/bspwm/rc"
|
"${DOTFILES_PATH}/apps/de/bspwm/rc"
|
||||||
|
xrdb -merge "$ENV_PATH/x/docked.resources"
|
||||||
restartbar
|
restartbar
|
||||||
"${HOME}/.fehbg"
|
"${HOME}/.fehbg"
|
||||||
|
|
9
env/laptop/x/resources
vendored
9
env/laptop/x/resources
vendored
|
@ -1,13 +1,14 @@
|
||||||
#define mono_font iosevka-lyte
|
#define mono_font iosevka-lyte
|
||||||
|
#define mono_font_size 12
|
||||||
#define bar_font_size 12
|
#define bar_font_size 12
|
||||||
#define icon_font Font Awesome 5 Free Solid
|
#define icon_font Font Awesome 5 Free Solid
|
||||||
#define icon_font_size 12
|
#define icon_font_size 12
|
||||||
|
|
||||||
*.font: xft:Iosevka Nerd Font Mono:pixelsize=12,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
*.font: xft:mono_font:pixelsize=mono_font_size,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
||||||
*.boldFont: xft:Iosevka Nerd Font Mono:style=bold:pixelsize=12,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
*.boldFont: xft:mono_font:style=bold:pixelsize=mono_font_size,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
||||||
|
|
||||||
URxvt.font: xft:Iosevka Nerd Font Mono:pixelsize=32,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
# URxvt.font: xft:mono_font:pixelsize=32,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
||||||
URxvt.boldFont: xft:Iosevka Nerd Font Mono:style=bold:pixelsize=32,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
# URxvt.boldFont: xft:mono_font:style=bold:pixelsize=32,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
|
||||||
|
|
||||||
dpi: 190
|
dpi: 190
|
||||||
.dpi: 190
|
.dpi: 190
|
||||||
|
|
Reference in a new issue