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

This commit is contained in:
Daniel Flanagan 2021-02-04 09:35:42 -06:00
commit 6667151f6f
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
6 changed files with 30 additions and 5 deletions

View file

@ -5,6 +5,12 @@ profile desktop-H {
exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-H-workspaces.sh" exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-H-workspaces.sh"
} }
profile desktop-H {
output "Samsung Electric Company SyncMaster H1AK500000" enable mode 3840x2160 position 0,0 scale 1 transform normal
output "Dell Inc. DELL U2719DC 5DL4QS2" disable
output "Dell Inc. DELL U2719DC 9DL4QS2" disable
}
profile desktop-H { profile desktop-H {
output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal
exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-single-workspace.sh" exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-single-workspace.sh"

View file

@ -1,7 +1,7 @@
{ {
"layer": "top", "layer": "top",
"position": "bottom", "position": "bottom",
"output": ["DP-2", "eDP-1"], "output": ["DP-1", "eDP-1"],
"height": 32, "height": 32,
"modules-left": ["sway/workspaces"], "modules-left": ["sway/workspaces"],
"modules-center": ["clock"], "modules-center": ["clock"],

View file

@ -77,3 +77,9 @@
path = $ENV_PATH/gitconfig path = $ENV_PATH/gitconfig
[color] [color]
ui = auto ui = auto
# This next lines include Netlify's Git Credential Helper configuration in your Git configuration.
[include]
path = /home/daniel/.home/.netlify/helper/git-config
[init]
defaultBranch = master

View file

@ -83,6 +83,7 @@ hi Normal ctermbg=NONE
hi ColorColumn ctermbg=18 hi ColorColumn ctermbg=18
hi TooLongColorColumn ctermbg=18 ctermfg=1 hi TooLongColorColumn ctermbg=18 ctermfg=1
hi ActiveBuffer ctermbg=4 ctermfg=0 hi ActiveBuffer ctermbg=4 ctermfg=0
hi DirtyBuffer ctermbg=3 ctermfg=0
hi StatusLine ctermbg=18 ctermfg=7 hi StatusLine ctermbg=18 ctermfg=7
hi StatusLineNC ctermbg=18 ctermfg=7 hi StatusLineNC ctermbg=18 ctermfg=7
@ -158,13 +159,24 @@ set foldtext=NeatFoldText()
" TODO: only update this portion when needed instead of every render? " TODO: only update this portion when needed instead of every render?
function! StatusLineBufferByNum(bufnum) function! StatusLineBufferByNum(bufnum)
let l:bufinfo = getbufinfo(a:bufnum)[0]
let l:prefix = ' %#InactiveBuffer#' let l:prefix = ' %#InactiveBuffer#'
let l:suffix = '%* ' let l:suffix = '%* '
let l:bufinfo = getbufinfo(a:bufnum)[0]
if l:bufinfo.changed
let l:prefix = '%#DirtyBuffer# '
let l:suffix = ' %*'
end
if l:bufinfo['hidden'] == 0 && index(l:bufinfo['windows'], g:statusline_winid) >= 0 if l:bufinfo['hidden'] == 0 && index(l:bufinfo['windows'], g:statusline_winid) >= 0
let l:prefix = '%#ActiveBuffer# ' let l:prefix = '%#ActiveBuffer# '
let l:suffix = ' %*' let l:suffix = ' %*'
if l:bufinfo.changed
let l:prefix = '%#ActiveBuffer# *'
let l:suffix = ' %*'
end
endif endif
return l:prefix . fnamemodify(bufname(a:bufnum), ':t') . l:suffix return l:prefix . fnamemodify(bufname(a:bufnum), ':t') . l:suffix
endfunction endfunction

View file

@ -5,9 +5,9 @@ alias tree 'ls --tree --level=3'
alias lA 'ls -a' alias lA 'ls -a'
alias ll 'ls -l' alias ll 'ls -l'
alias la 'll -a' alias la 'll -a'
alias lt 'll -t modified' alias lt 'll -s modified'
alias lT 'lt -r' alias lT 'lt -r'
alias lc 'lt -t accessed' alias lc 'lt -s accessed'
alias lC 'lc -r' alias lC 'lc -r'
set -gx CDPATH $CDPATH . $NICE_HOME set -gx CDPATH $CDPATH . $NICE_HOME

View file

@ -11,7 +11,8 @@ set -U fish_user_paths \
$HOME/.bin \ $HOME/.bin \
$HOME/.cargo/bin \ $HOME/.cargo/bin \
$HOME/.nimble/bin \ $HOME/.nimble/bin \
$HOME/.yarn/bin $HOME/.yarn/bin \
$HOME/.netlify/helper/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
test -d $HOME/.bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths test -d $HOME/.bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths