From f3502f27a875f1720528422193a4a2a768c470ea Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Jan 2021 10:52:25 -0600 Subject: [PATCH 1/7] Add neovim credential helper --- apps/git/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/git/config b/apps/git/config index 729fa9b..8f8ed6e 100644 --- a/apps/git/config +++ b/apps/git/config @@ -77,3 +77,7 @@ path = $ENV_PATH/gitconfig [color] 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 From 89a14f1164dce130f0ffbec439a15aa2eed0f138 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Jan 2021 10:52:45 -0600 Subject: [PATCH 2/7] Add dirty buffer indicator --- apps/neovim/init.vim | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 0233fc1..0a8876d 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -83,6 +83,7 @@ hi Normal ctermbg=NONE hi ColorColumn ctermbg=18 hi TooLongColorColumn ctermbg=18 ctermfg=1 hi ActiveBuffer ctermbg=4 ctermfg=0 +hi DirtyBuffer ctermbg=3 ctermfg=0 hi StatusLine ctermbg=18 ctermfg=7 hi StatusLineNC ctermbg=18 ctermfg=7 @@ -158,13 +159,20 @@ set foldtext=NeatFoldText() " TODO: only update this portion when needed instead of every render? function! StatusLineBufferByNum(bufnum) + let l:bufinfo = getbufinfo(a:bufnum)[0] let l:prefix = ' %#InactiveBuffer#' 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 let l:prefix = '%#ActiveBuffer# ' let l:suffix = ' %*' endif + return l:prefix . fnamemodify(bufname(a:bufnum), ':t') . l:suffix endfunction From 48e98aa8b483bbeeb7a6283107916e9de1a606c7 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Jan 2021 10:53:07 -0600 Subject: [PATCH 3/7] Fix recent file listing aliases --- apps/shell/fish/aliases.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/shell/fish/aliases.fish b/apps/shell/fish/aliases.fish index 5ad8222..2d2e656 100755 --- a/apps/shell/fish/aliases.fish +++ b/apps/shell/fish/aliases.fish @@ -5,9 +5,9 @@ alias tree 'ls --tree --level=3' alias lA 'ls -a' alias ll 'ls -l' alias la 'll -a' -alias lt 'll -t modified' +alias lt 'll -s modified' alias lT 'lt -r' -alias lc 'lt -t accessed' +alias lc 'lt -s accessed' alias lC 'lc -r' set -gx CDPATH $CDPATH . $NICE_HOME From 8b746ed181f868b90aea995b522662e8cda1e3a0 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 6 Jan 2021 10:53:27 -0600 Subject: [PATCH 4/7] Add netlify helper to path --- apps/shell/fish/paths.fish | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/shell/fish/paths.fish b/apps/shell/fish/paths.fish index a4cd5fc..8a63aae 100755 --- a/apps/shell/fish/paths.fish +++ b/apps/shell/fish/paths.fish @@ -11,7 +11,8 @@ set -U fish_user_paths \ $HOME/.bin \ $HOME/.cargo/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/.bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths From 44d5045060012936f531b63f556ec04d347f6ee3 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 15 Jan 2021 10:18:48 -0600 Subject: [PATCH 5/7] Dirty AND active buffer highlighting --- apps/de/kanshi/config | 6 ++++++ apps/de/waybar/config | 2 +- apps/git/config | 2 ++ apps/neovim/init.vim | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/de/kanshi/config b/apps/de/kanshi/config index adac056..26e0f35 100644 --- a/apps/de/kanshi/config +++ b/apps/de/kanshi/config @@ -5,6 +5,12 @@ profile desktop-H { 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 { 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" diff --git a/apps/de/waybar/config b/apps/de/waybar/config index e7871e9..9b2fa63 100644 --- a/apps/de/waybar/config +++ b/apps/de/waybar/config @@ -1,7 +1,7 @@ { "layer": "top", "position": "bottom", - "output": ["DP-2", "eDP-1"], + "output": ["DP-1", "eDP-1"], "height": 32, "modules-left": ["sway/workspaces"], "modules-center": ["clock"], diff --git a/apps/git/config b/apps/git/config index 8f8ed6e..ec636c2 100644 --- a/apps/git/config +++ b/apps/git/config @@ -81,3 +81,5 @@ # 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 diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 0a8876d..95f385e 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -171,6 +171,10 @@ function! StatusLineBufferByNum(bufnum) if l:bufinfo['hidden'] == 0 && index(l:bufinfo['windows'], g:statusline_winid) >= 0 let l:prefix = '%#ActiveBuffer# ' let l:suffix = ' %*' + if l:bufinfo.changed + let l:prefix = '%#ActiveBuffer# *' + let l:suffix = ' %*' + end endif return l:prefix . fnamemodify(bufname(a:bufnum), ':t') . l:suffix From 6dfc44629f4513f23a1a88bfd58855fce5fffce5 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 4 Feb 2021 09:35:11 -0600 Subject: [PATCH 6/7] Add some readme notes, remove some old stuff from setup script --- bin/setup-dotfiles | 5 ++--- readme.md | 12 ++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/setup-dotfiles b/bin/setup-dotfiles index 356ad2c..fbfd20e 100755 --- a/bin/setup-dotfiles +++ b/bin/setup-dotfiles @@ -4,6 +4,8 @@ dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) source "${dfp}/env/common/setup_helpers.bash" +export DOTFILES_PATH="${DOTFILES_PATH:-$dfp}" +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" test ! -d "$HOME/.env" && "$dfp/bin/choose-common-env" INTERACTIVE=1 @@ -33,8 +35,6 @@ links=( # text editor files "apps/neovim/" "$XDG_CONFIG_HOME/nvim" - "apps/neovim/" "$HOME/.vim" - "apps/neovim/init.vim" "$HOME/.vimrc" "env/common/colors/vim" "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim" "apps/emacs/" "$HOME/.emacs.lytedev" @@ -47,7 +47,6 @@ links=( "apps/de/waybar/" "$XDG_CONFIG_HOME/waybar" # irc files - "apps/irssi/" "$HOME/.irssi" "apps/weechat/" "$HOME/.weechat" # qutebrowser config files diff --git a/readme.md b/readme.md index 729c8c5..6c418eb 100644 --- a/readme.md +++ b/readme.md @@ -29,19 +29,27 @@ curl -s -L https://git.lyte.dev/lytedev/dotfiles/raw/branch/master/bin/init-dotf # To Do -+ Hibernation and proper automatic power controls ++ Get out of Google! + + `calcurse` for Calendar management? + + `aerc` or `neomutt` for email? + + My home-grown backup network for Drive? + + Photos? ++ Hibernation and proper power management for laptop? + **Learn to use `journalctl`** -+ Fix sway workspaces on desktop ++ Fix sway workspaces on desktop? + Neovim LSP + Move to NixOS (WIP) or Guix? Declarative is the future! + Better/more secure remote management configuration in dotfiles? [1][1] + Setup network file share? ++ Home VPN + Add vim in the terminal as the handler for many MIME types (xdg-open and such) for the rare time I'm in a file manager or for opening easily from the browser. + + This goes for navigating "into" a file in `nnn` + Unify all the common variables... somehow? (and use templates and `envsubst`?) + [Vimux](https://github.com/benmills/vimux)? + Investigate systemd services that may help with various tasks (homed, etc.) ++ Be more macOS friendly, since work may require that [upstream]: https://git.faceless.lytedev.io/lytedev/dotfiles From bb83db32db031eb75522efa20a2af48bb037ea01 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 5 Feb 2021 14:00:28 -0600 Subject: [PATCH 7/7] Slime-live ft detect --- apps/neovim/init.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim index 95f385e..b6dce2a 100644 --- a/apps/neovim/init.vim +++ b/apps/neovim/init.vim @@ -227,6 +227,11 @@ function! StatusLine() " endtry endfunction +augroup slime + au! + autocmd BufNewFile,BufRead *.slimleex set syntax=slim +augroup END + " set laststatus=0 showtabline tabline=%!StatusLine() set statusline=%!StatusLine()