mirror of
https://github.com/m-housh/dotfiles.git
synced 2026-02-15 14:42:37 +00:00
Compare commits
6 Commits
746167a9c8
...
af7b46efa5
| Author | SHA1 | Date | |
|---|---|---|---|
|
af7b46efa5
|
|||
|
f269906fd5
|
|||
|
307a971371
|
|||
|
6b13291fff
|
|||
|
b4b7fa0a84
|
|||
|
d166c246ef
|
26
TODO.md
26
TODO.md
@@ -5,15 +5,33 @@
|
||||
- [ ] Update README, it's way out of date.
|
||||
- [x] Separate scripts that are used for configurations / store them somewhere aside
|
||||
from `~/.local/bin`
|
||||
- [x] Add neomutt configuration files into the repo (or probably a private repo)
|
||||
- [x] Clipse didn't work when installed on a new machine when I try to use the
|
||||
config in the dotfiles, but works if I use the default config. Need to explore
|
||||
why (current thoughts are it has to do with creating the
|
||||
clipboard_history.json file and not letting clipse do it automatically).
|
||||
- [ ] Need to confirm bootstrap does things properly with git submodules.
|
||||
- [ ] Need to ensure ssh keys are setup before private submodules are loaded / installed,
|
||||
so I need to make sure that Yubikey setup runs early and works for ssh authentication.
|
||||
- [ ] Need to add the following system packages for neovim/render-markdown.nvim
|
||||
- [ ] `libtexprintf`
|
||||
|
||||
### Keyboard / kanata
|
||||
|
||||
- [ ] Move keyboard (kanata) systemd service to be started as a '--user' service, as
|
||||
it seems to not work when used on a desktop (mac mini) vs. laptop.
|
||||
- [ ] Need to update kanatactl to generate udev rules, etc. (see
|
||||
here)[https://github.com/jtroo/kanata/blob/main/docs/setup-linux.md]
|
||||
- [x] Add neomutt configuration files into the repo (or probably a private repo)
|
||||
- [ ] Need to confirm bootstrap does things properly with git submodules.
|
||||
- [ ] Need to ensure ssh keys are setup before private submodules are loaded / installed,
|
||||
so I need to make sure that Yubikey setup runs early and works for ssh authentication.
|
||||
- [ ] Need to rethink symbol / number keyboard layers.
|
||||
- [ ] Move symbols to their own layer.
|
||||
- [ ] I would like to have a symbols layer that I can hold modifier keys with a symbol
|
||||
and would also like to possibly pass through underlying key / experiment so that
|
||||
I can use default keybinds in certain applications (i.e. neovim `[b`, etc.).
|
||||
### Runs (package installs)
|
||||
|
||||
- [ ] Should runs just export / echo a list of packages, then the `run` script can handle the package
|
||||
manager options / command.
|
||||
- [ ] Think about adding an `after` directory for runs, so that they can perform setup tasks after
|
||||
the packages are installed.
|
||||
- [ ] The `after` file should have the same name as the `run` file.
|
||||
- [ ] This could allow to remove / move the `system` script into the `after` directory.
|
||||
|
||||
4
env/.config/hypr/hyprinput.conf
vendored
4
env/.config/hypr/hyprinput.conf
vendored
@@ -10,8 +10,8 @@ input {
|
||||
kb_options = ctrl:nocaps
|
||||
kb_rules =
|
||||
|
||||
repeat_rate = 35
|
||||
repeat_delay = 200
|
||||
repeat_rate = 50
|
||||
repeat_delay = 175
|
||||
|
||||
follow_mouse = 2
|
||||
|
||||
|
||||
4
env/.config/hypr/hyprtoolkit.conf
vendored
4
env/.config/hypr/hyprtoolkit.conf
vendored
@@ -1,6 +1,6 @@
|
||||
background = rgb(1e1e2e)
|
||||
base = rgb(1e1e2e)
|
||||
alternate_base = rgb(11111b)
|
||||
base = rgb(b4befe)
|
||||
alternate_base = rgb(cdd6f4))
|
||||
text = rgb(cdd6f4)
|
||||
bright_text = rgb(89b4fa)
|
||||
accent = rgb(b4befe)
|
||||
|
||||
2
env/.config/nvim
vendored
2
env/.config/nvim
vendored
Submodule env/.config/nvim updated: 8f34505d2d...03aaaa6f74
1
env/.tmux.conf
vendored
1
env/.tmux.conf
vendored
@@ -120,7 +120,6 @@ set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}] #{=/-32/...:#{s|$USER
|
||||
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}"
|
||||
set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_yellow}]#{?window_zoomed_flag, zoom ,}"
|
||||
|
||||
|
||||
# bootstrap tpm
|
||||
if "test ! -d ~/.tmux/plugins/tpm" \
|
||||
"run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
|
||||
|
||||
127
webapp
127
webapp
@@ -3,16 +3,26 @@
|
||||
# Installs or uninstalls webapps based on the spec in the './webapps' directory.
|
||||
#
|
||||
# This is used when setting up a new machine.
|
||||
#
|
||||
|
||||
set -e
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
THIS_FILE=${BASH_SOURCE[0]}
|
||||
LOG_LABEL=$(basename $THIS_FILE)
|
||||
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
|
||||
LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
|
||||
|
||||
if [ -z "$DEV_ENV" ]; then
|
||||
echo "env var DEV_ENV needs to be present"
|
||||
exit 1
|
||||
echo "env var DEV_ENV needs to be present"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$XDG_DATA_HOME" ]; then
|
||||
echo "no xdg data home"
|
||||
echo "using ~/.local/share"
|
||||
XDG_DATA_HOME=~/.local/share
|
||||
echo "no xdg data home"
|
||||
echo "using ~/.local/share"
|
||||
XDG_DATA_HOME=~/.local/share
|
||||
fi
|
||||
|
||||
grep=""
|
||||
@@ -20,83 +30,84 @@ dry_run="0"
|
||||
uninstall="0"
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
echo "ARG: \"$1\""
|
||||
echo "ARG: \"$1\""
|
||||
|
||||
# Handle a --dry or --dry-run argument
|
||||
if [[ "$1" =~ ^--dry ]]; then
|
||||
dry_run="1"
|
||||
# Handle an --uninstall argument
|
||||
elif [[ "$1" =~ ^--u ]]; then
|
||||
uninstall="1"
|
||||
# Handle an --install argument (default)
|
||||
elif [[ ! "$1" =~ ^--i ]]; then
|
||||
grep="$1"
|
||||
fi
|
||||
shift
|
||||
# Handle a --dry or --dry-run argument
|
||||
if [[ "$1" =~ ^--dry ]]; then
|
||||
dry_run="1"
|
||||
# Handle an --uninstall argument
|
||||
elif [[ "$1" =~ ^--u ]]; then
|
||||
uninstall="1"
|
||||
# Handle an --install argument (default)
|
||||
elif [[ ! "$1" =~ ^--i ]]; then
|
||||
grep="$1"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
log() {
|
||||
if [[ $dry_run == "1" ]]; then
|
||||
echo "[DRY_RUN]: $1"
|
||||
else
|
||||
echo "$1"
|
||||
fi
|
||||
logging log --source "$THIS_FILE" "$@"
|
||||
}
|
||||
|
||||
install() {
|
||||
local file=$DEV_ENV/env/webapps/$(basename $1)
|
||||
local script="$DEV_ENV/env/.local/scripts/hypr/install-webapp"
|
||||
local file=$DEV_ENV/env/webapps/$(basename $1)
|
||||
local script="$DEV_ENV/env/.local/scripts/hypr/install-webapp"
|
||||
|
||||
if [[ ! -x $script ]]; then
|
||||
log "Failed to find install web app script."
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -x $script ]]; then
|
||||
log "Failed to find install web app script."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Install local icons if needed
|
||||
mkdir -p $XDG_DATA_HOME/applications/icons
|
||||
for i in $(find $DEV_ENV/env/.local/share/applications/icons -mindepth 1 -maxdepth 1 -type f); do
|
||||
if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ]] && [[ $dry_run == "0" ]]; then
|
||||
cp $i $XDG_DATA_HOME/applications/icons
|
||||
fi
|
||||
done
|
||||
# Install local icons if needed
|
||||
mkdir -p $XDG_DATA_HOME/applications/icons
|
||||
for i in $(find $DEV_ENV/env/.local/share/applications/icons -mindepth 1 -maxdepth 1 -type f); do
|
||||
if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ]] && [[ $dry_run == "0" ]]; then
|
||||
cp $i $XDG_DATA_HOME/applications/icons
|
||||
fi
|
||||
done
|
||||
|
||||
log "Installing webapp from spec: $file"
|
||||
log "Installing webapp from spec: $file"
|
||||
|
||||
if [[ $dry_run == "0" ]]; then
|
||||
$script --file $file --no-interactive
|
||||
fi
|
||||
if [[ $dry_run == "0" ]]; then
|
||||
$script --file $file --no-interactive
|
||||
fi
|
||||
}
|
||||
|
||||
uninstall() {
|
||||
local file=$DEV_ENV/env/webapps/$(basename $1)
|
||||
local script="$DEV_ENV/env/.local/scripts/hypr/uninstall-desktop-app"
|
||||
local file=$DEV_ENV/env/webapps/$(basename $1)
|
||||
local script="$DEV_ENV/env/.local/scripts/hypr/uninstall-desktop-app"
|
||||
|
||||
if [[ ! -x $script ]]; then
|
||||
log "Failed to find uninstall web app script."
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -x $script ]]; then
|
||||
log "Failed to find uninstall web app script."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log "Uninstalling webapp from spec: $file"
|
||||
log "Uninstalling webapp from spec: $file"
|
||||
|
||||
if [[ $dry_run == "0" ]]; then
|
||||
$script --file $file
|
||||
fi
|
||||
if [[ $dry_run == "0" ]]; then
|
||||
$script --file $file
|
||||
fi
|
||||
}
|
||||
|
||||
############################## MAIN ##############################
|
||||
|
||||
# Setup logging file and label.
|
||||
source "$SCRIPTS/hypr/logging"
|
||||
setup-logging "$LOG_FILE" "$LOG_LABEL"
|
||||
export LOG_ENABLE_DRY_RUN="$dry_run"
|
||||
|
||||
log "WEBAPP: -- grep: $grep"
|
||||
|
||||
apps_dir=$(find $DEV_ENV/env/webapps -mindepth 1 -maxdepth 1 -type f)
|
||||
for s in $apps_dir; do
|
||||
if basename $s | grep -vq "$grep"; then
|
||||
log "grep \"$grep\" filtered out $s"
|
||||
continue
|
||||
fi
|
||||
if basename $s | grep -vq "$grep"; then
|
||||
log "grep \"$grep\" filtered out $s"
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ $uninstall == "1" ]]; then
|
||||
uninstall $s
|
||||
else
|
||||
install $s
|
||||
fi
|
||||
if [[ $uninstall == "1" ]]; then
|
||||
uninstall $s
|
||||
else
|
||||
install $s
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user