diff options
| author | Yaroslav de la Peña Smirnov <yps@yaroslavps.com> | 2021-04-14 23:08:05 +0300 |
|---|---|---|
| committer | Yaroslav de la Peña Smirnov <yps@yaroslavps.com> | 2021-04-14 23:08:05 +0300 |
| commit | 35e2296c97803d9be1fb63928e6b0d6ec371cdfb (patch) | |
| tree | cf9ac8b6c657f7380b960b68cc911dce76ca1b2a | |
| parent | db267f6df2f068e33d5cb1ea3b3ff2eefcea43b8 (diff) | |
| download | swayrice-35e2296c97803d9be1fb63928e6b0d6ec371cdfb.tar.gz swayrice-35e2296c97803d9be1fb63928e6b0d6ec371cdfb.zip | |
Configure NM to use dnsmasq
| -rwxr-xr-x | artix.sh | 12 | ||||
| -rw-r--r-- | system/NetworkManager/NetworkManager.conf | 2 | ||||
| -rw-r--r-- | system/NetworkManager/dnsmasq.d/dnsmasq.conf | 7 | ||||
| -rw-r--r-- | system/resolvconf.conf | 7 |
4 files changed, 12 insertions, 16 deletions
@@ -3,11 +3,11 @@ # Very basic helper script to install some programs and configs for an # Artix+runit+Sway system -pacman -Sy zsh zsh-syntax-highlighting openresolv wireguard-tools \ +pacman -Sy zsh zsh-syntax-highlighting wireguard-tools mediainfo highlight \ bind-tools sway swaylock swayidle waybar egl-wayland imv swaybg \ xorg-server-xwayland alacritty qt5-wayland wl-clipboard dbus tmux htop \ bemenu bemenu-wlroots mupdf mpd ncmpcpp mpc mpv libnotify cronie \ - cronie-runit metalog metalog-runit dnsmasq dnsmasq-runit networkmanager \ + cronie-runit metalog metalog-runit dnsmasq networkmanager \ networkmanager-runit rsync grim wf-recorder slurp ffmpeg w3m youtube-dl \ youtube-viewer newsboat wget curl inkscape gimp darktable gcc make \ fontconfig pkg-config fakeroot papirus-icon-theme alsa-utils pulseaudio \ @@ -21,22 +21,18 @@ pacman -Sy zsh zsh-syntax-highlighting openresolv wireguard-tools \ bluez-runit acpilight accountsservice xdg-user-dirs abook terminus-font \ qutebrowser jq stow wdiff texlive-most texlive-lang biber units isync \ notmuch pass translate-shell gnome-keyring pacman-contrib linux-headers \ - openntpd openntpd-runit v4l2loopback-dkms highlight mediainfo || exit 1 + openntpd openntpd-runit v4l2loopback-dkms || exit 1 # Copy system config files cp system/sudoers /etc/ -cp system/resolvconf.conf /etc/ -cp system/NetworkManager/NetworkManager.conf /etc/NetworkManager/NetworkManager.conf cp system/mkinitcpio.conf /etc/ cp system/pam.d/* /etc/pam.d/ +cp -r system/NetworkManager/* /etc/NetworkManager/ cp -r system/pacman.d/hooks /etc/pacman.d/ cp -r runit/powertune /etc/runit/sv/ -resolvconf -u - # Activate runit services ln -s /etc/runit/sv/dbus /run/runit/service/ -ln -s /etc/runit/sv/dnsmasq /run/runit/service/ ln -s /etc/runit/sv/bluetoothd /run/runit/service/ ln -s /etc/runit/sv/cronie /run/runit/service/ ln -s /etc/runit/sv/metalog /run/runit/service/ diff --git a/system/NetworkManager/NetworkManager.conf b/system/NetworkManager/NetworkManager.conf index c48e647..dc1c41d 100644 --- a/system/NetworkManager/NetworkManager.conf +++ b/system/NetworkManager/NetworkManager.conf @@ -1,4 +1,4 @@ # Configuration file for NetworkManager. # See "man 5 NetworkManager.conf" for details. [main] -dns=none +dns=dnsmasq diff --git a/system/NetworkManager/dnsmasq.d/dnsmasq.conf b/system/NetworkManager/dnsmasq.d/dnsmasq.conf new file mode 100644 index 0000000..6ff5be8 --- /dev/null +++ b/system/NetworkManager/dnsmasq.d/dnsmasq.conf @@ -0,0 +1,7 @@ +cache-size=500 +max-cache-ttl=900 +listen-address=::1 +strict-order +server=1.1.1.1 +server=1.0.0.1 +server=/lis/10.0.14.1 diff --git a/system/resolvconf.conf b/system/resolvconf.conf deleted file mode 100644 index 881849f..0000000 --- a/system/resolvconf.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for resolvconf(8) -# See resolvconf.conf(5) for details - -resolv_conf=/etc/resolv.conf -# If you run a local name server, you should uncomment the below line and -# configure your subscribers configuration files below. -name_servers="1.1.1.1" |