Compare commits
20 Commits
Author | SHA1 | Date |
---|---|---|
|
4dd0b8385c | |
|
0fb8a870cf | |
|
8332e7232f | |
|
717548c465 | |
|
e09cd19ec0 | |
|
0be5b92ee2 | |
|
fcffdf221e | |
|
ab3828f3da | |
|
a8bea18cad | |
|
237d8387ec | |
|
a7c22571cb | |
|
cd14e8b5a8 | |
|
ddb574bf83 | |
|
6e9e23a8e6 | |
|
6c06aff4de | |
|
19de06e60f | |
|
7bec16facc | |
|
da25ad830a | |
|
ce792dbb2f | |
|
e07435336b |
50
Makefile
50
Makefile
|
@ -1,3 +1,47 @@
|
|||
.PHONY: apply
|
||||
apply:
|
||||
stow --target=$${HOME} */
|
||||
QUBES_DIRS = qubes dom0
|
||||
ALL_DIRS = $(shell ls -d */ | sed 's#/##')
|
||||
GENERAL_DIRS = $(filter-out $(QUBES_DIRS), $(ALL_DIRS))
|
||||
|
||||
.PHONY: all update-git-submodule apply-general apply-qubes install-apt-essentials clean
|
||||
|
||||
all: update-git-submodule apply-general apply-qubes
|
||||
|
||||
update-git-submodule:
|
||||
@echo "Installing git submodules..."
|
||||
git submodule update --init --recursive
|
||||
|
||||
apply-general:
|
||||
@echo "Applying general configurations..."
|
||||
stow --target=$(HOME) $(GENERAL_DIRS)
|
||||
|
||||
apply-qubes:
|
||||
@echo "Applying Qubes configurations..."
|
||||
sudo stow --target=/ qubes
|
||||
|
||||
install-apt-essentials:
|
||||
sudo apt install \
|
||||
tig \
|
||||
htop \
|
||||
tree \
|
||||
ripgrep \
|
||||
net-tools \
|
||||
stow \
|
||||
zsh \
|
||||
rsync \
|
||||
shellcheck \
|
||||
pass \
|
||||
make \
|
||||
cmake \
|
||||
ninja-build \
|
||||
gettext \
|
||||
curl \
|
||||
build-essential \
|
||||
jq \
|
||||
wget \
|
||||
-y
|
||||
|
||||
|
||||
clean:
|
||||
@echo "Removing stowed configurations..."
|
||||
stow -D --target=$(HOME) $(GENERAL_DIRS)
|
||||
stow -D --target=\ qubes
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
*color11: #657b83
|
||||
|
||||
!! blue dark/light
|
||||
*color4: #268bd2
|
||||
*color12: #839496
|
||||
*color4: #81a1c1
|
||||
*color12: #5fafff
|
||||
|
||||
!! magenta dark/light
|
||||
*color5: #d33682
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
exec zsh
|
||||
|
||||
# Source global definitions
|
||||
if [ -f /etc/bashrc ]; then
|
||||
. /etc/bashrc
|
||||
fi
|
||||
|
||||
# User specific environment
|
||||
if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]; then
|
||||
PATH="$HOME/.local/bin:$HOME/bin:$PATH"
|
||||
fi
|
||||
export PATH
|
||||
|
||||
# Uncomment the following line if you don't like systemctl's auto-paging feature:
|
||||
# export SYSTEMD_PAGER=
|
||||
|
||||
# User specific aliases and functions
|
||||
if [ -d ~/.bashrc.d ]; then
|
||||
for rc in ~/.bashrc.d/*; do
|
||||
if [ -f "$rc" ]; then
|
||||
. "$rc"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
unset rc
|
|
@ -1,7 +1,7 @@
|
|||
[user]
|
||||
email = lance@distrust.co
|
||||
name = Lance R. Vick
|
||||
signingKey = E90A401336C8AAA9
|
||||
name = Anton Livaja
|
||||
email = anton@livaja.me
|
||||
signingKey = F4BF5C81EC78A5DD341C91EEDC4B7D1F52E0BA4D
|
||||
[push]
|
||||
default = simple
|
||||
[color]
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"features": {
|
||||
"containerd-snapshotter": true
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"features": {
|
||||
"containerd-snapshotter": true
|
||||
}
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
[Unit]
|
||||
Description=Run a SSH proxy socket to another QubesOS VM
|
||||
|
||||
[Service]
|
||||
Environment=SSH_VAULT_VM=vault
|
||||
ExecStart=%h/.local/bin/qubes-ssh-socket
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,2 +1,3 @@
|
|||
binds+=('/var/lib/docker')
|
||||
binds+=('/var/lib/containerd')
|
||||
binds+=('/etc/systemd/user/qubes-ssh-socket.service')
|
|
@ -0,0 +1,10 @@
|
|||
# SPLIT SSH CONFIGURATION >>>
|
||||
# replace "vault" with your AppVM name which stores the ssh private key(s)
|
||||
SSH_VAULT_VM="vault"
|
||||
|
||||
if [ "$SSH_VAULT_VM" != "" ]; then
|
||||
export SSH_SOCK="/home/user/.SSH_AGENT_$SSH_VAULT_VM"
|
||||
rm -f "$SSH_SOCK"
|
||||
sudo -u user /bin/sh -c "umask 177 && exec socat 'UNIX-LISTEN:$SSH_SOCK,fork' 'EXEC:qrexec-client-vm $SSH_VAULT_VM qubes.SshAgent'" &
|
||||
fi
|
||||
# <<< SPLIT SSH CONFIGURATION
|
|
@ -0,0 +1,10 @@
|
|||
[Unit]
|
||||
Description=Run a SSH proxy socket to another QubesOS VM
|
||||
|
||||
[Service]
|
||||
Environment=SSH_VAULT_VM=vault
|
||||
ExecStart=%h/.local/bin/qubes-ssh-socket
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -5,3 +5,7 @@ run-shell "powerline-daemon -q"
|
|||
source "/usr/share/powerline/bindings/tmux/powerline.conf"
|
||||
|
||||
# vim: ft=tmux
|
||||
|
||||
# Fix coloring
|
||||
set-option -g default-terminal "xterm-256color"
|
||||
set-option -ga terminal-overrides ",xterm-256color:Tc"
|
29
zsh/.zshrc
29
zsh/.zshrc
|
@ -5,7 +5,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
export DEFAULT_USER="lrvick"
|
||||
export DEFAULT_USER="anton"
|
||||
export DISABLE_AUTO_UPDATE="true"
|
||||
export COMPLETION_WAITING_DOTS="true"
|
||||
export HISTFILE=~/.zsh_history
|
||||
|
@ -20,3 +20,30 @@ source ~/.zsh/themes/powerlevel10k/powerlevel10k.zsh-theme
|
|||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
# Aliases
|
||||
alias gib='git branch'
|
||||
alias gis='git status'
|
||||
alias gfa='git fetch -a'
|
||||
alias gpoh='git push origin HEAD'
|
||||
|
||||
# Bindkeys
|
||||
bindkey '^R' history-incremental-search-backward # ctrl + shift + r -> Reverse search
|
||||
bindkey '^A' beginning-of-line # ctrl + a -> Move to start of line
|
||||
bindkey '^E' end-of-line # ctrl + e -> Move to end of line
|
||||
bindkey '^[[1;5D' backward-word # ctrl + left arrow -> Move back one word
|
||||
bindkey '^[[1;5C' forward-word # Ctrl + right arrow -> Move forward one word
|
||||
|
||||
# Color different file types
|
||||
export LS_COLORS='di=94:ln=36:so=35:pi=33:ex=32:bd=46;34:cd=46;34'
|
||||
alias ls='ls --color=auto'
|
||||
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
# SPLIT SSH CONFIGURATION >>>
|
||||
SSH_VAULT_VM="vault"
|
||||
|
||||
if [ "$SSH_VAULT_VM" != "" ]; then
|
||||
export SSH_AUTH_SOCK="/home/user/.SSH_AGENT_$SSH_VAULT_VM"
|
||||
fi
|
||||
# <<< SPLIT SSH CONFIGURATION
|
||||
|
|
Loading…
Reference in New Issue