Tobias Bich bitob

## meld_as_mergetool_for_git.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                bitob
                / meld_as_mergetool_for_git.md
            
            
              Created
              January 17, 2022 17:29
            
              
                Meld as Mergetool for Git
              
          
    Config in ~/.gitconfig

Found this somewhere, but cannot remember where.
[merge]
    tool = meld
[mergetool "meld"]
    # Choose one of these 2 lines (not both!) explained below.
 cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"


## archlinux_plasma_x11_installation.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              1 star
            
          
                bitob
                / archlinux_plasma_x11_installation.md
            
            
              Last active
              May 25, 2023 08:14
            
          
    Arch Linux Installation

This is just how I set up my Arch system with the Plasma Desktop Environment and the Xorg Display Server.

I'm installing the System on a nvme alongside with a Windows 10 Installation.
Therefore, there are already nvme0n1p1 - nvmen0n1p4 on the system, created by the windows setup. One of them is the ESP partition that will be reused as /boot/efi.

This setup will use an unencrypted /boot and an encrypted lvm container containing / and /home as well as a swap for hibernate.
When in doubt, always refer (and listen) to the Arch Linux Installation Guide.
Boot the Live System