andonome/lk
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Malin Freeborn 2020-03-23 21:23:01 +01:00
commit e4ad0d3448
3 changed files with 14 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/git.md
View File

@ -36,7 +36,7 @@ Check your history:
Get the url of your git remote and add it, with the name "origin": 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": Tell git you're pushing the branch "master" to the remote repo "origin":
@ -75,8 +75,18 @@ Once you like the feature, merge it into the main branch. Switch to master then
> git merge featurez > git merge featurez
and delete featurez as you've already merged it:
> git branch -d featurez
# Subtree # 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. 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. First, we extract its history as an independent item, and make that into a seprate branch.
@ -123,7 +133,6 @@ Gitlab requires more changes, such as going to `settings > repository` and switc
> git repack > git repack
## Find Binary Blobs ## Find Binary Blobs
``` ```

121
distros/arch/basic-install.sh
View File

@ -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

3
distros/arch/pacman.md
View File

@ -29,3 +29,6 @@ If you're constantly getting 'everything corrupted, nothing upgraded', try runni
> sudo pacman -S archlinux-keyring > sudo pacman -S archlinux-keyring
List all orphaned packages:
> sudo pacman -Qtdq