mirror of
https://github.com/artizirk/dotfiles.git
synced 2025-06-14 02:04:15 +03:00
Compare commits
6 Commits
0bb59ae237
...
master
Author | SHA1 | Date | |
---|---|---|---|
bef9896118 | |||
84ed0b01b8 | |||
44cb9c112e | |||
a607346209 | |||
16c9af02ff | |||
e26a30d88e |
@ -11,22 +11,26 @@ fi
|
||||
|
||||
function show_help {
|
||||
cat <<-EOF
|
||||
Usage: $0 -h | -n NAME [-s SUITE] [-d]
|
||||
Usage: $0 -h | -n NAME [-s SUITE] [-t [SNAPSHOT_NAME] -r] [-d]
|
||||
|
||||
Create a nspanw container called NAME
|
||||
|
||||
-h help
|
||||
-n container name
|
||||
-s debian suite (default: ${DEFAULT_SUITE})
|
||||
-t snapshot container
|
||||
-r rollback to snapshot
|
||||
-d delete container
|
||||
EOF
|
||||
}
|
||||
|
||||
while getopts 'hn:s:d' flag; do
|
||||
while getopts 'hn:s:t:rd' flag; do
|
||||
case "${flag}" in
|
||||
h) show_help; exit 0;;
|
||||
n) name="${OPTARG}" ;;
|
||||
s) suite="${OPTARG}" ;;
|
||||
t) snapshot="${OPTARG}" ;;
|
||||
r) rollback=1 ;;
|
||||
d) delete=1 ;;
|
||||
*) echo "Unexpected option ${flag}" ;;
|
||||
esac
|
||||
@ -43,9 +47,26 @@ else
|
||||
echo "Container name is $name and suite is ${SUITE}"
|
||||
fi
|
||||
|
||||
if [[ -n ${snapshot:-} ]]; then
|
||||
dest_snapshot_name="${BASE}/.${name}_${snapshot}"
|
||||
if [[ -n ${rollback:-} ]]; then
|
||||
if [[ -d ${dest_snapshot_name} ]]; then
|
||||
btrfs subvolume delete "${BASE}/${name}"
|
||||
btrfs subvolume snapshot "${dest_snapshot_name}" "${BASE}/${name}"
|
||||
exit 0
|
||||
else
|
||||
echo "Can't rollback as '${snapshot}' does not exist"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
btrfs subvolume snapshot -r "${BASE}/${name}" "${dest_snapshot_name}"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n ${delete:-} ]]; then
|
||||
btrfs subvolume delete "${BASE}/$name"
|
||||
exit 0
|
||||
btrfs subvolume delete "${BASE}/${name}" "${BASE}/.${name}_"*
|
||||
exit 0
|
||||
fi
|
||||
|
||||
btrfs subvolume create "${BASE}/${name}"
|
||||
@ -105,9 +126,11 @@ apt install --yes --no-install-recommends neovim
|
||||
update-alternatives --set editor /usr/bin/nvim
|
||||
ln -sf /usr/share/nvim/runtime/macros/less.sh /usr/local/bin/vless
|
||||
|
||||
# Use systemd-resovled directly by configuring /etc/nsswitch.conf
|
||||
apt install --yes --no-install-recommends libnss-resolve
|
||||
|
||||
systemctl enable systemd-networkd
|
||||
|
||||
# systemd-resolved package also replaces /etc/resolv.conf with a symlink that breaks DNS in our current pre setup environment
|
||||
apt install --yes --no-install-recommends libnss-resolve
|
||||
# Needed by libnss-resolve config in /etc/nsswitch.conf
|
||||
systemctl enable systemd-resolved
|
||||
EOF
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Work computer
|
||||
exec /usr/bin/swaynag-battery --threshold 5
|
||||
|
||||
set $left_disp "Dell Inc. DELL U2724DE C9YPBP3"
|
||||
set $right_disp "Dell Inc. DELL U2724D J3XFCP3"
|
||||
|
@ -5,5 +5,10 @@ exec /usr/bin/swaynag-battery --threshold 5
|
||||
#set $right_disp "Unknown 0x0791 0x00000000"
|
||||
set $chat_workspace 10
|
||||
|
||||
|
||||
set $laptop eDP-1
|
||||
bindswitch lid:on output $laptop disable
|
||||
bindswitch lid:off output $laptop enable
|
||||
|
||||
output $left_disp pos 0 0
|
||||
output $right_disp pos 370 1440
|
||||
|
4
.zshrc
4
.zshrc
@ -319,6 +319,8 @@ function ssh {
|
||||
|
||||
# i don't like that systemd by default uses a pager
|
||||
export SYSTEMD_PAGER=''
|
||||
# Minio CLI is also stupid
|
||||
export MC_DISABLE_PAGER=1
|
||||
|
||||
# set man max width
|
||||
export MANWIDTH=80
|
||||
@ -333,7 +335,7 @@ fi
|
||||
|
||||
# https://neovim.io/doc/user/various.html#less
|
||||
function vless {
|
||||
/usr/share/nvim/runtime/macros/less.sh $@
|
||||
/usr/share/nvim/runtime/scripts/less.sh $@
|
||||
}
|
||||
|
||||
# If running under windows with pageagent then use it
|
||||
|
Reference in New Issue
Block a user