From dd566fff61a7c6b12e2b301cc1b27ada1adf69fa Mon Sep 17 00:00:00 2001 From: Tom Barrett Date: Sun, 14 Feb 2021 13:54:44 +0100 Subject: removed lxc stuff, really only use lxd now... --- .autostart | 2 +- .config/lxc/default.conf | 9 --------- .config/ncmpcpp/.gitignore | 1 + arch/aur | 2 +- lxc/arch_roll | 37 ------------------------------------- lxc/debian_roll | 28 ---------------------------- lxc/debian_setup | 9 --------- 7 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 .config/lxc/default.conf create mode 100644 .config/ncmpcpp/.gitignore delete mode 100755 lxc/arch_roll delete mode 100755 lxc/debian_roll delete mode 100755 lxc/debian_setup diff --git a/.autostart b/.autostart index 426f1d9..a028bd8 100755 --- a/.autostart +++ b/.autostart @@ -12,7 +12,7 @@ nitrogen --restore xset s off -dpms xscreensaver -no-splash & -st -e watch -t 'task' & +st -e watch -t 'task -garbage -consumerism -gifts' & sleep $wait_time st -e stig & sleep $wait_time diff --git a/.config/lxc/default.conf b/.config/lxc/default.conf deleted file mode 100644 index d8c5140..0000000 --- a/.config/lxc/default.conf +++ /dev/null @@ -1,9 +0,0 @@ -lxc.net.0.type = veth -lxc.net.0.link = virbr0 -lxc.net.0.flags = up -lxc.apparmor.profile = unconfined -lxc.idmap = u 0 100000 65536 -lxc.idmap = g 0 100000 65536 -# fix when possible -#lxc.apparmor.profile = generated -#lxc.apparmor.allow_nesting = 1 diff --git a/.config/ncmpcpp/.gitignore b/.config/ncmpcpp/.gitignore new file mode 100644 index 0000000..bdf6ba9 --- /dev/null +++ b/.config/ncmpcpp/.gitignore @@ -0,0 +1 @@ +error.log diff --git a/arch/aur b/arch/aur index d9dab08..b5b5cdb 100644 --- a/arch/aur +++ b/arch/aur @@ -1,3 +1,3 @@ brave-bin -deluge-stable-git +stig yay-bin diff --git a/lxc/arch_roll b/lxc/arch_roll deleted file mode 100755 index cf1dfa7..0000000 --- a/lxc/arch_roll +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -e - -NAME=$1 -USER=tom -PASS=durr - -# init -lxc-create -n $NAME -t download -- --dist archlinux --release current --arch amd64 -lxc-start -n $NAME -sleep 10 - -# install basics -lxc-attach -n $NAME -- pacman -Syu --noconfirm -lxc-attach -n $NAME -- pacman -Sy --noconfirm \ - git sudo vim openssh xorg-xauth xorg-xhost fakeroot binutils - -# setup user -lxc-attach -n $NAME -- useradd -m $USER -lxc-attach -n $NAME -- bash -c 'echo "'$USER' ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' -lxc-attach -n $NAME -- bash -c 'echo -e "'$PASS'\n'$PASS'" | passwd $USER' - -# setup for yay -lxc-attach -n $NAME -- mkdir /home/$USER/yay -lxc-attach -n $NAME -- git clone https://aur.archlinux.org/yay-bin.git /home/$USER/yay -lxc-attach -n $NAME -- chown $USER:$USER -R /home/$USER -lxc-attach -n $NAME -- bash -c 'cd /home/'$USER'/yay && sudo -u '$USER' makepkg -si --noconfirm' -lxc-attach -n $NAME -- bash -c 'sudo -u '$USER' yay -Syu --noconfirm' - -# setup x11 forwarding -# lxc-attach -n $NAME -- bash -c 'echo "X11Forwarding yes" >> /etc/ssh/sshd_config' -# lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' -# lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' -lxc-attach -n $NAME -- systemctl start sshd - -# display info -lxc-info -n $NAME diff --git a/lxc/debian_roll b/lxc/debian_roll deleted file mode 100755 index 5ae7b7e..0000000 --- a/lxc/debian_roll +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -e - -NAME=$1 -USER=tom -PASS=durr - -# init -lxc-create -n $NAME -t download -- --dist debian --release buster --arch amd64 -lxc-start -n $NAME -sleep 10 - -# install basics -lxc-attach -n $NAME -- apt update -lxc-attach -n $NAME -- apt dist-upgrade -lxc-attach -n $NAME -- apt install -y sudo openssh-server x11-xserver-utils - -# setup user -lxc-attach -n $NAME -- adduser $USER --gecos "" --disabled-password -lxc-attach -n $NAME -- bash -c 'echo -e "'$PASS'\n'$PASS'" | passwd $USER' - -# setup x11 forwarding -# lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' -# lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' -# lxc-attach -n $NAME -- systemctl restart sshd - -# display info -lxc-info -n $NAME diff --git a/lxc/debian_setup b/lxc/debian_setup deleted file mode 100755 index 6cfe699..0000000 --- a/lxc/debian_setup +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -virsh net-start default -virsh net-autostart default - -echo "kernel.unprivileged_userns_clone=1" > /etc/sysctl.d/80-lxc-userns.conf -echo "tom veth virbr0 2" > /etc/lxc/lxc-usernet -echo "you should reboot now." -- cgit v1.2.3