From 275ab1f1754c299300ca8a88ffc6bcfca29f6000 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Wed, 26 Feb 2020 10:31:17 +0100 Subject: [PATCH 1/4] clarify git.md --- data/git.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/git.md b/data/git.md index 4b73c10..c44a5ef 100644 --- a/data/git.md +++ b/data/git.md @@ -36,7 +36,7 @@ Check your history: Get the url of your git remote and add it, with the name "origin": -> git remove add origin git@gitlab.com:FirstBloodRPG/first-blood.git +> git remote add origin git@gitlab.com:bindrpg/core Tell git you're pushing the branch "master" to the remote repo "origin": @@ -75,6 +75,10 @@ Once you like the feature, merge it into the main branch. Switch to master then > git merge featurez +and delete featurez as you've already merged it: + +> git branch -d featurez + # Subtree The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history. @@ -123,7 +127,6 @@ Gitlab requires more changes, such as going to `settings > repository` and switc > git repack - ## Find Binary Blobs ``` From 3aa6c366ffafb48741534d1e725fc300c84882bd Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 8 Mar 2020 13:07:40 +0100 Subject: [PATCH 2/4] expand subtree in git --- data/git.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/git.md b/data/git.md index c44a5ef..21c9e82 100644 --- a/data/git.md +++ b/data/git.md @@ -81,6 +81,12 @@ and delete featurez as you've already merged it: # Subtree +## Pulling another git repo into a subtree + +> git subtree add -P config git@gitlab.com:bindrpg/config.git master + +## Pulling a Subtree from an existing git + The project has subdirectories sub-1,sub-2,sub-3. The first should be its own repository, but should also retain its own history. First, we extract its history as an independent item, and make that into a seprate branch. From 08047eca274f625ed457ee3828a9222e0f3f78bd Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Fri, 13 Mar 2020 20:33:04 +0100 Subject: [PATCH 3/4] add listing orphaned packages to pacman.md --- distros/arch/pacman.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distros/arch/pacman.md b/distros/arch/pacman.md index 3a850e9..d32c6c0 100644 --- a/distros/arch/pacman.md +++ b/distros/arch/pacman.md @@ -29,3 +29,6 @@ If you're constantly getting 'everything corrupted, nothing upgraded', try runni > sudo pacman -S archlinux-keyring +List all orphaned packages: + +> sudo pacman -Qtdq From b9c3261f3c95b13cd1f2ece4134a3ee806af349d Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Mon, 23 Mar 2020 21:22:57 +0100 Subject: [PATCH 4/4] remove useless arch install.sh --- distros/arch/basic-install.sh | 121 ---------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 distros/arch/basic-install.sh diff --git a/distros/arch/basic-install.sh b/distros/arch/basic-install.sh deleted file mode 100644 index 95766b1..0000000 --- a/distros/arch/basic-install.sh +++ /dev/null @@ -1,121 +0,0 @@ - -Commands not preceded with # or $ are lines in config files. - -Keyboard layout changed. - -ls /usr/share/kbd/keymaps/**/*.map.gz - -loadkeys uk.map.gz - -Check if boot mode is UEFI - -ls /sys/firmware/efi/efivars - -Without efivars, the system must boot with BIOS. - -Check network is up - -> ping archlinux.org - -Set system clock properly - -> timedatectl set-ntp true - -Check disks - -> lsblk - -Make partition - -> fdisk -l - -- Boot: 200M - -- Swap: 12G??? - -- \/: 15G - -- Home: The rest - -parted alternative: - -> mklabel gpt - -> mkpart ESP fat32 1MiB 200MiB - -> set 1 boot on - -> name 1 efi - -Use pacstrap to get the base install. - -> mount /dev/sda3 /mnt/ -> mkdir /mnt/home -> mkdir /mnt/boot -> mount /dev/sda3 /mnt/home -> mount /dev/sda1 /mnt/boot - -> pacstrap /mnt base base-devel vim - -Make fstab notes for new system. - -> genfstab -U /mnt >> /mnt/etc/fstab - -> arch-chroot /mnt - -echo 'en_GB.UTF-8' > /etc/default/locale - -pacman -Sy networkmanager grub - -> grub-install --target=i386-pc /dev/sda - -> grub-mkconfig -o /boot/grub/grub.cfg - -set local time - -> ln -sf /usr/share/zoneinfo/Europe/Belgrade /etc/localtime - -Find the desired locale's and uncomment them. - -> vi /etc/locale.gen - -> locale-gen - -Mkae your keyboard changes permenent with: - -> vi /etc/vconsole.conf - -then set: `KEYMAP=uk.map.gz` - -Make a hostname - -> vi /etc/hostname - -This should have the following: - -``` - -::1 localhost -127.0.1.1 [hostname].localdomain [hostname] - -``` - -If the system has a permanent IP address, it should be used instead of localhost. -Ping some sites to make sure the network's working - -> passwd - -> exit - -> umount -R /mnt - -Remove retarded beep sound - -> # echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf - -> rmmod pcspkr - -## Fonts - -> sudo pacman -S ttf-hack ttf-font-awesome ttf-fira-mono -