10 files changed, 89 insertions, 13 deletions
diff --git a/archlinux.pkgs b/archlinux.pkgs
index f5a71a7..5d42946 100644
--- a/archlinux.pkgs
+++ b/archlinux.pkgs
@@ -3,9 +3,13 @@ dnl File containing names of explicitly installed packages on system
 esyscmd(`echo define\(HOSTNAME,$(hostname)\)')
 sinclude(HOSTNAME)
 
-dnl Various essential console programs
+dnl Archlinux packages management
 pacaur
 pkgfile
+agetpkg-git
+pkgstats
+
+dnl Various essential console programs
 ifdef(`DESKTOP',gvim,vim)
 vim-spell-cs
 vim-spell-en
@@ -13,7 +17,6 @@ htop
 openssh
 ncdu
 rsync
-rdiff-backup
 wget
 sshfs
 zsh
@@ -28,12 +31,14 @@ include(ranger)
 mpv
 
 dnl System stuff
-dhcpcd-openrc
-fuse-openrc
-ntp-openrc
+ifdef(`OPENRC',dhcpcd-openrc,dhcpcd)
+ifdef(`OPENRC',fuse-openrc,fuse2)
+ifdef(`OPENRC',ntp-openrc,ntp)
+ufw
 sudo
 lsof
 hdparm
+smartmontools
 
 dnl File systems
 btrfs-progs
diff --git a/archlinux.pkgs.d/cynerd-laptop b/archlinux.pkgs.d/cynerd-laptop
index 49305e1..ead0d4b 100644
--- a/archlinux.pkgs.d/cynerd-laptop
+++ b/archlinux.pkgs.d/cynerd-laptop
@@ -1,4 +1,5 @@
 dnl vim:ft=m4
+define(NETFLIX)
 include(laptop)
 include(openrc)
 include(devel)
@@ -7,6 +8,7 @@ include(wine)
 
 intel-ucode
 
+rdiff-backup
 openvpn-openrc
 easy-rsa
 freecad
diff --git a/archlinux.pkgs.d/cynerd-pc b/archlinux.pkgs.d/cynerd-pc
index ae5d2f7..52acb41 100644
--- a/archlinux.pkgs.d/cynerd-pc
+++ b/archlinux.pkgs.d/cynerd-pc
@@ -1,11 +1,14 @@
 dnl vim:ft=m4
 dnl My asus laptop specific stuff
+define(NETFLIX)
 include(laptop)
 include(openrc)
 include(devel)
 include(steam)
 include(wine)
 
+rdiff-backup
+
 asus-kbd-backlight
 intel-ucode
 virtualgl-openrc
diff --git a/archlinux.pkgs.d/desktop b/archlinux.pkgs.d/desktop
index bf2909c..5300a24 100644
--- a/archlinux.pkgs.d/desktop
+++ b/archlinux.pkgs.d/desktop
@@ -2,8 +2,9 @@ dnl vim:ft=m4
 define(DESKTOP)
 
 dnl Some system level stuff
-gpm-openrc
-alsa-utils-openrc
+ifdef(`OPENRC',gpm-openrc,gpm)
+ifdef(`OPENRC',alsa-utils-openrc, alsa-utils)
+ifdef(`OPENRC',lm_sensors-openrc,lm_sensors)
 pulseaudio
 pulseaudio-alsa
 fuseiso
@@ -12,7 +13,7 @@ dnl Some command line tools
 lynx
 abook
 pass
-syncthing-openrc
+ifdef(`OPENRC',syncthing-openrc,syncthing)
 ttysterm
 dnl Stardict
 sdcv
@@ -22,6 +23,7 @@ stardict-en-cz
 dnl Various graphic programs
 gimp
 inkscape
+audacity
 vlc
 conkeror
 surf-webkit2gtk-git
@@ -41,7 +43,7 @@ pidgin-libnotify
 pidgin-window_merge
 
 dnl Chromium
-chromium-widevine
+ifdef(`NETFLIX',chromium-widevine,chromium)
 pepper-flash
 
 dnl Music player daemon
@@ -63,7 +65,7 @@ i3lock
 dmenu
 dunst
 xzoom
-xorg-server-nosystemd
+ifdef(`OPENRC',xorg-server-nosystemd,xorg-server)
 xorg-server-utils
 xorg-xinit
 xorg-xev
@@ -87,7 +89,6 @@ font-mathematica
 ttf-hack
 ttf-symbola
 noto-fonts-emoji
-powertop
 emojione-color-font
 twemoji-color-font
 texlive-fontsextra
diff --git a/archlinux.pkgs.d/devel b/archlinux.pkgs.d/devel
index 41c7b74..596fb31 100644
--- a/archlinux.pkgs.d/devel
+++ b/archlinux.pkgs.d/devel
@@ -19,6 +19,9 @@ ctags
 valgrind
 texlive-latexextra
 git
+cgdb
+cscope
+gcovr
 dnl Web
 ruby
 ruby-jekyll
@@ -32,10 +35,19 @@ python-xattr
 python2-xattr
 python-daemon
 
+dnl Perl
+perl-common-sense
+
+dnl Rust
+rust
+cargo
+
 dnl Building stuff
 clang
 cmake
 patch
+ccache
+clang-tools-extra
 
 dnl work devel
 lua51
diff --git a/archlinux.pkgs.d/koci b/archlinux.pkgs.d/koci
new file mode 100644
index 0000000..26bf94c
--- /dev/null
+++ b/archlinux.pkgs.d/koci
@@ -0,0 +1,42 @@
+dnl vim:ft=m4
+dnl My work pc
+include(desktop)
+include(devel)
+include(latex)
+
+intel-ucode
+
+openvpn
+easy-rsa
+qemu-arch-extra
+octave
+ndisc6
+indent
+sig2dot
+strace
+traceroute
+
+dnl TODO why the hack I need this?
+xinetd
+
+python-numpy
+python-scipy
+python-pip
+swig
+
+dnl OpenWRT build
+vagrant
+dnl for testing
+stress
+
+dnl Something for lxc
+lxc
+arch-install-scripts
+debootstrap
+dhcp
+
+docker
+gnu-netcat
+doxygen
+massif-visualizer
+linux-headers
diff --git a/archlinux.pkgs.d/laptop b/archlinux.pkgs.d/laptop
index 0d1e89a..0d0c059 100644
--- a/archlinux.pkgs.d/laptop
+++ b/archlinux.pkgs.d/laptop
@@ -6,7 +6,6 @@ dnl System essentials
 syslinux
 efibootmgr
 acpid-openrc
-lm_sensors-openrc
 xf86-input-synaptics
 xf86-video-intel
 
diff --git a/archlinux.pkgs.d/latex b/archlinux.pkgs.d/latex
new file mode 100644
index 0000000..376eecc
--- /dev/null
+++ b/archlinux.pkgs.d/latex
@@ -0,0 +1,7 @@
+dnl vim:ft=m4
+define(LATEX)
+
+dnl texlive-most and texlive-lang groups
+syscmd(`pacman -Qg texlive-most | awk "{print \$2}"')
+syscmd(`pacman -Qg texlive-lang | awk "{print \$2}"')
+
diff --git a/install b/install
index 46268ff..cae8293 100755
--- a/install
+++ b/install
@@ -106,3 +106,8 @@ read -p "Install backup script? (Y/n) "
 if [[ $REPLY =~ ^[Yy]?$ ]]; then
 	inst local/bin/system-backup ~/.local/bin/system-backup
 fi
+
+read -p "Install lxc-net script? (Y/n) "
+if [[ $REPLY =~ ^[Yy]?$ ]]; then
+	inst local/bin/lxc-net ~/.local/bin/lxc-net
+fi
diff --git a/local/bin/lxc-net b/local/bin/lxc-net
index d7e4a17..a1725fc 100755
--- a/local/bin/lxc-net
+++ b/local/bin/lxc-net
@@ -36,5 +36,5 @@ subnet 192.168.30.0 netmask 255.255.255.0 {
 dhcpd -4 -pf /tmp/lxc-dhcpd.pid -cf /tmp/lxc-dhcpd.conf vbr0
 
 # Setup network forwarding (TODO add -o ethX to iptable command)
-sysctl  net.ipv4.ip_forward=1
+sysctl net.ipv4.ip_forward=1
 iptables -t nat -A POSTROUTING -j MASQUERADE