Skip to content

Commit

Permalink
organize
Browse files Browse the repository at this point in the history
  • Loading branch information
johnko committed Jan 19, 2025
1 parent 2e06b69 commit 4dc2fce
Show file tree
Hide file tree
Showing 14 changed files with 95 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ done

##########
# color for zsh auto complete suggestion output https://stackoverflow.com/questions/23152157/how-does-the-zsh-list-colors-syntax-work
zstyle ':completion:*:commands' ignored-patterns '.DS_Store|.gitignore|macos-homebrew.sh|macos-mouse-shortcuts.sh|macos-podmandesktop-init.sh|macos-settings|macos-skhd.sh|macos-yabai.sh|yabai_cycle_clockwise.sh'
zstyle ':completion:*:commands' ignored-patterns '.DS_Store|.gitignore|macos-settings|macos-setup|vm|yabai_cycle_clockwise.sh'
zstyle ':completion:*:commands' list-colors '=*=31'
zstyle ':completion:*:options' list-colors '=^(-- *)=36'
zstyle ':completion:*:parameters' list-colors '=*=36'
Expand Down
55 changes: 0 additions & 55 deletions bin/cloud-init.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions bin/macos-dock-tilesize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ print_cmd(){
fi
echo "defaults write $DOMAIN $KEY $TYPE $VAL"
fi
done <<EOF
done <<EOS
$KEYVAL
EOF
EOS

}

Expand Down Expand Up @@ -77,14 +77,14 @@ print_cmd

# https://apple.stackexchange.com/questions/87619/where-are-keyboard-shortcuts-stored-for-backup-and-sync-purposes
# printf "defaults write NSGlobalDomain NSUserKeyEquivalents '$(defaults read NSGlobalDomain NSUserKeyEquivalents)'"
cat <<EOF
cat <<EOS
defaults write NSGlobalDomain NSUserKeyEquivalents '{
"Emoji & Symbols" = "\Uf714";
"Enter Full Screen" = "@^f";
"Exit Full Screen" = "@^f";
"Secure Keyboard Entry" = "@~^\Uf714";
"Toggle Full Screen" = "@^f";
}'
EOF
EOS

echo "killall Dock"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/ubuntu-create-cloudinit-iso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ $DOCKER_BIN exec $UBUNTU_CONTAINER_ID apt update
$DOCKER_BIN exec $UBUNTU_CONTAINER_ID apt install -y cloud-image-utils
$DOCKER_BIN exec $UBUNTU_CONTAINER_ID mkdir -p cidata
$DOCKER_BIN exec $UBUNTU_CONTAINER_ID touch ./cidata/meta-data
$DOCKER_BIN cp $(dirname $0)/cloud-init.yaml $UBUNTU_CONTAINER_ID:./cidata/user-data
$DOCKER_BIN cp $(dirname $0)/vm/cloud-init.yaml $UBUNTU_CONTAINER_ID:./cidata/user-data
$DOCKER_BIN exec $UBUNTU_CONTAINER_ID bash -c "cd cidata && cloud-localds ../cloudinit.iso user-data meta-data"
$DOCKER_BIN cp $UBUNTU_CONTAINER_ID:./cloudinit.iso ${HOME}/iso/cloudinit.iso
59 changes: 59 additions & 0 deletions bin/vm/cloud-init.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#cloud-config
autoinstall:
version: 1
identity:
hostname: vm
username: ubuntu
password: "$6$exDY1mhS4KUYCE/2$zmn9ToZwTKLhCw.b4/b.ZRTIZM30JZ4QrOQ2aOXJ8yk96xpcCof0kxKwuX1kqLG/ygbJ1f8wxED22bTL4F46P0"
# ubuntu
ssh:
install-server: true
allow-pw: false
packages:
- openssh-server
timezone: "Etc/UTC"
updates: all
shutdown: poweroff
late-commands:
# add ip address to TTY login screen
# crete base64 with:
# cat bin/ubuntu-tty-update.sh | gzip -c - | base64
- echo 'H4sIAB+qjGcAA2WQTU8CMRCG7/0VL8XgqRSNHsCP6M2bJsoJMFl2u2wTtl06Uz4SfrzdVQkJhzaZ9nlnnky/pyMFvbROG7fFMqNKkGEoE/dC9FExNzTRmkzYmlBmcc3D3Nd6Ew2x9Y707Wh8Px7ryu8Ue5WysVGGc2WJEtO9dX+VUbZRWVEEQ6RKHxJVjYQw+8YHxsfr19uT/JeZXLW1bA0K764ZITpYhzrL3z+FLTGboZckoafJjLBYYDDArvJZbXHEKpgGMnjPEg9Io50ATqkSOgnqYWc49MGu2vyJA/Lml+iACzghpU1XN0RtIOfz+Z08TxyPIFNABUjS39NldBx1S0Hhr5J4vLR4PmuSBtCB2NQ5r5FWxlla0sowH17SuRFJ4Qd44V9QvAEAAA==' | base64 -d | zcat > /target/sbin/ubuntu-tty-update.sh
- curtin in-target -- chmod 755 /sbin/ubuntu-tty-update.sh
# cat bin/ubuntu-tty-update.service | gzip -c - | base64
- echo 'H4sIACWwjGcAA3WOMRKCMBBF+5yCCwROkEJHClvRsWAoAqyyY9hgdqPk9mZkLK3/vPdfeyGUTh2Ah4CLoCcT+0gSC5FUxGW0AuoEz4gB2BDI24eH9uSQoBQb7iBqdxMIfzbVNhBeOECnzmkB4wl48pKVs0X6kvWKYhKwqlcYmsyJqbhHqrYQnUP0FlLylIVHYrHOdepqSWDcJzNHJ6gjQ/jdfgAt+l2E1wAAAA==' | base64 -d | zcat > /target/etc/systemd/system/ubuntu-tty-update.service
- curtin in-target -- chmod 644 /etc/systemd/system/ubuntu-tty-update.service
- curtin in-target -- systemctl enable ubuntu-tty-update.service
# # temp cronjob to update TTY login screen
# - echo '* * * * * root /sbin/ubuntu-tty-update.sh' > /target/etc/cron.d/update_issue
# - curtin in-target -- chmod 644 /etc/cron.d/update_issue
# extend logical volume
- curtin in-target -- lvextend -l +100%FREE /dev/ubuntu-vg/ubuntu-lv
- curtin in-target -- resize2fs /dev/mapper/ubuntu--vg-ubuntu--lv
user-data:
users:
- name: lab
homedir: /home/lab
shell: /bin/bash
lock_passwd: true
gecos: lab
groups: adm, cdrom, dip, lxd, plugdev, sudo
primary_group: lab
ssh_import_id:
- gh:johnko
sudo: ALL=(ALL) NOPASSWD:ALL
- name: ubuntu
homedir: /home/ubuntu
shell: /bin/bash
lock_passwd: true
gecos: ubuntu
groups: adm, cdrom, dip, lxd, plugdev, sudo
primary_group: ubuntu
sudo: ALL=(ALL) NOPASSWD:ALL
package_update: true
package_upgrade: true
packages:
- openssh-server
- docker.io
- docker-compose
ssh_pwauth: false
12 changes: 12 additions & 0 deletions bin/vm/ubuntu-tty-update.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=ubuntu tty update
Requires=network-online.target
After=network-online.target

[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/sbin/ubuntu-tty-update.sh

[Install]
WantedBy=multi-user.target
5 changes: 3 additions & 2 deletions bin/ubuntu-tty-update.sh → bin/vm/ubuntu-tty-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ set -eux

# https://serverfault.com/questions/209599/how-to-setup-etc-issues-to-show-the-ip-address-for-eth0

export PATH="/usr/bin:$PATH"

# don't run in macOS
if [[ ! -e /Users ]] && whoami | grep "root" ; then
if [[ ! -f /etc/.issue.orig ]] ; then
cp /etc/issue /etc/.issue.orig
fi
int=$( ls /sys/class/net | grep "enp" | head -1 )
sed -r "s/^Ubuntu/\\\4\{$int\} - Ubuntu/" < /etc/.issue.orig > /etc/issue
grep -q "\\\4" /etc/issue || sed -r "s/^Ubuntu/\\\4 - Ubuntu/" < /etc/.issue.orig > /etc/issue
systemctl restart getty@tty1
fi
15 changes: 15 additions & 0 deletions bin/vm/vm-firstboot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
set -eux

git clone https://github.com/johnko/homedir

mv homedir/.git ./

rm -fr homedir

git checkout .

cat <<EOS
# maybe disallow ubuntu from logging in
sudo usermod --expiredate 1 ubuntu
EOS
10 changes: 0 additions & 10 deletions lab-squid-ramdisk/vm-firstboot.sh

This file was deleted.

0 comments on commit 4dc2fce

Please sign in to comment.