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

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"

apps/de/sway/config

@@ -23,6 +23,10 @@ hide_edge_borders smart_no_gaps
 default_border pixel 5
 focus_follows_mouse no
 
+input type:touchscreen {
+	events disabled
+}
+
 input type:keyboard {
 	repeat_delay 200
 	repeat_rate 60

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"],

apps/git/config

@@ -77,3 +77,9 @@
 	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
+[init]
+	defaultBranch = master

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,24 @@ 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 = ' %*'
+		if l:bufinfo.changed
+			let l:prefix = '%#ActiveBuffer# *'
+			let l:suffix = ' %*'
+		end
 	endif
+
 	return l:prefix . fnamemodify(bufname(a:bufnum), ':t') . l:suffix
 endfunction
 
@@ -215,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()
 

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

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

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

bin/wm

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+"$(dirname $0)/../apps/de/sway/init"

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