More moving things around...

.gitignore

@@ -6,13 +6,10 @@
 fishd.tmp.*
 
 # keep the pipelines but hide their results
-/bin/pipelines/*/*/*
+/env/common/data/pipelines/*/*/*
 
 # a place to keep secrets per-env
-/env/*/.hidden
+.hidden
-
-# ... and a place to keep shared secrets
-/env/.hidden
 
 # TODO: should be unnecessary once color generation is homegrown
 /colors/gen/vendor

Makefile

@@ -1,7 +1,5 @@
 MAKEFILE_PATH ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-all: install
+.PHONY: install
-default: install
-
 install:
-	cd ${MAKEFILE_PATH} && ./setup.bash
+	@cd ${MAKEFILE_PATH} && ./bin/setup-dotfiles

apps/de/sway/config

@@ -4,7 +4,7 @@
 # + Super+Control+{1-9} should control the size of the preselect space.
 # + Super+Shift+b should balance the size of all selected nodes.
 
-set $dfpbin $HOME/.config/dotfiles/bin
+set $dfpbin $HOME/.config/lytedev-dotfiles/bin
 set $mod Mod4
 set $default_gap 0
 
@@ -167,4 +167,5 @@ bar {
 exec gammastep -t 6500:3500 -l 39.0:-94.5
 exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000'
 
-include $HOME/.env/sway/config.d/main
+include $HOME/.env/sway/main
+# include $HOME/.env/sway/config.d/*

apps/de/sway/init

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME="$HOME/.config"
-[ -z "$DOTFILES_PATH" ] && export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
+[ -z "$DOTFILES_PATH" ] && export DOTFILES_PATH="$XDG_CONFIG_HOME/lytedev-dotfiles"
 
 . "$DOTFILES_PATH/bin/prelude"
 

apps/kanshi/config

@@ -2,7 +2,7 @@ profile desktop-H  {
   output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal
   output "Dell Inc. DELL U2719DC 5DL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform 90
   output "Dell Inc. DELL U2719DC 9DL4QS2" enable mode 2560x1440@60Hz position 4880,0 scale 1 transform 270
-  exec "$HOME/.config/dotfiles/apps/kanshi/desktop-H-workspaces.sh"
+  exec "$HOME/.config/lytedev-dotfiles/apps/kanshi/desktop-H-workspaces.sh"
 }
 
 profile laptop-solo {

apps/shell/bash/rc

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export XDG_CONFIG_HOME="$HOME/.config"
-export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
+export DOTFILES_PATH="$XDG_CONFIG_HOME/lytedev-dotfiles"
 
 . "$DOTFILES_PATH/bin/prelude"
 

apps/shell/fish/config.fish

@@ -1,7 +1,7 @@
 #!/usr/bin/env fish
 
 set -Ux XDG_CONFIG_HOME $HOME/.config
-set -Ux DOTFILES_PATH $XDG_CONFIG_HOME/dotfiles
+set -Ux DOTFILES_PATH $XDG_CONFIG_HOME/lytedev-dotfiles
 set -Ux ENV_PATH $HOME/.env
 
 source $DOTFILES_PATH/apps/shell/fish/paths.fish
@@ -51,4 +51,12 @@ for cf in config.fish .hidden/config.fish
 	test -f $f && source $f
 end
 
+# TODO: completion
+function src-hidden-dir
+	not scount $argv && echo "No directory specified" && exit 1
+	set f $ENV_PATH/.hidden/fish.d/$argv[1]/config.fish
+	echo "Checking $f..."
+	test -f $f && source $f
+end
+
 mkdir -p $NOTES_PATH $USER_LOGS_PATH $SCROTS_PATH

apps/shell/tmux/conf

@@ -47,7 +47,7 @@ bind-key h switch-client -p
 bind-key k switch-client -n
 bind-key l switch-client -n
 # bind s run-shell "tmux new-window sh -c "$DOTFILES_PATH/bin/tmuxswitcher""
-bind s run-shell "tmux new-window \"sh -c ~/.config/dotfiles/bin/tmuxswitcher\""
+bind s run-shell "tmux new-window \"sh -c ~/.config/lytedev-dotfiles/bin/tmuxswitcher\""
 
 # reset the working directory of the current session
 bind-key P attach-session -t . -c "#{pane_current_path}" \; display-message "Reset session dir to #{pane_current_path}"
@@ -60,10 +60,10 @@ set -g status-interval 5
 set -g status-right-length 80
 set -g status-right "#[fg=colour4]#W#[fg=default]#[bg=default] #H"
 set -g status-left-length 200
-set -g status-left "#[fg=colour7]#(~/.config/dotfiles/bin/tmux-session-list #S)"
+set -g status-left "#[fg=colour7]#(~/.config/lytedev-dotfiles/bin/tmux-session-list #S)"
 set -g message-style "fg=colour7 bg=colour18"
 
-bind-key O display-message "#(~/.config/dotfiles/bin/tmux-save-buffer #S)"
+bind-key O display-message "#(~/.config/lytedev-dotfiles/bin/tmux-save-buffer #S)"
 
 # pane split line colors
 set -g pane-active-border-style bg=black,fg=blue

bin/app-launcher

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
-source "$HOME/.config/dotfiles/bin/prelude"
+source "$(dirname "$0")/prelude"
 floating-term sh -c "launch | xargs swaymsg exec --"

bin/choose-common-env

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+machines_path="$DOTFILES_PATH/env/common/machines"
+machine="$(
+	cd "$machines_path" && \
+		find ./ -mindepth 1 -maxdepth 1 -type d | \
+		cut -c3- | \
+		fzf --prompt "Choose your machine > ")"
+ezln "$machines_path/$machine" "$ENV_PATH"
+echo "Symlinked '$(realpath "$machines_path/$machine")' to your ENV_PATH ('$ENV_PATH')"

bin/init-dotfiles

@@ -5,7 +5,7 @@
 root_home="/root"
 daniel_home="/home/daniel/.home"
 nice_home="/home/daniel"
-dotfiles="/.config/dotfiles"
+dotfiles="/.config/lytedev-dotfiles"
 
 add_unstable_channel() {
 	nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable

bin/pipeline

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-SAVED_PIPELINE_DIR="$DOTFILES_PATH/bin/pipelines"
+SAVED_PIPELINE_DIR="$DOTFILES_PATH/env/common/data/pipelines"
 mkdir -p "$SAVED_PIPELINE_DIR"
 
 if [ -n "${1+x}" ]; then

bin/pipelines/b64/transform

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# for /home/daniel/.home/.config/dotfiles/.env/pipelines/b64/pipeline.VRMehQda
-
-base64

bin/pipelines/base64/transform

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# for /home/daniel/.home/.config/dotfiles/.env/pipelines/base64/tmp_pipeline.ca7uoTRo
-
-base64

bin/pipelines/linewise/transform

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# for /home/daniel/.home/.config/dotfiles/.env/pipelines/linewise/tmp_pipeline.epyGqDjQ
-
-linewise base64

bin/pipelines/test/transform

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# for /home/daniel/.home/.config/dotfiles/.env/pipelines/test/pipeline.Zpgm8j42
-
-base64

bin/pipelines/xxd/transform

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# for /home/daniel/.home/.config/dotfiles/.env/pipelines/xxd/tmp_pipeline.dmXdfyZv
-
-hexyl

bin/prelude

@@ -4,8 +4,9 @@
 # be loaded and properly set by every script - this means you are responsible
 # for making sure they're loaded!
 export XDG_CONFIG_HOME="$HOME/.config"
-export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
+export DOTFILES_PATH="$XDG_CONFIG_HOME/lytedev-dotfiles"
 export ENV_PATH="$HOME/.env"
+
 export TERMINAL="kitty"
 
 # TODO: better logic for auto-detecting alternative home directories?

bin/setup-dotfiles

@@ -2,8 +2,8 @@
 
 # TODO: quiet/auto-agree mode for curl | bash automagic?
 
-dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/" && pwd)
+dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd)
-source "${dfp}/lib/setup_helpers.bash"
+source "${dfp}/env/common/setup_helpers.bash"
 
 INTERACTIVE=1
 
@@ -16,9 +16,6 @@ while test $# -gt 0; do
 	esac
 done
 
-# TODO: note about setting up ~/.env (link to a folder in ./env)
-# should prompt user, perhaps?
-
 links=(
 	# desktop environment files
 	"apps/de/bspwm/rc"                  "$XDG_CONFIG_HOME/bspwm/bspwmrc"
@@ -34,7 +31,7 @@ links=(
 	"apps/de/compton/compton.conf"      "$XDG_CONFIG_HOME/compton.conf"
 	"apps/de/dunst/rc"                  "$XDG_CONFIG_HOME/dunst/dunstrc"
 	"apps/de/mako/"                     "$XDG_CONFIG_HOME/mako"
-	"bin/lib/colors/xresources"         "$HOME/.Xresources.colors"
+	"env/common/colors/xresources"      "$HOME/.Xresources.colors"
 
 	# shell files
 	"apps/shell/bash/rc"                "$HOME/.bashrc"
@@ -47,7 +44,7 @@ links=(
 	"apps/neovim/"                      "$XDG_CONFIG_HOME/nvim"
 	"apps/neovim/"                      "$HOME/.vim"
 	"apps/neovim/init.vim"              "$HOME/.vimrc"
-	"bin/lib/colors/vim"                "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim"
+	"env/common/colors/vim"             "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim"
 	"apps/emacs/"                       "$HOME/.emacs.lytedev"
 
 	# gtk configuration files
@@ -130,18 +127,16 @@ links=(
 	"apps/kanshi"                      "$XDG_CONFIG_HOME/kanshi"
 )
 
-chmod 700 -R "$HOME/.bin"
-
 # TODO: pass interactive?
 _dotfiles_setup_run_setup "$dfp/.agreed-to-erasing-files.lock" "${links[@]}"
 
 if [[ "$INTERACTIVE" = 1 ]]; then
-	echo -n -e "Do you want to run the bin/lib/sudo_setup script for changes to /etc"
+	echo -n -e "Do you want to run the env/common/sudo_setup script for changes to /etc"
 	echo -n -e "\nand other root directories?"
 	read -r -p " [y/N] " response
 	response=${response,,} # to lower case
 	if [[ $response =~ ^(yes|y)$ ]]; then
-		"$dfp/bin/lib/sudo_setup"
+		"$dfp/env/common/sudo_setup"
 	fi
 
 	# execute the user's shell

env/common/data/pipelines/b64/transform

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# for /home/daniel/.home/.config/lytedev-dotfiles/.env/pipelines/b64/pipeline.VRMehQda
+
+base64

env/common/data/pipelines/base64/transform

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# for /home/daniel/.home/.config/lytedev-dotfiles/.env/pipelines/base64/tmp_pipeline.ca7uoTRo
+
+base64

env/common/data/pipelines/linewise/transform

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# for /home/daniel/.home/.config/lytedev-dotfiles/.env/pipelines/linewise/tmp_pipeline.epyGqDjQ
+
+linewise base64

env/common/data/pipelines/test/transform

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# for /home/daniel/.home/.config/lytedev-dotfiles/.env/pipelines/test/pipeline.Zpgm8j42
+
+base64

env/common/data/pipelines/xxd/transform

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# for /home/daniel/.home/.config/lytedev-dotfiles/.env/pipelines/xxd/tmp_pipeline.dmXdfyZv
+
+hexyl

env/common/machines/laptop/laptop

@@ -0,0 +1 @@
+/home/daniel/.home/.config/dotfiles/env/common/machines/laptop

env/common/machines/laptop/sway/main

@@ -0,0 +1,5 @@
+exec libinput-gestures -c $HOME/.config/lytedev-dotfiles/apps/de/libinput/sway-gestures.conf
+bindswitch lid:toggle exec swaylock
+input type:keyboard {
+	xkb_options ctrl:nocaps
+}

env/desktop/bash

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-hb="$ENV_PATH/.hidden/bash"
-[ -f "$hb" ] && . "$hb"

env/desktop/bspwm

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# TODO: this doesn't quite work all the time
-export REVERSE_DESKTOP_ORDERING=1

env/desktop/config.fish

@@ -1,13 +0,0 @@
-#!/usr/bin/env fish
-
-# TODO: completion
-function src-hidden-dir
-	not scount $argv && echo "No directory specified" && exit 1
-	set f $ENV_PATH/.hidden/fish.d/$argv[1]/config.fish
-	echo "Checking $f..."
-	test -f $f && source $f
-end
-
-set hc $ENV_PATH/.hidden/config.fish
-test -f $hc && source $hc
-

env/desktop/nix/base.nix

@@ -1,105 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.	Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-	imports = [
-		./hardware-configuration.nix
-		# TODO: fork?
-		(import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos")
-	];
-
-	home-manager.users.daniel = {
-	}
-
-	# TODO: bootloader will vary by device
-	boot = {
-		supportedFilesystems = [ "exfat" ];
-		loader = {
-			grub = {
-				enable = true;
-				version = 2;
-				device = "/dev/sda";
-			};
-		};
-	};
-
-	networking = {
-		hostName = "nether";
-		useDHCP = true;
-		firewall = {
-			allowedTCPPorts = [ 22 80 443 7770 ];
-			allowedUDPPorts = [ 53 57 63 67 7770 ];
-			# enable = false;
-		};
-	};
-
-	i18n.defaultLocale = "en_US.UTF-8";
-	console = {
-		font = "Lat2-Terminus16";
-		keyMap = "us";
-	};
-
-	time.timeZone = "America/Chicago";
-
-	environment = {
-		systemPackages = with pkgs; [
-			wget lsof vim git curl fish fzf neovim
-		];
-		variables.EDITOR = "nvim";
-	};
-
-	services = {
-		openssh.enable = true;
-
-		xserver = {
-			enable = true;
-			layout = "us";
-			libinput.enable = true;
-			desktopManager.plasma5.enable = true;
-		};
-	};
-
-	fonts = {
-		enableFontDir = true;
-		enableGhostscriptFonts = true;
-
-		fontconfig = {
-			enable = true;
-			antialias = true;
-			useEmbeddedBitmaps = true;
-
-			defaultFonts = {
-				serif = [ "Iosevka Type" ];
-				sansSerif = [ "Iosevka Type" ];
-				monospace = [ "Iosevka Type" ];
-			};
-		};
-
-		fonts = with pkgs; [
-			iosevka
-			nerdfonts
-		];
-	};
-
-	sound.enable = true;
-	hardware.pulseaudio.enable = true;
-
-	users.extraUsers.daniel = {
-		isNormalUser = true;
-		group = "users";
-		extraGroups = [ "wheel" ];
-		home = "/home/daniel/.home";
-		shell = pkgs.fish;
-		createHome = true;
-		uid = 1000;
-	};
-
-	nixpkgs.config = {
-		allowUnfree = true;
-	};
-
-	system.stateVersion = "20.03";
-}

env/laptop/bin/gamedock

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-autorandr --load games
-xrandr --output eDP1 --mode 1600x900
-"${DOTFILES_PATH}/apps/de/bspwm/rc"
-xrdb -merge "$ENV_PATH/x/games.resources"
-restartbar
-"${HOME}/.fehbg"

env/laptop/bin/homedock

@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-autorandr --change
-xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800
-xrdb -merge "$ENV_PATH/x/docked.resources"
-xrdb -merge "$ENV_PATH/x/home.docked.resources"
-"${DOTFILES_PATH}/apps/de/bspwm/rc"
-restartbar
-"${HOME}/.fehbg"

env/laptop/bin/undock

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-resrc
-"${DOTFILES_PATH}/apps/de/x/loadresources"
-autorandr --change
-"${DOTFILES_PATH}/apps/de/bspwm/rc"
-"${DOTFILES_PATH}/apps/de/x/loadresources"
-restartbar
-"${HOME}/.fehbg"

env/laptop/bin/workdock

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-autorandr --change
-xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800
-xrdb -merge "$ENV_PATH/x/docked.resources"
-"${DOTFILES_PATH}/apps/de/bspwm/rc"
-restartbar
-"${HOME}/.fehbg"

env/laptop/config.fish

@@ -1,12 +0,0 @@
-#!/usr/bin/env fish
-
-# TODO: completion
-function src-hidden-dir
-  not scount $argv && echo "No directory specified" && exit 1
-  set f $ENV_PATH/.hidden/fish.d/$argv[1]/config.fish
-  echo "Checking $f..."
-  test -f $f && source $f
-end
-
-set hc $ENV_PATH/.hidden/config.fish
-test -f $hc && source $hc

env/laptop/hardware.nix

@@ -1,32 +0,0 @@
-# Do not modify this file!	It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.	Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
-
-{
-	imports =
-		[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
-		];
-
-	boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
-	boot.initrd.kernelModules = [ ];
-	boot.kernelModules = [ "kvm-intel" ];
-	boot.extraModulePackages = [ ];
-
-	fileSystems."/" =
-		{ device = "/dev/disk/by-uuid/d1d92974-c0c0-4566-8131-c3dda9b21122";
-			fsType = "ext4";
-		};
-
-	fileSystems."/boot" =
-		{ device = "/dev/disk/by-uuid/3EB9-C18F";
-			fsType = "vfat";
-		};
-
-	swapDevices = [ ];
-
-	nix.maxJobs = lib.mkDefault 4;
-	powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-	# High-DPI console
-	console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
-}

env/laptop/sway/config.d/main

@@ -1,5 +0,0 @@
-exec libinput-gestures -c $HOME/.config/dotfiles/apps/de/libinput/sway-gestures.conf
-bindswitch lid:toggle exec swaylock
-input type:keyboard {
-	xkb_options ctrl:nocaps
-}

readme.md

@@ -1,4 +1,4 @@
-# dotfiles by lytedev
+# lytedev's dotfiles
 
 This repository is undergoing some massive changes.
 
@@ -11,9 +11,9 @@ curl -s -L https://git.lyte.dev/lytedev/dotfiles/raw/branch/master/bin/init-dotf
 [🖥️ Upstream][upstream] • [🐙 GitHub Mirror][github]
 
 
-## Improvements
+## To Do
 
-+ Move to NixOS or Guix? Declarative is the future!
++ Move to NixOS (WIP) or Guix? Declarative is the future!
 + Custom Iosevka font with kitty-compatible ligatures?
 + Makefile instead of setup script
 + `c` (and similar aliases) could utilize `CDPATH` envvar?