Commit 53f0b6d5 authored by Melroy van den Berg's avatar Melroy van den Berg

Merge branch 'master' of

parents 259ed0d6 4f532491
......@@ -2,7 +2,7 @@
My Linux dotfiles, a collection of custom configuration files. See [Melroy's home](home/melroy) folder.
I'm using Manjaro v17/v18.
I'm using [Manjaro]( v18.
Besides my dot files you will see some configuration files from [/etc](etc) folder.
......@@ -12,16 +12,15 @@ Extra installed packages:
`# pacman -S nfs-utils telegram-desktop etcher compton conky conky-manager celestia darktable deepin-calculator deepin-calendar deepin-voice-recorder filezilla transmission-gtk dnsutils retroarch retroarch-assets-xmb libretro-snes9x libretro-shaders-cg libretro-reicast libretro-ppsspp libretro-overlays libretro-mupen64plus libretro-gambatte libretro-core-info`
Extra installed AUR packages:
Extra installed AUR packages (Enable AUR within the pamac Settings window):
`atom-editor-bin green-recorder emulationstation`
`# pamac install atom-editor-bin green-recorder emulationstation emulationstation-autoscraper`
Replaced packages:
* `ligh-locker` -> `xscreensaver` (light-locker crashed)
* Via Manjaro Settings Manager, installed Nvidia driver (v340 in my case): `video-nvidia-340xx`
## Firewall rules (ufw)
...... localhost melroy-pc
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
# Local LAN DNS
......@@ -15,7 +18,3 @@
# Dennis PC dennis-pc
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment