From 5c1f8cbc70cd5e6867ef6a2a06d27a40daa07010 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Oct 2013 13:28:20 +0200 Subject: [PATCH] Move all of NixOS to nixos/ in preparation of the repository merge --- .gitignore => nixos/.gitignore | 0 .version => nixos/.version | 0 COPYING => nixos/COPYING | 0 README => nixos/README | 0 default.nix => nixos/default.nix | 0 {doc => nixos/doc}/config-examples/basic.nix | 0 .../closed-install-configuration.nix | 0 {doc => nixos/doc}/config-examples/root-on-lvm.nix | 0 {doc => nixos/doc}/config-examples/svn-server.nix | 0 .../doc}/config-examples/x86_64-usbstick.nix | 0 {doc => nixos/doc}/manual/configuration.xml | 0 {doc => nixos/doc}/manual/default.nix | 0 {doc => nixos/doc}/manual/development.xml | 0 {doc => nixos/doc}/manual/installation.xml | 0 {doc => nixos/doc}/manual/man-configuration.xml | 0 {doc => nixos/doc}/manual/man-nixos-build-vms.xml | 0 {doc => nixos/doc}/manual/man-nixos-option.xml | 0 {doc => nixos/doc}/manual/man-nixos-rebuild.xml | 0 {doc => nixos/doc}/manual/man-pages.xml | 0 {doc => nixos/doc}/manual/manual.xml | 0 {doc => nixos/doc}/manual/options-to-docbook.xsl | 0 {doc => nixos/doc}/manual/running.xml | 0 {doc => nixos/doc}/manual/style.css | 0 {doc => nixos/doc}/manual/troubleshooting.xml | 0 {doc => nixos/doc}/manual/userconfiguration.xml | 0 {gui => nixos/gui}/README | 0 {gui => nixos/gui}/application.ini | 0 {gui => nixos/gui}/chrome.manifest | 0 {gui => nixos/gui}/chrome/chrome.manifest | 0 {gui => nixos/gui}/chrome/content/io.js | 0 {gui => nixos/gui}/chrome/content/main.js | 0 {gui => nixos/gui}/chrome/content/myviewer.xul | 0 {gui => nixos/gui}/chrome/content/nixos.js | 0 {gui => nixos/gui}/chrome/content/optionView.js | 0 {gui => nixos/gui}/components/clh.js | 0 .../gui}/defaults/preferences/myviewer-prefs.js | 0 {lib => nixos/lib}/build-vms.nix | 0 {lib => nixos/lib}/channel-expr.nix | 0 {lib => nixos/lib}/eval-config.nix | 0 {lib => nixos/lib}/from-env.nix | 0 {lib => nixos/lib}/make-iso9660-image.nix | 0 {lib => nixos/lib}/make-iso9660-image.sh | 0 {lib => nixos/lib}/make-squashfs.nix | 0 {lib => nixos/lib}/make-system-tarball.nix | 0 {lib => nixos/lib}/make-system-tarball.sh | 0 {lib => nixos/lib}/qemu-flags.nix | 0 {lib => nixos/lib}/test-driver/Logger.pm | 0 {lib => nixos/lib}/test-driver/Machine.pm | 0 {lib => nixos/lib}/test-driver/log2html.xsl | 0 {lib => nixos/lib}/test-driver/logfile.css | 0 {lib => nixos/lib}/test-driver/test-driver.pl | 0 {lib => nixos/lib}/test-driver/treebits.js | 0 {lib => nixos/lib}/testing.nix | 0 {lib => nixos/lib}/utils.nix | 0 .../maintainers}/option-usages.nix | 0 .../maintainers}/scripts/ec2/create-ebs-amis.py | 0 .../maintainers}/scripts/ec2/create-s3-amis.sh | 0 .../maintainers}/scripts/ec2/ebs-creator.nix | 0 .../modules}/config/fonts/corefonts.nix | 0 .../modules}/config/fonts/fontconfig.nix | 0 {modules => nixos/modules}/config/fonts/fontdir.nix | 0 {modules => nixos/modules}/config/fonts/fonts.nix | 0 .../modules}/config/fonts/ghostscript.nix | 0 {modules => nixos/modules}/config/gnu.nix | 0 {modules => nixos/modules}/config/i18n.nix | 0 {modules => nixos/modules}/config/krb5.nix | 0 {modules => nixos/modules}/config/ldap.nix | 0 {modules => nixos/modules}/config/networking.nix | 0 {modules => nixos/modules}/config/no-x-libs.nix | 0 {modules => nixos/modules}/config/nsswitch.nix | 0 .../modules}/config/power-management.nix | 0 {modules => nixos/modules}/config/pulseaudio.nix | 0 .../modules}/config/shells-environment.nix | 0 {modules => nixos/modules}/config/swap.nix | 0 {modules => nixos/modules}/config/sysctl.nix | 0 {modules => nixos/modules}/config/system-path.nix | 0 {modules => nixos/modules}/config/timezone.nix | 0 .../modules}/config/unix-odbc-drivers.nix | 0 {modules => nixos/modules}/config/users-groups.nix | 0 .../modules}/hardware/all-firmware.nix | 0 .../modules}/hardware/cpu/amd-microcode.nix | 0 .../modules}/hardware/cpu/intel-microcode.nix | 0 {modules => nixos/modules}/hardware/network/b43.nix | 0 .../modules}/hardware/network/broadcom-43xx.nix | 0 .../modules}/hardware/network/intel-2030.nix | 0 .../modules}/hardware/network/intel-2100bg.nix | 0 .../modules}/hardware/network/intel-2200bg.nix | 0 .../modules}/hardware/network/intel-3945abg.nix | 0 .../modules}/hardware/network/intel-4965agn.nix | 0 .../modules}/hardware/network/intel-5000.nix | 0 .../modules}/hardware/network/intel-5150.nix | 0 .../modules}/hardware/network/intel-6000.nix | 0 .../modules}/hardware/network/intel-6000g2a.nix | 0 .../modules}/hardware/network/intel-6000g2b.nix | 0 .../modules}/hardware/network/ralink.nix | 0 .../modules}/hardware/network/rtl8192c.nix | 0 .../modules}/hardware/network/smc-2632w/default.nix | 0 .../smc-2632w/firmware/cis/SMC2632W-v1.02.cis | 0 .../modules}/hardware/network/zydas-zd1211.nix | 0 {modules => nixos/modules}/hardware/pcmcia.nix | 0 .../modules}/hardware/video/encoder/wis-go7007.nix | 0 .../modules}/hardware/video/radeon.nix | 0 .../modules}/installer/cd-dvd/channel.nix | 0 .../installer/cd-dvd/installation-cd-base.nix | 0 .../installer/cd-dvd/installation-cd-efi.nix | 0 .../installer/cd-dvd/installation-cd-graphical.nix | 0 .../cd-dvd/installation-cd-minimal-new-kernel.nix | 0 .../installer/cd-dvd/installation-cd-minimal.nix | 0 .../installer/cd-dvd/installation-cd-new-kernel.nix | 0 .../modules}/installer/cd-dvd/iso-image.nix | 0 .../modules}/installer/cd-dvd/live-dvd.nix | 0 .../installer/cd-dvd/system-tarball-fuloong2f.nix | 0 .../installer/cd-dvd/system-tarball-pc-readme.txt | 0 .../modules}/installer/cd-dvd/system-tarball-pc.nix | 0 .../installer/cd-dvd/system-tarball-sheevaplug.nix | 0 .../modules}/installer/cd-dvd/system-tarball.nix | 0 .../modules}/installer/scan/detected.nix | 0 .../modules}/installer/scan/not-detected.nix | 0 .../modules}/installer/tools/get-version-suffix | 0 .../installer/tools/nixos-build-vms/build-vms.nix | 0 .../tools/nixos-build-vms/nixos-build-vms.sh | 0 .../modules}/installer/tools/nixos-checkout.nix | 0 .../installer/tools/nixos-gen-seccure-keys.sh | 0 .../modules}/installer/tools/nixos-hardware-scan.pl | 0 .../modules}/installer/tools/nixos-install.sh | 0 .../modules}/installer/tools/nixos-option.sh | 0 .../modules}/installer/tools/nixos-rebuild.sh | 0 .../modules}/installer/tools/nixos-version.sh | 0 .../modules}/installer/tools/tools.nix | 0 .../modules}/installer/virtualbox-demo.nix | 0 {modules => nixos/modules}/misc/assertions.nix | 0 {modules => nixos/modules}/misc/check-config.nix | 0 {modules => nixos/modules}/misc/crashdump.nix | 0 {modules => nixos/modules}/misc/ids.nix | 0 {modules => nixos/modules}/misc/lib.nix | 0 {modules => nixos/modules}/misc/locate.nix | 0 {modules => nixos/modules}/misc/nixpkgs.nix | 0 {modules => nixos/modules}/misc/passthru.nix | 0 {modules => nixos/modules}/misc/version.nix | 0 {modules => nixos/modules}/module-list.nix | 0 .../modules}/profiles/all-hardware.nix | 0 {modules => nixos/modules}/profiles/base.nix | 0 .../modules}/profiles/clone-config.nix | 0 {modules => nixos/modules}/profiles/demo.nix | 0 {modules => nixos/modules}/profiles/graphical.nix | 0 {modules => nixos/modules}/profiles/headless.nix | 0 .../modules}/profiles/installation-device.nix | 0 {modules => nixos/modules}/profiles/minimal.nix | 0 {modules => nixos/modules}/profiles/qemu-guest.nix | 0 {modules => nixos/modules}/programs/atop.nix | 0 {modules => nixos/modules}/programs/bash/bash.nix | 0 .../modules}/programs/bash/command-not-found.nix | 0 .../modules}/programs/bash/command-not-found.pl | 0 {modules => nixos/modules}/programs/bash/inputrc | 0 {modules => nixos/modules}/programs/blcr.nix | 0 {modules => nixos/modules}/programs/environment.nix | 0 {modules => nixos/modules}/programs/info.nix | 0 {modules => nixos/modules}/programs/shadow.nix | 0 {modules => nixos/modules}/programs/shell.nix | 0 {modules => nixos/modules}/programs/ssh.nix | 0 {modules => nixos/modules}/programs/ssmtp.nix | 0 {modules => nixos/modules}/programs/venus.nix | 0 {modules => nixos/modules}/programs/virtualbox.nix | 0 {modules => nixos/modules}/programs/wvdial.nix | 0 {modules => nixos/modules}/programs/zsh/zinputrc | 0 {modules => nixos/modules}/programs/zsh/zsh.nix | 0 {modules => nixos/modules}/rename.nix | 0 .../modules}/security/apparmor-suid.nix | 0 {modules => nixos/modules}/security/apparmor.nix | 0 {modules => nixos/modules}/security/ca.nix | 0 {modules => nixos/modules}/security/pam.nix | 0 {modules => nixos/modules}/security/pam_usb.nix | 0 {modules => nixos/modules}/security/polkit.nix | 0 {modules => nixos/modules}/security/rngd.nix | 0 {modules => nixos/modules}/security/rtkit.nix | 0 .../modules}/security/setuid-wrapper.c | 0 .../modules}/security/setuid-wrappers.nix | 0 {modules => nixos/modules}/security/sudo.nix | 0 .../services/amqp/activemq/ActiveMQBroker.java | 0 .../modules}/services/amqp/activemq/default.nix | 0 .../modules}/services/amqp/rabbitmq.nix | 0 {modules => nixos/modules}/services/audio/alsa.nix | 0 .../modules}/services/audio/fuppes.nix | 0 .../modules}/services/audio/fuppes/vfolder.cfg | 0 {modules => nixos/modules}/services/audio/mpd.nix | 0 .../modules}/services/backup/almir.nix | 0 .../modules}/services/backup/bacula.nix | 0 .../modules}/services/backup/mysql-backup.nix | 0 .../modules}/services/backup/postgresql-backup.nix | 0 .../modules}/services/backup/rsnapshot.nix | 0 .../modules}/services/backup/sitecopy-backup.nix | 0 .../modules}/services/databases/4store-endpoint.nix | 0 .../modules}/services/databases/4store.nix | 0 .../modules}/services/databases/firebird.nix | 0 .../modules}/services/databases/memcached.nix | 0 .../modules}/services/databases/mongodb.nix | 0 .../modules}/services/databases/mysql.nix | 0 .../modules}/services/databases/mysql55.nix | 0 .../modules}/services/databases/openldap.nix | 0 .../modules}/services/databases/postgresql.nix | 0 .../modules}/services/databases/redis.nix | 0 .../modules}/services/databases/virtuoso.nix | 0 .../modules}/services/games/ghost-one.nix | 0 .../modules}/services/hardware/acpid.nix | 0 .../modules}/services/hardware/bluetooth.nix | 0 .../modules}/services/hardware/nvidia-optimus.nix | 0 .../modules}/services/hardware/pcscd.nix | 0 .../modules}/services/hardware/pommed.nix | 0 .../modules}/services/hardware/sane.nix | 0 .../modules}/services/hardware/thinkfan.nix | 0 .../modules}/services/hardware/udev.nix | 0 .../modules}/services/hardware/udisks.nix | 0 .../modules}/services/hardware/udisks2.nix | 0 .../modules}/services/hardware/upower.nix | 0 .../modules}/services/logging/klogd.nix | 0 .../modules}/services/logging/logcheck.nix | 0 .../modules}/services/logging/logrotate.nix | 0 .../modules}/services/logging/logstash.nix | 0 .../modules}/services/logging/rsyslogd.nix | 0 .../modules}/services/logging/syslogd.nix | 0 .../modules}/services/mail/dovecot.nix | 0 .../modules}/services/mail/freepops.nix | 0 {modules => nixos/modules}/services/mail/mail.nix | 0 .../modules}/services/mail/opensmtpd.nix | 0 .../modules}/services/mail/postfix.nix | 0 .../modules}/services/mail/spamassassin.nix | 0 {modules => nixos/modules}/services/misc/autofs.nix | 0 .../modules}/services/misc/cgminer.nix | 0 {modules => nixos/modules}/services/misc/disnix.nix | 0 {modules => nixos/modules}/services/misc/felix.nix | 0 .../modules}/services/misc/folding-at-home.nix | 0 {modules => nixos/modules}/services/misc/gpsd.nix | 0 .../modules}/services/misc/nix-daemon.nix | 0 {modules => nixos/modules}/services/misc/nix-gc.nix | 0 .../modules}/services/misc/nixos-manual.nix | 0 {modules => nixos/modules}/services/misc/rogue.nix | 0 .../modules}/services/misc/svnserve.nix | 0 .../modules}/services/misc/synergy.nix | 0 .../modules}/services/monitoring/apcupsd.nix | 0 .../modules}/services/monitoring/dd-agent.nix | 0 .../modules}/services/monitoring/graphite.nix | 0 .../modules}/services/monitoring/monit.nix | 0 .../services/monitoring/nagios/commands.cfg | 0 .../modules}/services/monitoring/nagios/default.nix | 0 .../services/monitoring/nagios/host-templates.cfg | 0 .../monitoring/nagios/service-templates.cfg | 0 .../services/monitoring/nagios/timeperiods.cfg | 0 .../modules}/services/monitoring/smartd.nix | 0 .../modules}/services/monitoring/statsd.nix | 0 .../modules}/services/monitoring/systemhealth.nix | 0 .../modules}/services/monitoring/ups.nix | 0 .../modules}/services/monitoring/uptime.nix | 0 .../modules}/services/monitoring/zabbix-agent.nix | 0 .../modules}/services/monitoring/zabbix-server.nix | 0 .../modules}/services/network-filesystems/drbd.nix | 0 .../modules}/services/network-filesystems/nfsd.nix | 0 .../network-filesystems/openafs-client/default.nix | 0 .../modules}/services/network-filesystems/samba.nix | 0 .../modules}/services/networking/amuled.nix | 0 .../modules}/services/networking/avahi-daemon.nix | 0 .../modules}/services/networking/bind.nix | 0 .../modules}/services/networking/bitlbee.nix | 0 .../modules}/services/networking/chrony.nix | 0 .../modules}/services/networking/cntlm.nix | 0 .../modules}/services/networking/ddclient.nix | 0 .../modules}/services/networking/dhclient.nix | 0 .../modules}/services/networking/dhcpcd.nix | 0 .../modules}/services/networking/dhcpd.nix | 0 .../modules}/services/networking/dnsmasq.nix | 0 .../modules}/services/networking/ejabberd.nix | 0 .../modules}/services/networking/firewall.nix | 0 .../modules}/services/networking/flashpolicyd.nix | 0 .../modules}/services/networking/freenet.nix | 0 .../modules}/services/networking/git-daemon.nix | 0 .../modules}/services/networking/gnunet.nix | 0 .../modules}/services/networking/gogoclient.nix | 0 .../modules}/services/networking/gvpe.nix | 0 .../modules}/services/networking/hostapd.nix | 0 .../modules}/services/networking/ifplugd.nix | 0 .../modules}/services/networking/iodined.nix | 0 .../services/networking/ircd-hybrid/builder.sh | 0 .../services/networking/ircd-hybrid/control.in | 0 .../services/networking/ircd-hybrid/default.nix | 0 .../services/networking/ircd-hybrid/ircd.conf | 0 .../modules}/services/networking/minidlna.nix | 0 .../modules}/services/networking/nat.nix | 0 .../modules}/services/networking/networkmanager.nix | 0 .../modules}/services/networking/ntpd.nix | 0 .../modules}/services/networking/oidentd.nix | 0 .../modules}/services/networking/openfire.nix | 0 .../modules}/services/networking/openvpn.nix | 0 .../modules}/services/networking/prayer.nix | 0 .../modules}/services/networking/privoxy.nix | 0 .../modules}/services/networking/quassel.nix | 0 .../modules}/services/networking/radvd.nix | 0 .../modules}/services/networking/rdnssd.nix | 0 .../modules}/services/networking/rpcbind.nix | 0 .../modules}/services/networking/sabnzbd.nix | 0 .../modules}/services/networking/ssh/lshd.nix | 0 .../modules}/services/networking/ssh/sshd.nix | 0 .../modules}/services/networking/supybot.nix | 0 .../modules}/services/networking/tcpcrypt.nix | 0 .../modules}/services/networking/tftpd.nix | 0 .../modules}/services/networking/unbound.nix | 0 .../modules}/services/networking/vsftpd.nix | 0 .../modules}/services/networking/wakeonlan.nix | 0 .../modules}/services/networking/websockify.nix | 0 .../modules}/services/networking/wicd.nix | 0 .../modules}/services/networking/wpa_supplicant.nix | 0 .../modules}/services/networking/xinetd.nix | 0 .../modules}/services/printing/cupsd.nix | 0 .../modules}/services/scheduling/atd.nix | 0 .../modules}/services/scheduling/cron.nix | 0 .../modules}/services/scheduling/fcron.nix | 0 .../modules}/services/search/elasticsearch.nix | 0 .../modules}/services/security/clamav.nix | 0 .../modules}/services/security/fail2ban.nix | 0 .../modules}/services/security/fprot.nix | 0 .../modules}/services/security/frandom.nix | 0 .../modules}/services/security/tor.nix | 0 .../modules}/services/security/torify.nix | 0 .../modules}/services/security/torsocks.nix | 0 {modules => nixos/modules}/services/system/dbus.nix | 0 .../modules}/services/system/kerberos.nix | 0 .../modules}/services/system/nscd.conf | 0 {modules => nixos/modules}/services/system/nscd.nix | 0 .../modules}/services/system/uptimed.nix | 0 .../modules}/services/torrent/deluge.nix | 0 .../modules}/services/torrent/transmission.nix | 0 {modules => nixos/modules}/services/ttys/agetty.nix | 0 {modules => nixos/modules}/services/ttys/gpm.nix | 0 .../services/web-servers/apache-httpd/default.nix | 0 .../services/web-servers/apache-httpd/mediawiki.nix | 0 .../services/web-servers/apache-httpd/mercurial.nix | 0 .../web-servers/apache-httpd/per-server-options.nix | 0 .../web-servers/apache-httpd/tomcat-connector.nix | 0 .../services/web-servers/apache-httpd/trac.nix | 0 .../services/web-servers/apache-httpd/zabbix.nix | 0 .../modules}/services/web-servers/jboss/builder.sh | 0 .../modules}/services/web-servers/jboss/default.nix | 0 .../modules}/services/web-servers/lighttpd/cgit.nix | 0 .../services/web-servers/lighttpd/default.nix | 0 .../services/web-servers/lighttpd/gitweb.nix | 0 .../modules}/services/web-servers/nginx/default.nix | 0 .../modules}/services/web-servers/tomcat.nix | 0 .../services/web-servers/varnish/default.nix | 0 .../modules}/services/web-servers/zope2.nix | 0 .../services/x11/desktop-managers/default.nix | 0 .../modules}/services/x11/desktop-managers/e17.nix | 0 .../services/x11/desktop-managers/gnome.nix | 0 .../modules}/services/x11/desktop-managers/kde4.nix | 0 .../modules}/services/x11/desktop-managers/none.nix | 0 .../modules}/services/x11/desktop-managers/xfce.nix | 0 .../services/x11/desktop-managers/xterm.nix | 0 .../modules}/services/x11/display-managers/auto.nix | 0 .../services/x11/display-managers/default.nix | 0 .../modules}/services/x11/display-managers/kdm.nix | 0 .../services/x11/display-managers/lightdm.nix | 0 .../modules}/services/x11/display-managers/slim.nix | 0 .../modules}/services/x11/hardware/multitouch.nix | 0 .../modules}/services/x11/hardware/synaptics.nix | 0 .../modules}/services/x11/hardware/wacom.nix | 0 .../modules}/services/x11/terminal-server.nix | 0 .../services/x11/window-managers/awesome.nix | 0 .../services/x11/window-managers/compiz.nix | 0 .../services/x11/window-managers/default.nix | 0 .../modules}/services/x11/window-managers/i3.nix | 0 .../modules}/services/x11/window-managers/icewm.nix | 0 .../services/x11/window-managers/metacity.nix | 0 .../modules}/services/x11/window-managers/none.nix | 0 .../services/x11/window-managers/openbox.nix | 0 .../modules}/services/x11/window-managers/twm.nix | 0 .../modules}/services/x11/window-managers/wmii.nix | 0 .../modules}/services/x11/window-managers/xbmc.nix | 0 .../services/x11/window-managers/xmonad.nix | 0 {modules => nixos/modules}/services/x11/xfs.conf | 0 {modules => nixos/modules}/services/x11/xfs.nix | 0 {modules => nixos/modules}/services/x11/xserver.nix | 0 .../system/activation/activation-script.nix | 0 .../modules}/system/activation/no-clone.nix | 0 .../system/activation/switch-to-configuration.pl | 0 .../modules}/system/activation/top-level.nix | 0 {modules => nixos/modules}/system/boot/kernel.nix | 0 {modules => nixos/modules}/system/boot/kexec.nix | 0 .../loader/efi-boot-stub/efi-boot-stub-builder.sh | 0 .../boot/loader/efi-boot-stub/efi-boot-stub.nix | 0 .../modules}/system/boot/loader/efi.nix | 0 .../generations-dir/generations-dir-builder.sh | 0 .../boot/loader/generations-dir/generations-dir.nix | 0 .../modules}/system/boot/loader/grub/grub.nix | 0 .../system/boot/loader/grub/install-grub.pl | 0 .../modules}/system/boot/loader/grub/memtest.nix | 0 .../boot/loader/grub/winkler-gnu-blue-640x480.png | Bin .../system/boot/loader/grub/winkler-gnu-blue.README | 0 .../boot/loader/gummiboot/gummiboot-builder.py | 0 .../system/boot/loader/gummiboot/gummiboot.nix | 0 .../boot/loader/init-script/init-script-builder.sh | 0 .../system/boot/loader/init-script/init-script.nix | 0 .../system/boot/loader/raspberrypi/builder.sh | 0 .../system/boot/loader/raspberrypi/raspberrypi.nix | 0 {modules => nixos/modules}/system/boot/luksroot.nix | 0 {modules => nixos/modules}/system/boot/modprobe.nix | 0 .../modules}/system/boot/readonly-mountpoint.c | 0 {modules => nixos/modules}/system/boot/shutdown.nix | 0 .../modules}/system/boot/stage-1-init.sh | 0 {modules => nixos/modules}/system/boot/stage-1.nix | 0 .../modules}/system/boot/stage-2-init.sh | 0 {modules => nixos/modules}/system/boot/stage-2.nix | 0 .../modules}/system/boot/systemd-unit-options.nix | 0 {modules => nixos/modules}/system/boot/systemd.nix | 0 {modules => nixos/modules}/system/etc/etc.nix | 0 {modules => nixos/modules}/system/etc/make-etc.sh | 0 {modules => nixos/modules}/system/etc/setup-etc.pl | 0 .../modules}/system/upstart/upstart.nix | 0 {modules => nixos/modules}/tasks/cpu-freq.nix | 0 {modules => nixos/modules}/tasks/filesystems.nix | 0 .../modules}/tasks/filesystems/btrfs.nix | 0 .../modules}/tasks/filesystems/ext.nix | 0 .../modules}/tasks/filesystems/nfs.nix | 0 .../modules}/tasks/filesystems/reiserfs.nix | 0 .../modules}/tasks/filesystems/unionfs-fuse.nix | 0 .../modules}/tasks/filesystems/vfat.nix | 0 .../modules}/tasks/filesystems/xfs.nix | 0 .../modules}/tasks/filesystems/zfs.nix | 0 {modules => nixos/modules}/tasks/kbd.nix | 0 {modules => nixos/modules}/tasks/lvm.nix | 0 .../modules}/tasks/network-interfaces.nix | 0 .../modules}/tasks/scsi-link-power-management.nix | 0 {modules => nixos/modules}/tasks/swraid.nix | 0 .../modules}/tasks/tty-backgrounds-combine.sh | 0 .../modules}/testing/minimal-kernel.nix | 0 .../modules}/testing/test-instrumentation.nix | 0 .../modules}/virtualisation/amazon-config.nix | 0 .../modules}/virtualisation/amazon-image.nix | 0 .../modules}/virtualisation/ec2-data.nix | 0 .../modules}/virtualisation/libvirtd.nix | 0 .../modules}/virtualisation/nova-config.nix | 0 .../modules}/virtualisation/nova-image.nix | 0 {modules => nixos/modules}/virtualisation/nova.nix | 0 {modules => nixos/modules}/virtualisation/qemu-opts | 0 .../modules}/virtualisation/qemu-vm.nix | 0 .../modules}/virtualisation/virtualbox-guest.nix | 0 .../modules}/virtualisation/virtualbox-image.nix | 0 .../modules}/virtualisation/xen-dom0.nix | 0 .../modules}/virtualisation/xen-domU.nix | 0 release-combined.nix => nixos/release-combined.nix | 0 release.nix => nixos/release.nix | 0 {tests => nixos/tests}/avahi.nix | 0 {tests => nixos/tests}/bittorrent.nix | 0 {tests => nixos/tests}/check-filesystems.nix | 0 {tests => nixos/tests}/common/user-account.nix | 0 {tests => nixos/tests}/common/x11.nix | 0 {tests => nixos/tests}/default.nix | 0 {tests => nixos/tests}/efi-installer.nix | 0 {tests => nixos/tests}/firefox.nix | 0 {tests => nixos/tests}/firewall.nix | 0 {tests => nixos/tests}/installer.nix | 0 {tests => nixos/tests}/ipv6.nix | 0 {tests => nixos/tests}/kde4.nix | 0 {tests => nixos/tests}/kexec.nix | 0 {tests => nixos/tests}/login.nix | 0 {tests => nixos/tests}/misc.nix | 0 {tests => nixos/tests}/mpich-example.c | 0 {tests => nixos/tests}/mpich.nix | 0 {tests => nixos/tests}/mysql-replication.nix | 0 {tests => nixos/tests}/mysql.nix | 0 {tests => nixos/tests}/nat.nix | 0 {tests => nixos/tests}/nfs.nix | 0 {tests => nixos/tests}/openssh.nix | 0 {tests => nixos/tests}/partition.nix | 0 {tests => nixos/tests}/printing.nix | 0 {tests => nixos/tests}/proxy.nix | 0 {tests => nixos/tests}/quake3.nix | 0 {tests => nixos/tests}/run-in-machine.nix | 0 {tests => nixos/tests}/simple.nix | 0 {tests => nixos/tests}/subversion.nix | 0 {tests => nixos/tests}/test-config-examples.sh | 0 {tests => nixos/tests}/testdb.sql | 0 {tests => nixos/tests}/tomcat.nix | 0 {tests => nixos/tests}/trac.nix | 0 {tests => nixos/tests}/xfce.nix | 0 481 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => nixos/.gitignore (100%) rename .version => nixos/.version (100%) rename COPYING => nixos/COPYING (100%) rename README => nixos/README (100%) rename default.nix => nixos/default.nix (100%) rename {doc => nixos/doc}/config-examples/basic.nix (100%) rename {doc => nixos/doc}/config-examples/closed-install-configuration.nix (100%) rename {doc => nixos/doc}/config-examples/root-on-lvm.nix (100%) rename {doc => nixos/doc}/config-examples/svn-server.nix (100%) rename {doc => nixos/doc}/config-examples/x86_64-usbstick.nix (100%) rename {doc => nixos/doc}/manual/configuration.xml (100%) rename {doc => nixos/doc}/manual/default.nix (100%) rename {doc => nixos/doc}/manual/development.xml (100%) rename {doc => nixos/doc}/manual/installation.xml (100%) rename {doc => nixos/doc}/manual/man-configuration.xml (100%) rename {doc => nixos/doc}/manual/man-nixos-build-vms.xml (100%) rename {doc => nixos/doc}/manual/man-nixos-option.xml (100%) rename {doc => nixos/doc}/manual/man-nixos-rebuild.xml (100%) rename {doc => nixos/doc}/manual/man-pages.xml (100%) rename {doc => nixos/doc}/manual/manual.xml (100%) rename {doc => nixos/doc}/manual/options-to-docbook.xsl (100%) rename {doc => nixos/doc}/manual/running.xml (100%) rename {doc => nixos/doc}/manual/style.css (100%) rename {doc => nixos/doc}/manual/troubleshooting.xml (100%) rename {doc => nixos/doc}/manual/userconfiguration.xml (100%) rename {gui => nixos/gui}/README (100%) rename {gui => nixos/gui}/application.ini (100%) rename {gui => nixos/gui}/chrome.manifest (100%) rename {gui => nixos/gui}/chrome/chrome.manifest (100%) rename {gui => nixos/gui}/chrome/content/io.js (100%) rename {gui => nixos/gui}/chrome/content/main.js (100%) rename {gui => nixos/gui}/chrome/content/myviewer.xul (100%) rename {gui => nixos/gui}/chrome/content/nixos.js (100%) rename {gui => nixos/gui}/chrome/content/optionView.js (100%) rename {gui => nixos/gui}/components/clh.js (100%) rename {gui => nixos/gui}/defaults/preferences/myviewer-prefs.js (100%) rename {lib => nixos/lib}/build-vms.nix (100%) rename {lib => nixos/lib}/channel-expr.nix (100%) rename {lib => nixos/lib}/eval-config.nix (100%) rename {lib => nixos/lib}/from-env.nix (100%) rename {lib => nixos/lib}/make-iso9660-image.nix (100%) rename {lib => nixos/lib}/make-iso9660-image.sh (100%) rename {lib => nixos/lib}/make-squashfs.nix (100%) rename {lib => nixos/lib}/make-system-tarball.nix (100%) rename {lib => nixos/lib}/make-system-tarball.sh (100%) rename {lib => nixos/lib}/qemu-flags.nix (100%) rename {lib => nixos/lib}/test-driver/Logger.pm (100%) rename {lib => nixos/lib}/test-driver/Machine.pm (100%) rename {lib => nixos/lib}/test-driver/log2html.xsl (100%) rename {lib => nixos/lib}/test-driver/logfile.css (100%) rename {lib => nixos/lib}/test-driver/test-driver.pl (100%) rename {lib => nixos/lib}/test-driver/treebits.js (100%) rename {lib => nixos/lib}/testing.nix (100%) rename {lib => nixos/lib}/utils.nix (100%) rename {maintainers => nixos/maintainers}/option-usages.nix (100%) rename {maintainers => nixos/maintainers}/scripts/ec2/create-ebs-amis.py (100%) rename {maintainers => nixos/maintainers}/scripts/ec2/create-s3-amis.sh (100%) rename {maintainers => nixos/maintainers}/scripts/ec2/ebs-creator.nix (100%) rename {modules => nixos/modules}/config/fonts/corefonts.nix (100%) rename {modules => nixos/modules}/config/fonts/fontconfig.nix (100%) rename {modules => nixos/modules}/config/fonts/fontdir.nix (100%) rename {modules => nixos/modules}/config/fonts/fonts.nix (100%) rename {modules => nixos/modules}/config/fonts/ghostscript.nix (100%) rename {modules => nixos/modules}/config/gnu.nix (100%) rename {modules => nixos/modules}/config/i18n.nix (100%) rename {modules => nixos/modules}/config/krb5.nix (100%) rename {modules => nixos/modules}/config/ldap.nix (100%) rename {modules => nixos/modules}/config/networking.nix (100%) rename {modules => nixos/modules}/config/no-x-libs.nix (100%) rename {modules => nixos/modules}/config/nsswitch.nix (100%) rename {modules => nixos/modules}/config/power-management.nix (100%) rename {modules => nixos/modules}/config/pulseaudio.nix (100%) rename {modules => nixos/modules}/config/shells-environment.nix (100%) rename {modules => nixos/modules}/config/swap.nix (100%) rename {modules => nixos/modules}/config/sysctl.nix (100%) rename {modules => nixos/modules}/config/system-path.nix (100%) rename {modules => nixos/modules}/config/timezone.nix (100%) rename {modules => nixos/modules}/config/unix-odbc-drivers.nix (100%) rename {modules => nixos/modules}/config/users-groups.nix (100%) rename {modules => nixos/modules}/hardware/all-firmware.nix (100%) rename {modules => nixos/modules}/hardware/cpu/amd-microcode.nix (100%) rename {modules => nixos/modules}/hardware/cpu/intel-microcode.nix (100%) rename {modules => nixos/modules}/hardware/network/b43.nix (100%) rename {modules => nixos/modules}/hardware/network/broadcom-43xx.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-2030.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-2100bg.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-2200bg.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-3945abg.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-4965agn.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-5000.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-5150.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-6000.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-6000g2a.nix (100%) rename {modules => nixos/modules}/hardware/network/intel-6000g2b.nix (100%) rename {modules => nixos/modules}/hardware/network/ralink.nix (100%) rename {modules => nixos/modules}/hardware/network/rtl8192c.nix (100%) rename {modules => nixos/modules}/hardware/network/smc-2632w/default.nix (100%) rename {modules => nixos/modules}/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis (100%) rename {modules => nixos/modules}/hardware/network/zydas-zd1211.nix (100%) rename {modules => nixos/modules}/hardware/pcmcia.nix (100%) rename {modules => nixos/modules}/hardware/video/encoder/wis-go7007.nix (100%) rename {modules => nixos/modules}/hardware/video/radeon.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/channel.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-base.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-efi.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-graphical.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-minimal.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/installation-cd-new-kernel.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/iso-image.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/live-dvd.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-fuloong2f.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-pc-readme.txt (100%) rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-pc.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/system-tarball-sheevaplug.nix (100%) rename {modules => nixos/modules}/installer/cd-dvd/system-tarball.nix (100%) rename {modules => nixos/modules}/installer/scan/detected.nix (100%) rename {modules => nixos/modules}/installer/scan/not-detected.nix (100%) rename {modules => nixos/modules}/installer/tools/get-version-suffix (100%) rename {modules => nixos/modules}/installer/tools/nixos-build-vms/build-vms.nix (100%) rename {modules => nixos/modules}/installer/tools/nixos-build-vms/nixos-build-vms.sh (100%) rename {modules => nixos/modules}/installer/tools/nixos-checkout.nix (100%) rename {modules => nixos/modules}/installer/tools/nixos-gen-seccure-keys.sh (100%) rename {modules => nixos/modules}/installer/tools/nixos-hardware-scan.pl (100%) rename {modules => nixos/modules}/installer/tools/nixos-install.sh (100%) rename {modules => nixos/modules}/installer/tools/nixos-option.sh (100%) rename {modules => nixos/modules}/installer/tools/nixos-rebuild.sh (100%) rename {modules => nixos/modules}/installer/tools/nixos-version.sh (100%) rename {modules => nixos/modules}/installer/tools/tools.nix (100%) rename {modules => nixos/modules}/installer/virtualbox-demo.nix (100%) rename {modules => nixos/modules}/misc/assertions.nix (100%) rename {modules => nixos/modules}/misc/check-config.nix (100%) rename {modules => nixos/modules}/misc/crashdump.nix (100%) rename {modules => nixos/modules}/misc/ids.nix (100%) rename {modules => nixos/modules}/misc/lib.nix (100%) rename {modules => nixos/modules}/misc/locate.nix (100%) rename {modules => nixos/modules}/misc/nixpkgs.nix (100%) rename {modules => nixos/modules}/misc/passthru.nix (100%) rename {modules => nixos/modules}/misc/version.nix (100%) rename {modules => nixos/modules}/module-list.nix (100%) rename {modules => nixos/modules}/profiles/all-hardware.nix (100%) rename {modules => nixos/modules}/profiles/base.nix (100%) rename {modules => nixos/modules}/profiles/clone-config.nix (100%) rename {modules => nixos/modules}/profiles/demo.nix (100%) rename {modules => nixos/modules}/profiles/graphical.nix (100%) rename {modules => nixos/modules}/profiles/headless.nix (100%) rename {modules => nixos/modules}/profiles/installation-device.nix (100%) rename {modules => nixos/modules}/profiles/minimal.nix (100%) rename {modules => nixos/modules}/profiles/qemu-guest.nix (100%) rename {modules => nixos/modules}/programs/atop.nix (100%) rename {modules => nixos/modules}/programs/bash/bash.nix (100%) rename {modules => nixos/modules}/programs/bash/command-not-found.nix (100%) rename {modules => nixos/modules}/programs/bash/command-not-found.pl (100%) rename {modules => nixos/modules}/programs/bash/inputrc (100%) rename {modules => nixos/modules}/programs/blcr.nix (100%) rename {modules => nixos/modules}/programs/environment.nix (100%) rename {modules => nixos/modules}/programs/info.nix (100%) rename {modules => nixos/modules}/programs/shadow.nix (100%) rename {modules => nixos/modules}/programs/shell.nix (100%) rename {modules => nixos/modules}/programs/ssh.nix (100%) rename {modules => nixos/modules}/programs/ssmtp.nix (100%) rename {modules => nixos/modules}/programs/venus.nix (100%) rename {modules => nixos/modules}/programs/virtualbox.nix (100%) rename {modules => nixos/modules}/programs/wvdial.nix (100%) rename {modules => nixos/modules}/programs/zsh/zinputrc (100%) rename {modules => nixos/modules}/programs/zsh/zsh.nix (100%) rename {modules => nixos/modules}/rename.nix (100%) rename {modules => nixos/modules}/security/apparmor-suid.nix (100%) rename {modules => nixos/modules}/security/apparmor.nix (100%) rename {modules => nixos/modules}/security/ca.nix (100%) rename {modules => nixos/modules}/security/pam.nix (100%) rename {modules => nixos/modules}/security/pam_usb.nix (100%) rename {modules => nixos/modules}/security/polkit.nix (100%) rename {modules => nixos/modules}/security/rngd.nix (100%) rename {modules => nixos/modules}/security/rtkit.nix (100%) rename {modules => nixos/modules}/security/setuid-wrapper.c (100%) rename {modules => nixos/modules}/security/setuid-wrappers.nix (100%) rename {modules => nixos/modules}/security/sudo.nix (100%) rename {modules => nixos/modules}/services/amqp/activemq/ActiveMQBroker.java (100%) rename {modules => nixos/modules}/services/amqp/activemq/default.nix (100%) rename {modules => nixos/modules}/services/amqp/rabbitmq.nix (100%) rename {modules => nixos/modules}/services/audio/alsa.nix (100%) rename {modules => nixos/modules}/services/audio/fuppes.nix (100%) rename {modules => nixos/modules}/services/audio/fuppes/vfolder.cfg (100%) rename {modules => nixos/modules}/services/audio/mpd.nix (100%) rename {modules => nixos/modules}/services/backup/almir.nix (100%) rename {modules => nixos/modules}/services/backup/bacula.nix (100%) rename {modules => nixos/modules}/services/backup/mysql-backup.nix (100%) rename {modules => nixos/modules}/services/backup/postgresql-backup.nix (100%) rename {modules => nixos/modules}/services/backup/rsnapshot.nix (100%) rename {modules => nixos/modules}/services/backup/sitecopy-backup.nix (100%) rename {modules => nixos/modules}/services/databases/4store-endpoint.nix (100%) rename {modules => nixos/modules}/services/databases/4store.nix (100%) rename {modules => nixos/modules}/services/databases/firebird.nix (100%) rename {modules => nixos/modules}/services/databases/memcached.nix (100%) rename {modules => nixos/modules}/services/databases/mongodb.nix (100%) rename {modules => nixos/modules}/services/databases/mysql.nix (100%) rename {modules => nixos/modules}/services/databases/mysql55.nix (100%) rename {modules => nixos/modules}/services/databases/openldap.nix (100%) rename {modules => nixos/modules}/services/databases/postgresql.nix (100%) rename {modules => nixos/modules}/services/databases/redis.nix (100%) rename {modules => nixos/modules}/services/databases/virtuoso.nix (100%) rename {modules => nixos/modules}/services/games/ghost-one.nix (100%) rename {modules => nixos/modules}/services/hardware/acpid.nix (100%) rename {modules => nixos/modules}/services/hardware/bluetooth.nix (100%) rename {modules => nixos/modules}/services/hardware/nvidia-optimus.nix (100%) rename {modules => nixos/modules}/services/hardware/pcscd.nix (100%) rename {modules => nixos/modules}/services/hardware/pommed.nix (100%) rename {modules => nixos/modules}/services/hardware/sane.nix (100%) rename {modules => nixos/modules}/services/hardware/thinkfan.nix (100%) rename {modules => nixos/modules}/services/hardware/udev.nix (100%) rename {modules => nixos/modules}/services/hardware/udisks.nix (100%) rename {modules => nixos/modules}/services/hardware/udisks2.nix (100%) rename {modules => nixos/modules}/services/hardware/upower.nix (100%) rename {modules => nixos/modules}/services/logging/klogd.nix (100%) rename {modules => nixos/modules}/services/logging/logcheck.nix (100%) rename {modules => nixos/modules}/services/logging/logrotate.nix (100%) rename {modules => nixos/modules}/services/logging/logstash.nix (100%) rename {modules => nixos/modules}/services/logging/rsyslogd.nix (100%) rename {modules => nixos/modules}/services/logging/syslogd.nix (100%) rename {modules => nixos/modules}/services/mail/dovecot.nix (100%) rename {modules => nixos/modules}/services/mail/freepops.nix (100%) rename {modules => nixos/modules}/services/mail/mail.nix (100%) rename {modules => nixos/modules}/services/mail/opensmtpd.nix (100%) rename {modules => nixos/modules}/services/mail/postfix.nix (100%) rename {modules => nixos/modules}/services/mail/spamassassin.nix (100%) rename {modules => nixos/modules}/services/misc/autofs.nix (100%) rename {modules => nixos/modules}/services/misc/cgminer.nix (100%) rename {modules => nixos/modules}/services/misc/disnix.nix (100%) rename {modules => nixos/modules}/services/misc/felix.nix (100%) rename {modules => nixos/modules}/services/misc/folding-at-home.nix (100%) rename {modules => nixos/modules}/services/misc/gpsd.nix (100%) rename {modules => nixos/modules}/services/misc/nix-daemon.nix (100%) rename {modules => nixos/modules}/services/misc/nix-gc.nix (100%) rename {modules => nixos/modules}/services/misc/nixos-manual.nix (100%) rename {modules => nixos/modules}/services/misc/rogue.nix (100%) rename {modules => nixos/modules}/services/misc/svnserve.nix (100%) rename {modules => nixos/modules}/services/misc/synergy.nix (100%) rename {modules => nixos/modules}/services/monitoring/apcupsd.nix (100%) rename {modules => nixos/modules}/services/monitoring/dd-agent.nix (100%) rename {modules => nixos/modules}/services/monitoring/graphite.nix (100%) rename {modules => nixos/modules}/services/monitoring/monit.nix (100%) rename {modules => nixos/modules}/services/monitoring/nagios/commands.cfg (100%) rename {modules => nixos/modules}/services/monitoring/nagios/default.nix (100%) rename {modules => nixos/modules}/services/monitoring/nagios/host-templates.cfg (100%) rename {modules => nixos/modules}/services/monitoring/nagios/service-templates.cfg (100%) rename {modules => nixos/modules}/services/monitoring/nagios/timeperiods.cfg (100%) rename {modules => nixos/modules}/services/monitoring/smartd.nix (100%) rename {modules => nixos/modules}/services/monitoring/statsd.nix (100%) rename {modules => nixos/modules}/services/monitoring/systemhealth.nix (100%) rename {modules => nixos/modules}/services/monitoring/ups.nix (100%) rename {modules => nixos/modules}/services/monitoring/uptime.nix (100%) rename {modules => nixos/modules}/services/monitoring/zabbix-agent.nix (100%) rename {modules => nixos/modules}/services/monitoring/zabbix-server.nix (100%) rename {modules => nixos/modules}/services/network-filesystems/drbd.nix (100%) rename {modules => nixos/modules}/services/network-filesystems/nfsd.nix (100%) rename {modules => nixos/modules}/services/network-filesystems/openafs-client/default.nix (100%) rename {modules => nixos/modules}/services/network-filesystems/samba.nix (100%) rename {modules => nixos/modules}/services/networking/amuled.nix (100%) rename {modules => nixos/modules}/services/networking/avahi-daemon.nix (100%) rename {modules => nixos/modules}/services/networking/bind.nix (100%) rename {modules => nixos/modules}/services/networking/bitlbee.nix (100%) rename {modules => nixos/modules}/services/networking/chrony.nix (100%) rename {modules => nixos/modules}/services/networking/cntlm.nix (100%) rename {modules => nixos/modules}/services/networking/ddclient.nix (100%) rename {modules => nixos/modules}/services/networking/dhclient.nix (100%) rename {modules => nixos/modules}/services/networking/dhcpcd.nix (100%) rename {modules => nixos/modules}/services/networking/dhcpd.nix (100%) rename {modules => nixos/modules}/services/networking/dnsmasq.nix (100%) rename {modules => nixos/modules}/services/networking/ejabberd.nix (100%) rename {modules => nixos/modules}/services/networking/firewall.nix (100%) rename {modules => nixos/modules}/services/networking/flashpolicyd.nix (100%) rename {modules => nixos/modules}/services/networking/freenet.nix (100%) rename {modules => nixos/modules}/services/networking/git-daemon.nix (100%) rename {modules => nixos/modules}/services/networking/gnunet.nix (100%) rename {modules => nixos/modules}/services/networking/gogoclient.nix (100%) rename {modules => nixos/modules}/services/networking/gvpe.nix (100%) rename {modules => nixos/modules}/services/networking/hostapd.nix (100%) rename {modules => nixos/modules}/services/networking/ifplugd.nix (100%) rename {modules => nixos/modules}/services/networking/iodined.nix (100%) rename {modules => nixos/modules}/services/networking/ircd-hybrid/builder.sh (100%) rename {modules => nixos/modules}/services/networking/ircd-hybrid/control.in (100%) rename {modules => nixos/modules}/services/networking/ircd-hybrid/default.nix (100%) rename {modules => nixos/modules}/services/networking/ircd-hybrid/ircd.conf (100%) rename {modules => nixos/modules}/services/networking/minidlna.nix (100%) rename {modules => nixos/modules}/services/networking/nat.nix (100%) rename {modules => nixos/modules}/services/networking/networkmanager.nix (100%) rename {modules => nixos/modules}/services/networking/ntpd.nix (100%) rename {modules => nixos/modules}/services/networking/oidentd.nix (100%) rename {modules => nixos/modules}/services/networking/openfire.nix (100%) rename {modules => nixos/modules}/services/networking/openvpn.nix (100%) rename {modules => nixos/modules}/services/networking/prayer.nix (100%) rename {modules => nixos/modules}/services/networking/privoxy.nix (100%) rename {modules => nixos/modules}/services/networking/quassel.nix (100%) rename {modules => nixos/modules}/services/networking/radvd.nix (100%) rename {modules => nixos/modules}/services/networking/rdnssd.nix (100%) rename {modules => nixos/modules}/services/networking/rpcbind.nix (100%) rename {modules => nixos/modules}/services/networking/sabnzbd.nix (100%) rename {modules => nixos/modules}/services/networking/ssh/lshd.nix (100%) rename {modules => nixos/modules}/services/networking/ssh/sshd.nix (100%) rename {modules => nixos/modules}/services/networking/supybot.nix (100%) rename {modules => nixos/modules}/services/networking/tcpcrypt.nix (100%) rename {modules => nixos/modules}/services/networking/tftpd.nix (100%) rename {modules => nixos/modules}/services/networking/unbound.nix (100%) rename {modules => nixos/modules}/services/networking/vsftpd.nix (100%) rename {modules => nixos/modules}/services/networking/wakeonlan.nix (100%) rename {modules => nixos/modules}/services/networking/websockify.nix (100%) rename {modules => nixos/modules}/services/networking/wicd.nix (100%) rename {modules => nixos/modules}/services/networking/wpa_supplicant.nix (100%) rename {modules => nixos/modules}/services/networking/xinetd.nix (100%) rename {modules => nixos/modules}/services/printing/cupsd.nix (100%) rename {modules => nixos/modules}/services/scheduling/atd.nix (100%) rename {modules => nixos/modules}/services/scheduling/cron.nix (100%) rename {modules => nixos/modules}/services/scheduling/fcron.nix (100%) rename {modules => nixos/modules}/services/search/elasticsearch.nix (100%) rename {modules => nixos/modules}/services/security/clamav.nix (100%) rename {modules => nixos/modules}/services/security/fail2ban.nix (100%) rename {modules => nixos/modules}/services/security/fprot.nix (100%) rename {modules => nixos/modules}/services/security/frandom.nix (100%) rename {modules => nixos/modules}/services/security/tor.nix (100%) rename {modules => nixos/modules}/services/security/torify.nix (100%) rename {modules => nixos/modules}/services/security/torsocks.nix (100%) rename {modules => nixos/modules}/services/system/dbus.nix (100%) rename {modules => nixos/modules}/services/system/kerberos.nix (100%) rename {modules => nixos/modules}/services/system/nscd.conf (100%) rename {modules => nixos/modules}/services/system/nscd.nix (100%) rename {modules => nixos/modules}/services/system/uptimed.nix (100%) rename {modules => nixos/modules}/services/torrent/deluge.nix (100%) rename {modules => nixos/modules}/services/torrent/transmission.nix (100%) rename {modules => nixos/modules}/services/ttys/agetty.nix (100%) rename {modules => nixos/modules}/services/ttys/gpm.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/default.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/mediawiki.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/mercurial.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/per-server-options.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/tomcat-connector.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/trac.nix (100%) rename {modules => nixos/modules}/services/web-servers/apache-httpd/zabbix.nix (100%) rename {modules => nixos/modules}/services/web-servers/jboss/builder.sh (100%) rename {modules => nixos/modules}/services/web-servers/jboss/default.nix (100%) rename {modules => nixos/modules}/services/web-servers/lighttpd/cgit.nix (100%) rename {modules => nixos/modules}/services/web-servers/lighttpd/default.nix (100%) rename {modules => nixos/modules}/services/web-servers/lighttpd/gitweb.nix (100%) rename {modules => nixos/modules}/services/web-servers/nginx/default.nix (100%) rename {modules => nixos/modules}/services/web-servers/tomcat.nix (100%) rename {modules => nixos/modules}/services/web-servers/varnish/default.nix (100%) rename {modules => nixos/modules}/services/web-servers/zope2.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/default.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/e17.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/gnome.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/kde4.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/none.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/xfce.nix (100%) rename {modules => nixos/modules}/services/x11/desktop-managers/xterm.nix (100%) rename {modules => nixos/modules}/services/x11/display-managers/auto.nix (100%) rename {modules => nixos/modules}/services/x11/display-managers/default.nix (100%) rename {modules => nixos/modules}/services/x11/display-managers/kdm.nix (100%) rename {modules => nixos/modules}/services/x11/display-managers/lightdm.nix (100%) rename {modules => nixos/modules}/services/x11/display-managers/slim.nix (100%) rename {modules => nixos/modules}/services/x11/hardware/multitouch.nix (100%) rename {modules => nixos/modules}/services/x11/hardware/synaptics.nix (100%) rename {modules => nixos/modules}/services/x11/hardware/wacom.nix (100%) rename {modules => nixos/modules}/services/x11/terminal-server.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/awesome.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/compiz.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/default.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/i3.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/icewm.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/metacity.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/none.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/openbox.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/twm.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/wmii.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/xbmc.nix (100%) rename {modules => nixos/modules}/services/x11/window-managers/xmonad.nix (100%) rename {modules => nixos/modules}/services/x11/xfs.conf (100%) rename {modules => nixos/modules}/services/x11/xfs.nix (100%) rename {modules => nixos/modules}/services/x11/xserver.nix (100%) rename {modules => nixos/modules}/system/activation/activation-script.nix (100%) rename {modules => nixos/modules}/system/activation/no-clone.nix (100%) rename {modules => nixos/modules}/system/activation/switch-to-configuration.pl (100%) rename {modules => nixos/modules}/system/activation/top-level.nix (100%) rename {modules => nixos/modules}/system/boot/kernel.nix (100%) rename {modules => nixos/modules}/system/boot/kexec.nix (100%) rename {modules => nixos/modules}/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh (100%) rename {modules => nixos/modules}/system/boot/loader/efi-boot-stub/efi-boot-stub.nix (100%) rename {modules => nixos/modules}/system/boot/loader/efi.nix (100%) rename {modules => nixos/modules}/system/boot/loader/generations-dir/generations-dir-builder.sh (100%) rename {modules => nixos/modules}/system/boot/loader/generations-dir/generations-dir.nix (100%) rename {modules => nixos/modules}/system/boot/loader/grub/grub.nix (100%) rename {modules => nixos/modules}/system/boot/loader/grub/install-grub.pl (100%) rename {modules => nixos/modules}/system/boot/loader/grub/memtest.nix (100%) rename {modules => nixos/modules}/system/boot/loader/grub/winkler-gnu-blue-640x480.png (100%) rename {modules => nixos/modules}/system/boot/loader/grub/winkler-gnu-blue.README (100%) rename {modules => nixos/modules}/system/boot/loader/gummiboot/gummiboot-builder.py (100%) rename {modules => nixos/modules}/system/boot/loader/gummiboot/gummiboot.nix (100%) rename {modules => nixos/modules}/system/boot/loader/init-script/init-script-builder.sh (100%) rename {modules => nixos/modules}/system/boot/loader/init-script/init-script.nix (100%) rename {modules => nixos/modules}/system/boot/loader/raspberrypi/builder.sh (100%) rename {modules => nixos/modules}/system/boot/loader/raspberrypi/raspberrypi.nix (100%) rename {modules => nixos/modules}/system/boot/luksroot.nix (100%) rename {modules => nixos/modules}/system/boot/modprobe.nix (100%) rename {modules => nixos/modules}/system/boot/readonly-mountpoint.c (100%) rename {modules => nixos/modules}/system/boot/shutdown.nix (100%) rename {modules => nixos/modules}/system/boot/stage-1-init.sh (100%) rename {modules => nixos/modules}/system/boot/stage-1.nix (100%) rename {modules => nixos/modules}/system/boot/stage-2-init.sh (100%) rename {modules => nixos/modules}/system/boot/stage-2.nix (100%) rename {modules => nixos/modules}/system/boot/systemd-unit-options.nix (100%) rename {modules => nixos/modules}/system/boot/systemd.nix (100%) rename {modules => nixos/modules}/system/etc/etc.nix (100%) rename {modules => nixos/modules}/system/etc/make-etc.sh (100%) rename {modules => nixos/modules}/system/etc/setup-etc.pl (100%) rename {modules => nixos/modules}/system/upstart/upstart.nix (100%) rename {modules => nixos/modules}/tasks/cpu-freq.nix (100%) rename {modules => nixos/modules}/tasks/filesystems.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/btrfs.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/ext.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/nfs.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/reiserfs.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/unionfs-fuse.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/vfat.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/xfs.nix (100%) rename {modules => nixos/modules}/tasks/filesystems/zfs.nix (100%) rename {modules => nixos/modules}/tasks/kbd.nix (100%) rename {modules => nixos/modules}/tasks/lvm.nix (100%) rename {modules => nixos/modules}/tasks/network-interfaces.nix (100%) rename {modules => nixos/modules}/tasks/scsi-link-power-management.nix (100%) rename {modules => nixos/modules}/tasks/swraid.nix (100%) rename {modules => nixos/modules}/tasks/tty-backgrounds-combine.sh (100%) rename {modules => nixos/modules}/testing/minimal-kernel.nix (100%) rename {modules => nixos/modules}/testing/test-instrumentation.nix (100%) rename {modules => nixos/modules}/virtualisation/amazon-config.nix (100%) rename {modules => nixos/modules}/virtualisation/amazon-image.nix (100%) rename {modules => nixos/modules}/virtualisation/ec2-data.nix (100%) rename {modules => nixos/modules}/virtualisation/libvirtd.nix (100%) rename {modules => nixos/modules}/virtualisation/nova-config.nix (100%) rename {modules => nixos/modules}/virtualisation/nova-image.nix (100%) rename {modules => nixos/modules}/virtualisation/nova.nix (100%) rename {modules => nixos/modules}/virtualisation/qemu-opts (100%) rename {modules => nixos/modules}/virtualisation/qemu-vm.nix (100%) rename {modules => nixos/modules}/virtualisation/virtualbox-guest.nix (100%) rename {modules => nixos/modules}/virtualisation/virtualbox-image.nix (100%) rename {modules => nixos/modules}/virtualisation/xen-dom0.nix (100%) rename {modules => nixos/modules}/virtualisation/xen-domU.nix (100%) rename release-combined.nix => nixos/release-combined.nix (100%) rename release.nix => nixos/release.nix (100%) rename {tests => nixos/tests}/avahi.nix (100%) rename {tests => nixos/tests}/bittorrent.nix (100%) rename {tests => nixos/tests}/check-filesystems.nix (100%) rename {tests => nixos/tests}/common/user-account.nix (100%) rename {tests => nixos/tests}/common/x11.nix (100%) rename {tests => nixos/tests}/default.nix (100%) rename {tests => nixos/tests}/efi-installer.nix (100%) rename {tests => nixos/tests}/firefox.nix (100%) rename {tests => nixos/tests}/firewall.nix (100%) rename {tests => nixos/tests}/installer.nix (100%) rename {tests => nixos/tests}/ipv6.nix (100%) rename {tests => nixos/tests}/kde4.nix (100%) rename {tests => nixos/tests}/kexec.nix (100%) rename {tests => nixos/tests}/login.nix (100%) rename {tests => nixos/tests}/misc.nix (100%) rename {tests => nixos/tests}/mpich-example.c (100%) rename {tests => nixos/tests}/mpich.nix (100%) rename {tests => nixos/tests}/mysql-replication.nix (100%) rename {tests => nixos/tests}/mysql.nix (100%) rename {tests => nixos/tests}/nat.nix (100%) rename {tests => nixos/tests}/nfs.nix (100%) rename {tests => nixos/tests}/openssh.nix (100%) rename {tests => nixos/tests}/partition.nix (100%) rename {tests => nixos/tests}/printing.nix (100%) rename {tests => nixos/tests}/proxy.nix (100%) rename {tests => nixos/tests}/quake3.nix (100%) rename {tests => nixos/tests}/run-in-machine.nix (100%) rename {tests => nixos/tests}/simple.nix (100%) rename {tests => nixos/tests}/subversion.nix (100%) rename {tests => nixos/tests}/test-config-examples.sh (100%) rename {tests => nixos/tests}/testdb.sql (100%) rename {tests => nixos/tests}/tomcat.nix (100%) rename {tests => nixos/tests}/trac.nix (100%) rename {tests => nixos/tests}/xfce.nix (100%) diff --git a/.gitignore b/nixos/.gitignore similarity index 100% rename from .gitignore rename to nixos/.gitignore diff --git a/.version b/nixos/.version similarity index 100% rename from .version rename to nixos/.version diff --git a/COPYING b/nixos/COPYING similarity index 100% rename from COPYING rename to nixos/COPYING diff --git a/README b/nixos/README similarity index 100% rename from README rename to nixos/README diff --git a/default.nix b/nixos/default.nix similarity index 100% rename from default.nix rename to nixos/default.nix diff --git a/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix similarity index 100% rename from doc/config-examples/basic.nix rename to nixos/doc/config-examples/basic.nix diff --git a/doc/config-examples/closed-install-configuration.nix b/nixos/doc/config-examples/closed-install-configuration.nix similarity index 100% rename from doc/config-examples/closed-install-configuration.nix rename to nixos/doc/config-examples/closed-install-configuration.nix diff --git a/doc/config-examples/root-on-lvm.nix b/nixos/doc/config-examples/root-on-lvm.nix similarity index 100% rename from doc/config-examples/root-on-lvm.nix rename to nixos/doc/config-examples/root-on-lvm.nix diff --git a/doc/config-examples/svn-server.nix b/nixos/doc/config-examples/svn-server.nix similarity index 100% rename from doc/config-examples/svn-server.nix rename to nixos/doc/config-examples/svn-server.nix diff --git a/doc/config-examples/x86_64-usbstick.nix b/nixos/doc/config-examples/x86_64-usbstick.nix similarity index 100% rename from doc/config-examples/x86_64-usbstick.nix rename to nixos/doc/config-examples/x86_64-usbstick.nix diff --git a/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml similarity index 100% rename from doc/manual/configuration.xml rename to nixos/doc/manual/configuration.xml diff --git a/doc/manual/default.nix b/nixos/doc/manual/default.nix similarity index 100% rename from doc/manual/default.nix rename to nixos/doc/manual/default.nix diff --git a/doc/manual/development.xml b/nixos/doc/manual/development.xml similarity index 100% rename from doc/manual/development.xml rename to nixos/doc/manual/development.xml diff --git a/doc/manual/installation.xml b/nixos/doc/manual/installation.xml similarity index 100% rename from doc/manual/installation.xml rename to nixos/doc/manual/installation.xml diff --git a/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml similarity index 100% rename from doc/manual/man-configuration.xml rename to nixos/doc/manual/man-configuration.xml diff --git a/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml similarity index 100% rename from doc/manual/man-nixos-build-vms.xml rename to nixos/doc/manual/man-nixos-build-vms.xml diff --git a/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml similarity index 100% rename from doc/manual/man-nixos-option.xml rename to nixos/doc/manual/man-nixos-option.xml diff --git a/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml similarity index 100% rename from doc/manual/man-nixos-rebuild.xml rename to nixos/doc/manual/man-nixos-rebuild.xml diff --git a/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml similarity index 100% rename from doc/manual/man-pages.xml rename to nixos/doc/manual/man-pages.xml diff --git a/doc/manual/manual.xml b/nixos/doc/manual/manual.xml similarity index 100% rename from doc/manual/manual.xml rename to nixos/doc/manual/manual.xml diff --git a/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl similarity index 100% rename from doc/manual/options-to-docbook.xsl rename to nixos/doc/manual/options-to-docbook.xsl diff --git a/doc/manual/running.xml b/nixos/doc/manual/running.xml similarity index 100% rename from doc/manual/running.xml rename to nixos/doc/manual/running.xml diff --git a/doc/manual/style.css b/nixos/doc/manual/style.css similarity index 100% rename from doc/manual/style.css rename to nixos/doc/manual/style.css diff --git a/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml similarity index 100% rename from doc/manual/troubleshooting.xml rename to nixos/doc/manual/troubleshooting.xml diff --git a/doc/manual/userconfiguration.xml b/nixos/doc/manual/userconfiguration.xml similarity index 100% rename from doc/manual/userconfiguration.xml rename to nixos/doc/manual/userconfiguration.xml diff --git a/gui/README b/nixos/gui/README similarity index 100% rename from gui/README rename to nixos/gui/README diff --git a/gui/application.ini b/nixos/gui/application.ini similarity index 100% rename from gui/application.ini rename to nixos/gui/application.ini diff --git a/gui/chrome.manifest b/nixos/gui/chrome.manifest similarity index 100% rename from gui/chrome.manifest rename to nixos/gui/chrome.manifest diff --git a/gui/chrome/chrome.manifest b/nixos/gui/chrome/chrome.manifest similarity index 100% rename from gui/chrome/chrome.manifest rename to nixos/gui/chrome/chrome.manifest diff --git a/gui/chrome/content/io.js b/nixos/gui/chrome/content/io.js similarity index 100% rename from gui/chrome/content/io.js rename to nixos/gui/chrome/content/io.js diff --git a/gui/chrome/content/main.js b/nixos/gui/chrome/content/main.js similarity index 100% rename from gui/chrome/content/main.js rename to nixos/gui/chrome/content/main.js diff --git a/gui/chrome/content/myviewer.xul b/nixos/gui/chrome/content/myviewer.xul similarity index 100% rename from gui/chrome/content/myviewer.xul rename to nixos/gui/chrome/content/myviewer.xul diff --git a/gui/chrome/content/nixos.js b/nixos/gui/chrome/content/nixos.js similarity index 100% rename from gui/chrome/content/nixos.js rename to nixos/gui/chrome/content/nixos.js diff --git a/gui/chrome/content/optionView.js b/nixos/gui/chrome/content/optionView.js similarity index 100% rename from gui/chrome/content/optionView.js rename to nixos/gui/chrome/content/optionView.js diff --git a/gui/components/clh.js b/nixos/gui/components/clh.js similarity index 100% rename from gui/components/clh.js rename to nixos/gui/components/clh.js diff --git a/gui/defaults/preferences/myviewer-prefs.js b/nixos/gui/defaults/preferences/myviewer-prefs.js similarity index 100% rename from gui/defaults/preferences/myviewer-prefs.js rename to nixos/gui/defaults/preferences/myviewer-prefs.js diff --git a/lib/build-vms.nix b/nixos/lib/build-vms.nix similarity index 100% rename from lib/build-vms.nix rename to nixos/lib/build-vms.nix diff --git a/lib/channel-expr.nix b/nixos/lib/channel-expr.nix similarity index 100% rename from lib/channel-expr.nix rename to nixos/lib/channel-expr.nix diff --git a/lib/eval-config.nix b/nixos/lib/eval-config.nix similarity index 100% rename from lib/eval-config.nix rename to nixos/lib/eval-config.nix diff --git a/lib/from-env.nix b/nixos/lib/from-env.nix similarity index 100% rename from lib/from-env.nix rename to nixos/lib/from-env.nix diff --git a/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix similarity index 100% rename from lib/make-iso9660-image.nix rename to nixos/lib/make-iso9660-image.nix diff --git a/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh similarity index 100% rename from lib/make-iso9660-image.sh rename to nixos/lib/make-iso9660-image.sh diff --git a/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix similarity index 100% rename from lib/make-squashfs.nix rename to nixos/lib/make-squashfs.nix diff --git a/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix similarity index 100% rename from lib/make-system-tarball.nix rename to nixos/lib/make-system-tarball.nix diff --git a/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh similarity index 100% rename from lib/make-system-tarball.sh rename to nixos/lib/make-system-tarball.sh diff --git a/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix similarity index 100% rename from lib/qemu-flags.nix rename to nixos/lib/qemu-flags.nix diff --git a/lib/test-driver/Logger.pm b/nixos/lib/test-driver/Logger.pm similarity index 100% rename from lib/test-driver/Logger.pm rename to nixos/lib/test-driver/Logger.pm diff --git a/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm similarity index 100% rename from lib/test-driver/Machine.pm rename to nixos/lib/test-driver/Machine.pm diff --git a/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl similarity index 100% rename from lib/test-driver/log2html.xsl rename to nixos/lib/test-driver/log2html.xsl diff --git a/lib/test-driver/logfile.css b/nixos/lib/test-driver/logfile.css similarity index 100% rename from lib/test-driver/logfile.css rename to nixos/lib/test-driver/logfile.css diff --git a/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl similarity index 100% rename from lib/test-driver/test-driver.pl rename to nixos/lib/test-driver/test-driver.pl diff --git a/lib/test-driver/treebits.js b/nixos/lib/test-driver/treebits.js similarity index 100% rename from lib/test-driver/treebits.js rename to nixos/lib/test-driver/treebits.js diff --git a/lib/testing.nix b/nixos/lib/testing.nix similarity index 100% rename from lib/testing.nix rename to nixos/lib/testing.nix diff --git a/lib/utils.nix b/nixos/lib/utils.nix similarity index 100% rename from lib/utils.nix rename to nixos/lib/utils.nix diff --git a/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix similarity index 100% rename from maintainers/option-usages.nix rename to nixos/maintainers/option-usages.nix diff --git a/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py similarity index 100% rename from maintainers/scripts/ec2/create-ebs-amis.py rename to nixos/maintainers/scripts/ec2/create-ebs-amis.py diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/nixos/maintainers/scripts/ec2/create-s3-amis.sh similarity index 100% rename from maintainers/scripts/ec2/create-s3-amis.sh rename to nixos/maintainers/scripts/ec2/create-s3-amis.sh diff --git a/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix similarity index 100% rename from maintainers/scripts/ec2/ebs-creator.nix rename to nixos/maintainers/scripts/ec2/ebs-creator.nix diff --git a/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix similarity index 100% rename from modules/config/fonts/corefonts.nix rename to nixos/modules/config/fonts/corefonts.nix diff --git a/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix similarity index 100% rename from modules/config/fonts/fontconfig.nix rename to nixos/modules/config/fonts/fontconfig.nix diff --git a/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix similarity index 100% rename from modules/config/fonts/fontdir.nix rename to nixos/modules/config/fonts/fontdir.nix diff --git a/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix similarity index 100% rename from modules/config/fonts/fonts.nix rename to nixos/modules/config/fonts/fonts.nix diff --git a/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix similarity index 100% rename from modules/config/fonts/ghostscript.nix rename to nixos/modules/config/fonts/ghostscript.nix diff --git a/modules/config/gnu.nix b/nixos/modules/config/gnu.nix similarity index 100% rename from modules/config/gnu.nix rename to nixos/modules/config/gnu.nix diff --git a/modules/config/i18n.nix b/nixos/modules/config/i18n.nix similarity index 100% rename from modules/config/i18n.nix rename to nixos/modules/config/i18n.nix diff --git a/modules/config/krb5.nix b/nixos/modules/config/krb5.nix similarity index 100% rename from modules/config/krb5.nix rename to nixos/modules/config/krb5.nix diff --git a/modules/config/ldap.nix b/nixos/modules/config/ldap.nix similarity index 100% rename from modules/config/ldap.nix rename to nixos/modules/config/ldap.nix diff --git a/modules/config/networking.nix b/nixos/modules/config/networking.nix similarity index 100% rename from modules/config/networking.nix rename to nixos/modules/config/networking.nix diff --git a/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix similarity index 100% rename from modules/config/no-x-libs.nix rename to nixos/modules/config/no-x-libs.nix diff --git a/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix similarity index 100% rename from modules/config/nsswitch.nix rename to nixos/modules/config/nsswitch.nix diff --git a/modules/config/power-management.nix b/nixos/modules/config/power-management.nix similarity index 100% rename from modules/config/power-management.nix rename to nixos/modules/config/power-management.nix diff --git a/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix similarity index 100% rename from modules/config/pulseaudio.nix rename to nixos/modules/config/pulseaudio.nix diff --git a/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix similarity index 100% rename from modules/config/shells-environment.nix rename to nixos/modules/config/shells-environment.nix diff --git a/modules/config/swap.nix b/nixos/modules/config/swap.nix similarity index 100% rename from modules/config/swap.nix rename to nixos/modules/config/swap.nix diff --git a/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix similarity index 100% rename from modules/config/sysctl.nix rename to nixos/modules/config/sysctl.nix diff --git a/modules/config/system-path.nix b/nixos/modules/config/system-path.nix similarity index 100% rename from modules/config/system-path.nix rename to nixos/modules/config/system-path.nix diff --git a/modules/config/timezone.nix b/nixos/modules/config/timezone.nix similarity index 100% rename from modules/config/timezone.nix rename to nixos/modules/config/timezone.nix diff --git a/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix similarity index 100% rename from modules/config/unix-odbc-drivers.nix rename to nixos/modules/config/unix-odbc-drivers.nix diff --git a/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix similarity index 100% rename from modules/config/users-groups.nix rename to nixos/modules/config/users-groups.nix diff --git a/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix similarity index 100% rename from modules/hardware/all-firmware.nix rename to nixos/modules/hardware/all-firmware.nix diff --git a/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix similarity index 100% rename from modules/hardware/cpu/amd-microcode.nix rename to nixos/modules/hardware/cpu/amd-microcode.nix diff --git a/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix similarity index 100% rename from modules/hardware/cpu/intel-microcode.nix rename to nixos/modules/hardware/cpu/intel-microcode.nix diff --git a/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix similarity index 100% rename from modules/hardware/network/b43.nix rename to nixos/modules/hardware/network/b43.nix diff --git a/modules/hardware/network/broadcom-43xx.nix b/nixos/modules/hardware/network/broadcom-43xx.nix similarity index 100% rename from modules/hardware/network/broadcom-43xx.nix rename to nixos/modules/hardware/network/broadcom-43xx.nix diff --git a/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix similarity index 100% rename from modules/hardware/network/intel-2030.nix rename to nixos/modules/hardware/network/intel-2030.nix diff --git a/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix similarity index 100% rename from modules/hardware/network/intel-2100bg.nix rename to nixos/modules/hardware/network/intel-2100bg.nix diff --git a/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix similarity index 100% rename from modules/hardware/network/intel-2200bg.nix rename to nixos/modules/hardware/network/intel-2200bg.nix diff --git a/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix similarity index 100% rename from modules/hardware/network/intel-3945abg.nix rename to nixos/modules/hardware/network/intel-3945abg.nix diff --git a/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix similarity index 100% rename from modules/hardware/network/intel-4965agn.nix rename to nixos/modules/hardware/network/intel-4965agn.nix diff --git a/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix similarity index 100% rename from modules/hardware/network/intel-5000.nix rename to nixos/modules/hardware/network/intel-5000.nix diff --git a/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix similarity index 100% rename from modules/hardware/network/intel-5150.nix rename to nixos/modules/hardware/network/intel-5150.nix diff --git a/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix similarity index 100% rename from modules/hardware/network/intel-6000.nix rename to nixos/modules/hardware/network/intel-6000.nix diff --git a/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix similarity index 100% rename from modules/hardware/network/intel-6000g2a.nix rename to nixos/modules/hardware/network/intel-6000g2a.nix diff --git a/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix similarity index 100% rename from modules/hardware/network/intel-6000g2b.nix rename to nixos/modules/hardware/network/intel-6000g2b.nix diff --git a/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix similarity index 100% rename from modules/hardware/network/ralink.nix rename to nixos/modules/hardware/network/ralink.nix diff --git a/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix similarity index 100% rename from modules/hardware/network/rtl8192c.nix rename to nixos/modules/hardware/network/rtl8192c.nix diff --git a/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix similarity index 100% rename from modules/hardware/network/smc-2632w/default.nix rename to nixos/modules/hardware/network/smc-2632w/default.nix diff --git a/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis b/nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis similarity index 100% rename from modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis rename to nixos/modules/hardware/network/smc-2632w/firmware/cis/SMC2632W-v1.02.cis diff --git a/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix similarity index 100% rename from modules/hardware/network/zydas-zd1211.nix rename to nixos/modules/hardware/network/zydas-zd1211.nix diff --git a/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix similarity index 100% rename from modules/hardware/pcmcia.nix rename to nixos/modules/hardware/pcmcia.nix diff --git a/modules/hardware/video/encoder/wis-go7007.nix b/nixos/modules/hardware/video/encoder/wis-go7007.nix similarity index 100% rename from modules/hardware/video/encoder/wis-go7007.nix rename to nixos/modules/hardware/video/encoder/wis-go7007.nix diff --git a/modules/hardware/video/radeon.nix b/nixos/modules/hardware/video/radeon.nix similarity index 100% rename from modules/hardware/video/radeon.nix rename to nixos/modules/hardware/video/radeon.nix diff --git a/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix similarity index 100% rename from modules/installer/cd-dvd/channel.nix rename to nixos/modules/installer/cd-dvd/channel.nix diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-base.nix rename to nixos/modules/installer/cd-dvd/installation-cd-base.nix diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-efi.nix rename to nixos/modules/installer/cd-dvd/installation-cd-efi.nix diff --git a/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-graphical.nix rename to nixos/modules/installer/cd-dvd/installation-cd-graphical.nix diff --git a/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix rename to nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-minimal.nix rename to nixos/modules/installer/cd-dvd/installation-cd-minimal.nix diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix similarity index 100% rename from modules/installer/cd-dvd/installation-cd-new-kernel.nix rename to nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix diff --git a/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix similarity index 100% rename from modules/installer/cd-dvd/iso-image.nix rename to nixos/modules/installer/cd-dvd/iso-image.nix diff --git a/modules/installer/cd-dvd/live-dvd.nix b/nixos/modules/installer/cd-dvd/live-dvd.nix similarity index 100% rename from modules/installer/cd-dvd/live-dvd.nix rename to nixos/modules/installer/cd-dvd/live-dvd.nix diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix similarity index 100% rename from modules/installer/cd-dvd/system-tarball-fuloong2f.nix rename to nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix diff --git a/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt similarity index 100% rename from modules/installer/cd-dvd/system-tarball-pc-readme.txt rename to nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix similarity index 100% rename from modules/installer/cd-dvd/system-tarball-pc.nix rename to nixos/modules/installer/cd-dvd/system-tarball-pc.nix diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix similarity index 100% rename from modules/installer/cd-dvd/system-tarball-sheevaplug.nix rename to nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix diff --git a/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix similarity index 100% rename from modules/installer/cd-dvd/system-tarball.nix rename to nixos/modules/installer/cd-dvd/system-tarball.nix diff --git a/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix similarity index 100% rename from modules/installer/scan/detected.nix rename to nixos/modules/installer/scan/detected.nix diff --git a/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix similarity index 100% rename from modules/installer/scan/not-detected.nix rename to nixos/modules/installer/scan/not-detected.nix diff --git a/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix similarity index 100% rename from modules/installer/tools/get-version-suffix rename to nixos/modules/installer/tools/get-version-suffix diff --git a/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix similarity index 100% rename from modules/installer/tools/nixos-build-vms/build-vms.nix rename to nixos/modules/installer/tools/nixos-build-vms/build-vms.nix diff --git a/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh similarity index 100% rename from modules/installer/tools/nixos-build-vms/nixos-build-vms.sh rename to nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh diff --git a/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix similarity index 100% rename from modules/installer/tools/nixos-checkout.nix rename to nixos/modules/installer/tools/nixos-checkout.nix diff --git a/modules/installer/tools/nixos-gen-seccure-keys.sh b/nixos/modules/installer/tools/nixos-gen-seccure-keys.sh similarity index 100% rename from modules/installer/tools/nixos-gen-seccure-keys.sh rename to nixos/modules/installer/tools/nixos-gen-seccure-keys.sh diff --git a/modules/installer/tools/nixos-hardware-scan.pl b/nixos/modules/installer/tools/nixos-hardware-scan.pl similarity index 100% rename from modules/installer/tools/nixos-hardware-scan.pl rename to nixos/modules/installer/tools/nixos-hardware-scan.pl diff --git a/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh similarity index 100% rename from modules/installer/tools/nixos-install.sh rename to nixos/modules/installer/tools/nixos-install.sh diff --git a/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh similarity index 100% rename from modules/installer/tools/nixos-option.sh rename to nixos/modules/installer/tools/nixos-option.sh diff --git a/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh similarity index 100% rename from modules/installer/tools/nixos-rebuild.sh rename to nixos/modules/installer/tools/nixos-rebuild.sh diff --git a/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh similarity index 100% rename from modules/installer/tools/nixos-version.sh rename to nixos/modules/installer/tools/nixos-version.sh diff --git a/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix similarity index 100% rename from modules/installer/tools/tools.nix rename to nixos/modules/installer/tools/tools.nix diff --git a/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix similarity index 100% rename from modules/installer/virtualbox-demo.nix rename to nixos/modules/installer/virtualbox-demo.nix diff --git a/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix similarity index 100% rename from modules/misc/assertions.nix rename to nixos/modules/misc/assertions.nix diff --git a/modules/misc/check-config.nix b/nixos/modules/misc/check-config.nix similarity index 100% rename from modules/misc/check-config.nix rename to nixos/modules/misc/check-config.nix diff --git a/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix similarity index 100% rename from modules/misc/crashdump.nix rename to nixos/modules/misc/crashdump.nix diff --git a/modules/misc/ids.nix b/nixos/modules/misc/ids.nix similarity index 100% rename from modules/misc/ids.nix rename to nixos/modules/misc/ids.nix diff --git a/modules/misc/lib.nix b/nixos/modules/misc/lib.nix similarity index 100% rename from modules/misc/lib.nix rename to nixos/modules/misc/lib.nix diff --git a/modules/misc/locate.nix b/nixos/modules/misc/locate.nix similarity index 100% rename from modules/misc/locate.nix rename to nixos/modules/misc/locate.nix diff --git a/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix similarity index 100% rename from modules/misc/nixpkgs.nix rename to nixos/modules/misc/nixpkgs.nix diff --git a/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix similarity index 100% rename from modules/misc/passthru.nix rename to nixos/modules/misc/passthru.nix diff --git a/modules/misc/version.nix b/nixos/modules/misc/version.nix similarity index 100% rename from modules/misc/version.nix rename to nixos/modules/misc/version.nix diff --git a/modules/module-list.nix b/nixos/modules/module-list.nix similarity index 100% rename from modules/module-list.nix rename to nixos/modules/module-list.nix diff --git a/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix similarity index 100% rename from modules/profiles/all-hardware.nix rename to nixos/modules/profiles/all-hardware.nix diff --git a/modules/profiles/base.nix b/nixos/modules/profiles/base.nix similarity index 100% rename from modules/profiles/base.nix rename to nixos/modules/profiles/base.nix diff --git a/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix similarity index 100% rename from modules/profiles/clone-config.nix rename to nixos/modules/profiles/clone-config.nix diff --git a/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix similarity index 100% rename from modules/profiles/demo.nix rename to nixos/modules/profiles/demo.nix diff --git a/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix similarity index 100% rename from modules/profiles/graphical.nix rename to nixos/modules/profiles/graphical.nix diff --git a/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix similarity index 100% rename from modules/profiles/headless.nix rename to nixos/modules/profiles/headless.nix diff --git a/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix similarity index 100% rename from modules/profiles/installation-device.nix rename to nixos/modules/profiles/installation-device.nix diff --git a/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix similarity index 100% rename from modules/profiles/minimal.nix rename to nixos/modules/profiles/minimal.nix diff --git a/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix similarity index 100% rename from modules/profiles/qemu-guest.nix rename to nixos/modules/profiles/qemu-guest.nix diff --git a/modules/programs/atop.nix b/nixos/modules/programs/atop.nix similarity index 100% rename from modules/programs/atop.nix rename to nixos/modules/programs/atop.nix diff --git a/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix similarity index 100% rename from modules/programs/bash/bash.nix rename to nixos/modules/programs/bash/bash.nix diff --git a/modules/programs/bash/command-not-found.nix b/nixos/modules/programs/bash/command-not-found.nix similarity index 100% rename from modules/programs/bash/command-not-found.nix rename to nixos/modules/programs/bash/command-not-found.nix diff --git a/modules/programs/bash/command-not-found.pl b/nixos/modules/programs/bash/command-not-found.pl similarity index 100% rename from modules/programs/bash/command-not-found.pl rename to nixos/modules/programs/bash/command-not-found.pl diff --git a/modules/programs/bash/inputrc b/nixos/modules/programs/bash/inputrc similarity index 100% rename from modules/programs/bash/inputrc rename to nixos/modules/programs/bash/inputrc diff --git a/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix similarity index 100% rename from modules/programs/blcr.nix rename to nixos/modules/programs/blcr.nix diff --git a/modules/programs/environment.nix b/nixos/modules/programs/environment.nix similarity index 100% rename from modules/programs/environment.nix rename to nixos/modules/programs/environment.nix diff --git a/modules/programs/info.nix b/nixos/modules/programs/info.nix similarity index 100% rename from modules/programs/info.nix rename to nixos/modules/programs/info.nix diff --git a/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix similarity index 100% rename from modules/programs/shadow.nix rename to nixos/modules/programs/shadow.nix diff --git a/modules/programs/shell.nix b/nixos/modules/programs/shell.nix similarity index 100% rename from modules/programs/shell.nix rename to nixos/modules/programs/shell.nix diff --git a/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix similarity index 100% rename from modules/programs/ssh.nix rename to nixos/modules/programs/ssh.nix diff --git a/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix similarity index 100% rename from modules/programs/ssmtp.nix rename to nixos/modules/programs/ssmtp.nix diff --git a/modules/programs/venus.nix b/nixos/modules/programs/venus.nix similarity index 100% rename from modules/programs/venus.nix rename to nixos/modules/programs/venus.nix diff --git a/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix similarity index 100% rename from modules/programs/virtualbox.nix rename to nixos/modules/programs/virtualbox.nix diff --git a/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix similarity index 100% rename from modules/programs/wvdial.nix rename to nixos/modules/programs/wvdial.nix diff --git a/modules/programs/zsh/zinputrc b/nixos/modules/programs/zsh/zinputrc similarity index 100% rename from modules/programs/zsh/zinputrc rename to nixos/modules/programs/zsh/zinputrc diff --git a/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix similarity index 100% rename from modules/programs/zsh/zsh.nix rename to nixos/modules/programs/zsh/zsh.nix diff --git a/modules/rename.nix b/nixos/modules/rename.nix similarity index 100% rename from modules/rename.nix rename to nixos/modules/rename.nix diff --git a/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix similarity index 100% rename from modules/security/apparmor-suid.nix rename to nixos/modules/security/apparmor-suid.nix diff --git a/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix similarity index 100% rename from modules/security/apparmor.nix rename to nixos/modules/security/apparmor.nix diff --git a/modules/security/ca.nix b/nixos/modules/security/ca.nix similarity index 100% rename from modules/security/ca.nix rename to nixos/modules/security/ca.nix diff --git a/modules/security/pam.nix b/nixos/modules/security/pam.nix similarity index 100% rename from modules/security/pam.nix rename to nixos/modules/security/pam.nix diff --git a/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix similarity index 100% rename from modules/security/pam_usb.nix rename to nixos/modules/security/pam_usb.nix diff --git a/modules/security/polkit.nix b/nixos/modules/security/polkit.nix similarity index 100% rename from modules/security/polkit.nix rename to nixos/modules/security/polkit.nix diff --git a/modules/security/rngd.nix b/nixos/modules/security/rngd.nix similarity index 100% rename from modules/security/rngd.nix rename to nixos/modules/security/rngd.nix diff --git a/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix similarity index 100% rename from modules/security/rtkit.nix rename to nixos/modules/security/rtkit.nix diff --git a/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c similarity index 100% rename from modules/security/setuid-wrapper.c rename to nixos/modules/security/setuid-wrapper.c diff --git a/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix similarity index 100% rename from modules/security/setuid-wrappers.nix rename to nixos/modules/security/setuid-wrappers.nix diff --git a/modules/security/sudo.nix b/nixos/modules/security/sudo.nix similarity index 100% rename from modules/security/sudo.nix rename to nixos/modules/security/sudo.nix diff --git a/modules/services/amqp/activemq/ActiveMQBroker.java b/nixos/modules/services/amqp/activemq/ActiveMQBroker.java similarity index 100% rename from modules/services/amqp/activemq/ActiveMQBroker.java rename to nixos/modules/services/amqp/activemq/ActiveMQBroker.java diff --git a/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix similarity index 100% rename from modules/services/amqp/activemq/default.nix rename to nixos/modules/services/amqp/activemq/default.nix diff --git a/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix similarity index 100% rename from modules/services/amqp/rabbitmq.nix rename to nixos/modules/services/amqp/rabbitmq.nix diff --git a/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix similarity index 100% rename from modules/services/audio/alsa.nix rename to nixos/modules/services/audio/alsa.nix diff --git a/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix similarity index 100% rename from modules/services/audio/fuppes.nix rename to nixos/modules/services/audio/fuppes.nix diff --git a/modules/services/audio/fuppes/vfolder.cfg b/nixos/modules/services/audio/fuppes/vfolder.cfg similarity index 100% rename from modules/services/audio/fuppes/vfolder.cfg rename to nixos/modules/services/audio/fuppes/vfolder.cfg diff --git a/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix similarity index 100% rename from modules/services/audio/mpd.nix rename to nixos/modules/services/audio/mpd.nix diff --git a/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix similarity index 100% rename from modules/services/backup/almir.nix rename to nixos/modules/services/backup/almir.nix diff --git a/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix similarity index 100% rename from modules/services/backup/bacula.nix rename to nixos/modules/services/backup/bacula.nix diff --git a/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix similarity index 100% rename from modules/services/backup/mysql-backup.nix rename to nixos/modules/services/backup/mysql-backup.nix diff --git a/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix similarity index 100% rename from modules/services/backup/postgresql-backup.nix rename to nixos/modules/services/backup/postgresql-backup.nix diff --git a/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix similarity index 100% rename from modules/services/backup/rsnapshot.nix rename to nixos/modules/services/backup/rsnapshot.nix diff --git a/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix similarity index 100% rename from modules/services/backup/sitecopy-backup.nix rename to nixos/modules/services/backup/sitecopy-backup.nix diff --git a/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix similarity index 100% rename from modules/services/databases/4store-endpoint.nix rename to nixos/modules/services/databases/4store-endpoint.nix diff --git a/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix similarity index 100% rename from modules/services/databases/4store.nix rename to nixos/modules/services/databases/4store.nix diff --git a/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix similarity index 100% rename from modules/services/databases/firebird.nix rename to nixos/modules/services/databases/firebird.nix diff --git a/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix similarity index 100% rename from modules/services/databases/memcached.nix rename to nixos/modules/services/databases/memcached.nix diff --git a/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix similarity index 100% rename from modules/services/databases/mongodb.nix rename to nixos/modules/services/databases/mongodb.nix diff --git a/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix similarity index 100% rename from modules/services/databases/mysql.nix rename to nixos/modules/services/databases/mysql.nix diff --git a/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix similarity index 100% rename from modules/services/databases/mysql55.nix rename to nixos/modules/services/databases/mysql55.nix diff --git a/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix similarity index 100% rename from modules/services/databases/openldap.nix rename to nixos/modules/services/databases/openldap.nix diff --git a/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix similarity index 100% rename from modules/services/databases/postgresql.nix rename to nixos/modules/services/databases/postgresql.nix diff --git a/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix similarity index 100% rename from modules/services/databases/redis.nix rename to nixos/modules/services/databases/redis.nix diff --git a/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix similarity index 100% rename from modules/services/databases/virtuoso.nix rename to nixos/modules/services/databases/virtuoso.nix diff --git a/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix similarity index 100% rename from modules/services/games/ghost-one.nix rename to nixos/modules/services/games/ghost-one.nix diff --git a/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix similarity index 100% rename from modules/services/hardware/acpid.nix rename to nixos/modules/services/hardware/acpid.nix diff --git a/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix similarity index 100% rename from modules/services/hardware/bluetooth.nix rename to nixos/modules/services/hardware/bluetooth.nix diff --git a/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix similarity index 100% rename from modules/services/hardware/nvidia-optimus.nix rename to nixos/modules/services/hardware/nvidia-optimus.nix diff --git a/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix similarity index 100% rename from modules/services/hardware/pcscd.nix rename to nixos/modules/services/hardware/pcscd.nix diff --git a/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix similarity index 100% rename from modules/services/hardware/pommed.nix rename to nixos/modules/services/hardware/pommed.nix diff --git a/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix similarity index 100% rename from modules/services/hardware/sane.nix rename to nixos/modules/services/hardware/sane.nix diff --git a/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix similarity index 100% rename from modules/services/hardware/thinkfan.nix rename to nixos/modules/services/hardware/thinkfan.nix diff --git a/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix similarity index 100% rename from modules/services/hardware/udev.nix rename to nixos/modules/services/hardware/udev.nix diff --git a/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix similarity index 100% rename from modules/services/hardware/udisks.nix rename to nixos/modules/services/hardware/udisks.nix diff --git a/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix similarity index 100% rename from modules/services/hardware/udisks2.nix rename to nixos/modules/services/hardware/udisks2.nix diff --git a/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix similarity index 100% rename from modules/services/hardware/upower.nix rename to nixos/modules/services/hardware/upower.nix diff --git a/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix similarity index 100% rename from modules/services/logging/klogd.nix rename to nixos/modules/services/logging/klogd.nix diff --git a/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix similarity index 100% rename from modules/services/logging/logcheck.nix rename to nixos/modules/services/logging/logcheck.nix diff --git a/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix similarity index 100% rename from modules/services/logging/logrotate.nix rename to nixos/modules/services/logging/logrotate.nix diff --git a/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix similarity index 100% rename from modules/services/logging/logstash.nix rename to nixos/modules/services/logging/logstash.nix diff --git a/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix similarity index 100% rename from modules/services/logging/rsyslogd.nix rename to nixos/modules/services/logging/rsyslogd.nix diff --git a/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix similarity index 100% rename from modules/services/logging/syslogd.nix rename to nixos/modules/services/logging/syslogd.nix diff --git a/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix similarity index 100% rename from modules/services/mail/dovecot.nix rename to nixos/modules/services/mail/dovecot.nix diff --git a/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix similarity index 100% rename from modules/services/mail/freepops.nix rename to nixos/modules/services/mail/freepops.nix diff --git a/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix similarity index 100% rename from modules/services/mail/mail.nix rename to nixos/modules/services/mail/mail.nix diff --git a/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix similarity index 100% rename from modules/services/mail/opensmtpd.nix rename to nixos/modules/services/mail/opensmtpd.nix diff --git a/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix similarity index 100% rename from modules/services/mail/postfix.nix rename to nixos/modules/services/mail/postfix.nix diff --git a/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix similarity index 100% rename from modules/services/mail/spamassassin.nix rename to nixos/modules/services/mail/spamassassin.nix diff --git a/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix similarity index 100% rename from modules/services/misc/autofs.nix rename to nixos/modules/services/misc/autofs.nix diff --git a/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix similarity index 100% rename from modules/services/misc/cgminer.nix rename to nixos/modules/services/misc/cgminer.nix diff --git a/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix similarity index 100% rename from modules/services/misc/disnix.nix rename to nixos/modules/services/misc/disnix.nix diff --git a/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix similarity index 100% rename from modules/services/misc/felix.nix rename to nixos/modules/services/misc/felix.nix diff --git a/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix similarity index 100% rename from modules/services/misc/folding-at-home.nix rename to nixos/modules/services/misc/folding-at-home.nix diff --git a/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix similarity index 100% rename from modules/services/misc/gpsd.nix rename to nixos/modules/services/misc/gpsd.nix diff --git a/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix similarity index 100% rename from modules/services/misc/nix-daemon.nix rename to nixos/modules/services/misc/nix-daemon.nix diff --git a/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix similarity index 100% rename from modules/services/misc/nix-gc.nix rename to nixos/modules/services/misc/nix-gc.nix diff --git a/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix similarity index 100% rename from modules/services/misc/nixos-manual.nix rename to nixos/modules/services/misc/nixos-manual.nix diff --git a/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix similarity index 100% rename from modules/services/misc/rogue.nix rename to nixos/modules/services/misc/rogue.nix diff --git a/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix similarity index 100% rename from modules/services/misc/svnserve.nix rename to nixos/modules/services/misc/svnserve.nix diff --git a/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix similarity index 100% rename from modules/services/misc/synergy.nix rename to nixos/modules/services/misc/synergy.nix diff --git a/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix similarity index 100% rename from modules/services/monitoring/apcupsd.nix rename to nixos/modules/services/monitoring/apcupsd.nix diff --git a/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix similarity index 100% rename from modules/services/monitoring/dd-agent.nix rename to nixos/modules/services/monitoring/dd-agent.nix diff --git a/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix similarity index 100% rename from modules/services/monitoring/graphite.nix rename to nixos/modules/services/monitoring/graphite.nix diff --git a/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix similarity index 100% rename from modules/services/monitoring/monit.nix rename to nixos/modules/services/monitoring/monit.nix diff --git a/modules/services/monitoring/nagios/commands.cfg b/nixos/modules/services/monitoring/nagios/commands.cfg similarity index 100% rename from modules/services/monitoring/nagios/commands.cfg rename to nixos/modules/services/monitoring/nagios/commands.cfg diff --git a/modules/services/monitoring/nagios/default.nix b/nixos/modules/services/monitoring/nagios/default.nix similarity index 100% rename from modules/services/monitoring/nagios/default.nix rename to nixos/modules/services/monitoring/nagios/default.nix diff --git a/modules/services/monitoring/nagios/host-templates.cfg b/nixos/modules/services/monitoring/nagios/host-templates.cfg similarity index 100% rename from modules/services/monitoring/nagios/host-templates.cfg rename to nixos/modules/services/monitoring/nagios/host-templates.cfg diff --git a/modules/services/monitoring/nagios/service-templates.cfg b/nixos/modules/services/monitoring/nagios/service-templates.cfg similarity index 100% rename from modules/services/monitoring/nagios/service-templates.cfg rename to nixos/modules/services/monitoring/nagios/service-templates.cfg diff --git a/modules/services/monitoring/nagios/timeperiods.cfg b/nixos/modules/services/monitoring/nagios/timeperiods.cfg similarity index 100% rename from modules/services/monitoring/nagios/timeperiods.cfg rename to nixos/modules/services/monitoring/nagios/timeperiods.cfg diff --git a/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix similarity index 100% rename from modules/services/monitoring/smartd.nix rename to nixos/modules/services/monitoring/smartd.nix diff --git a/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix similarity index 100% rename from modules/services/monitoring/statsd.nix rename to nixos/modules/services/monitoring/statsd.nix diff --git a/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix similarity index 100% rename from modules/services/monitoring/systemhealth.nix rename to nixos/modules/services/monitoring/systemhealth.nix diff --git a/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix similarity index 100% rename from modules/services/monitoring/ups.nix rename to nixos/modules/services/monitoring/ups.nix diff --git a/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix similarity index 100% rename from modules/services/monitoring/uptime.nix rename to nixos/modules/services/monitoring/uptime.nix diff --git a/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix similarity index 100% rename from modules/services/monitoring/zabbix-agent.nix rename to nixos/modules/services/monitoring/zabbix-agent.nix diff --git a/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix similarity index 100% rename from modules/services/monitoring/zabbix-server.nix rename to nixos/modules/services/monitoring/zabbix-server.nix diff --git a/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix similarity index 100% rename from modules/services/network-filesystems/drbd.nix rename to nixos/modules/services/network-filesystems/drbd.nix diff --git a/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix similarity index 100% rename from modules/services/network-filesystems/nfsd.nix rename to nixos/modules/services/network-filesystems/nfsd.nix diff --git a/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix similarity index 100% rename from modules/services/network-filesystems/openafs-client/default.nix rename to nixos/modules/services/network-filesystems/openafs-client/default.nix diff --git a/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix similarity index 100% rename from modules/services/network-filesystems/samba.nix rename to nixos/modules/services/network-filesystems/samba.nix diff --git a/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix similarity index 100% rename from modules/services/networking/amuled.nix rename to nixos/modules/services/networking/amuled.nix diff --git a/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix similarity index 100% rename from modules/services/networking/avahi-daemon.nix rename to nixos/modules/services/networking/avahi-daemon.nix diff --git a/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix similarity index 100% rename from modules/services/networking/bind.nix rename to nixos/modules/services/networking/bind.nix diff --git a/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix similarity index 100% rename from modules/services/networking/bitlbee.nix rename to nixos/modules/services/networking/bitlbee.nix diff --git a/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix similarity index 100% rename from modules/services/networking/chrony.nix rename to nixos/modules/services/networking/chrony.nix diff --git a/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix similarity index 100% rename from modules/services/networking/cntlm.nix rename to nixos/modules/services/networking/cntlm.nix diff --git a/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix similarity index 100% rename from modules/services/networking/ddclient.nix rename to nixos/modules/services/networking/ddclient.nix diff --git a/modules/services/networking/dhclient.nix b/nixos/modules/services/networking/dhclient.nix similarity index 100% rename from modules/services/networking/dhclient.nix rename to nixos/modules/services/networking/dhclient.nix diff --git a/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix similarity index 100% rename from modules/services/networking/dhcpcd.nix rename to nixos/modules/services/networking/dhcpcd.nix diff --git a/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix similarity index 100% rename from modules/services/networking/dhcpd.nix rename to nixos/modules/services/networking/dhcpd.nix diff --git a/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix similarity index 100% rename from modules/services/networking/dnsmasq.nix rename to nixos/modules/services/networking/dnsmasq.nix diff --git a/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix similarity index 100% rename from modules/services/networking/ejabberd.nix rename to nixos/modules/services/networking/ejabberd.nix diff --git a/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix similarity index 100% rename from modules/services/networking/firewall.nix rename to nixos/modules/services/networking/firewall.nix diff --git a/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix similarity index 100% rename from modules/services/networking/flashpolicyd.nix rename to nixos/modules/services/networking/flashpolicyd.nix diff --git a/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix similarity index 100% rename from modules/services/networking/freenet.nix rename to nixos/modules/services/networking/freenet.nix diff --git a/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix similarity index 100% rename from modules/services/networking/git-daemon.nix rename to nixos/modules/services/networking/git-daemon.nix diff --git a/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix similarity index 100% rename from modules/services/networking/gnunet.nix rename to nixos/modules/services/networking/gnunet.nix diff --git a/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix similarity index 100% rename from modules/services/networking/gogoclient.nix rename to nixos/modules/services/networking/gogoclient.nix diff --git a/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix similarity index 100% rename from modules/services/networking/gvpe.nix rename to nixos/modules/services/networking/gvpe.nix diff --git a/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix similarity index 100% rename from modules/services/networking/hostapd.nix rename to nixos/modules/services/networking/hostapd.nix diff --git a/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix similarity index 100% rename from modules/services/networking/ifplugd.nix rename to nixos/modules/services/networking/ifplugd.nix diff --git a/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix similarity index 100% rename from modules/services/networking/iodined.nix rename to nixos/modules/services/networking/iodined.nix diff --git a/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh similarity index 100% rename from modules/services/networking/ircd-hybrid/builder.sh rename to nixos/modules/services/networking/ircd-hybrid/builder.sh diff --git a/modules/services/networking/ircd-hybrid/control.in b/nixos/modules/services/networking/ircd-hybrid/control.in similarity index 100% rename from modules/services/networking/ircd-hybrid/control.in rename to nixos/modules/services/networking/ircd-hybrid/control.in diff --git a/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix similarity index 100% rename from modules/services/networking/ircd-hybrid/default.nix rename to nixos/modules/services/networking/ircd-hybrid/default.nix diff --git a/modules/services/networking/ircd-hybrid/ircd.conf b/nixos/modules/services/networking/ircd-hybrid/ircd.conf similarity index 100% rename from modules/services/networking/ircd-hybrid/ircd.conf rename to nixos/modules/services/networking/ircd-hybrid/ircd.conf diff --git a/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix similarity index 100% rename from modules/services/networking/minidlna.nix rename to nixos/modules/services/networking/minidlna.nix diff --git a/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix similarity index 100% rename from modules/services/networking/nat.nix rename to nixos/modules/services/networking/nat.nix diff --git a/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix similarity index 100% rename from modules/services/networking/networkmanager.nix rename to nixos/modules/services/networking/networkmanager.nix diff --git a/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix similarity index 100% rename from modules/services/networking/ntpd.nix rename to nixos/modules/services/networking/ntpd.nix diff --git a/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix similarity index 100% rename from modules/services/networking/oidentd.nix rename to nixos/modules/services/networking/oidentd.nix diff --git a/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix similarity index 100% rename from modules/services/networking/openfire.nix rename to nixos/modules/services/networking/openfire.nix diff --git a/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix similarity index 100% rename from modules/services/networking/openvpn.nix rename to nixos/modules/services/networking/openvpn.nix diff --git a/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix similarity index 100% rename from modules/services/networking/prayer.nix rename to nixos/modules/services/networking/prayer.nix diff --git a/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix similarity index 100% rename from modules/services/networking/privoxy.nix rename to nixos/modules/services/networking/privoxy.nix diff --git a/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix similarity index 100% rename from modules/services/networking/quassel.nix rename to nixos/modules/services/networking/quassel.nix diff --git a/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix similarity index 100% rename from modules/services/networking/radvd.nix rename to nixos/modules/services/networking/radvd.nix diff --git a/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix similarity index 100% rename from modules/services/networking/rdnssd.nix rename to nixos/modules/services/networking/rdnssd.nix diff --git a/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix similarity index 100% rename from modules/services/networking/rpcbind.nix rename to nixos/modules/services/networking/rpcbind.nix diff --git a/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix similarity index 100% rename from modules/services/networking/sabnzbd.nix rename to nixos/modules/services/networking/sabnzbd.nix diff --git a/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix similarity index 100% rename from modules/services/networking/ssh/lshd.nix rename to nixos/modules/services/networking/ssh/lshd.nix diff --git a/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix similarity index 100% rename from modules/services/networking/ssh/sshd.nix rename to nixos/modules/services/networking/ssh/sshd.nix diff --git a/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix similarity index 100% rename from modules/services/networking/supybot.nix rename to nixos/modules/services/networking/supybot.nix diff --git a/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix similarity index 100% rename from modules/services/networking/tcpcrypt.nix rename to nixos/modules/services/networking/tcpcrypt.nix diff --git a/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix similarity index 100% rename from modules/services/networking/tftpd.nix rename to nixos/modules/services/networking/tftpd.nix diff --git a/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix similarity index 100% rename from modules/services/networking/unbound.nix rename to nixos/modules/services/networking/unbound.nix diff --git a/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix similarity index 100% rename from modules/services/networking/vsftpd.nix rename to nixos/modules/services/networking/vsftpd.nix diff --git a/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix similarity index 100% rename from modules/services/networking/wakeonlan.nix rename to nixos/modules/services/networking/wakeonlan.nix diff --git a/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix similarity index 100% rename from modules/services/networking/websockify.nix rename to nixos/modules/services/networking/websockify.nix diff --git a/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix similarity index 100% rename from modules/services/networking/wicd.nix rename to nixos/modules/services/networking/wicd.nix diff --git a/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix similarity index 100% rename from modules/services/networking/wpa_supplicant.nix rename to nixos/modules/services/networking/wpa_supplicant.nix diff --git a/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix similarity index 100% rename from modules/services/networking/xinetd.nix rename to nixos/modules/services/networking/xinetd.nix diff --git a/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix similarity index 100% rename from modules/services/printing/cupsd.nix rename to nixos/modules/services/printing/cupsd.nix diff --git a/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix similarity index 100% rename from modules/services/scheduling/atd.nix rename to nixos/modules/services/scheduling/atd.nix diff --git a/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix similarity index 100% rename from modules/services/scheduling/cron.nix rename to nixos/modules/services/scheduling/cron.nix diff --git a/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix similarity index 100% rename from modules/services/scheduling/fcron.nix rename to nixos/modules/services/scheduling/fcron.nix diff --git a/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix similarity index 100% rename from modules/services/search/elasticsearch.nix rename to nixos/modules/services/search/elasticsearch.nix diff --git a/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix similarity index 100% rename from modules/services/security/clamav.nix rename to nixos/modules/services/security/clamav.nix diff --git a/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix similarity index 100% rename from modules/services/security/fail2ban.nix rename to nixos/modules/services/security/fail2ban.nix diff --git a/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix similarity index 100% rename from modules/services/security/fprot.nix rename to nixos/modules/services/security/fprot.nix diff --git a/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix similarity index 100% rename from modules/services/security/frandom.nix rename to nixos/modules/services/security/frandom.nix diff --git a/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix similarity index 100% rename from modules/services/security/tor.nix rename to nixos/modules/services/security/tor.nix diff --git a/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix similarity index 100% rename from modules/services/security/torify.nix rename to nixos/modules/services/security/torify.nix diff --git a/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix similarity index 100% rename from modules/services/security/torsocks.nix rename to nixos/modules/services/security/torsocks.nix diff --git a/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix similarity index 100% rename from modules/services/system/dbus.nix rename to nixos/modules/services/system/dbus.nix diff --git a/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix similarity index 100% rename from modules/services/system/kerberos.nix rename to nixos/modules/services/system/kerberos.nix diff --git a/modules/services/system/nscd.conf b/nixos/modules/services/system/nscd.conf similarity index 100% rename from modules/services/system/nscd.conf rename to nixos/modules/services/system/nscd.conf diff --git a/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix similarity index 100% rename from modules/services/system/nscd.nix rename to nixos/modules/services/system/nscd.nix diff --git a/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix similarity index 100% rename from modules/services/system/uptimed.nix rename to nixos/modules/services/system/uptimed.nix diff --git a/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix similarity index 100% rename from modules/services/torrent/deluge.nix rename to nixos/modules/services/torrent/deluge.nix diff --git a/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix similarity index 100% rename from modules/services/torrent/transmission.nix rename to nixos/modules/services/torrent/transmission.nix diff --git a/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix similarity index 100% rename from modules/services/ttys/agetty.nix rename to nixos/modules/services/ttys/agetty.nix diff --git a/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix similarity index 100% rename from modules/services/ttys/gpm.nix rename to nixos/modules/services/ttys/gpm.nix diff --git a/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/default.nix rename to nixos/modules/services/web-servers/apache-httpd/default.nix diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/mediawiki.nix rename to nixos/modules/services/web-servers/apache-httpd/mediawiki.nix diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/mercurial.nix rename to nixos/modules/services/web-servers/apache-httpd/mercurial.nix diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/per-server-options.nix rename to nixos/modules/services/web-servers/apache-httpd/per-server-options.nix diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/tomcat-connector.nix rename to nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/trac.nix rename to nixos/modules/services/web-servers/apache-httpd/trac.nix diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix similarity index 100% rename from modules/services/web-servers/apache-httpd/zabbix.nix rename to nixos/modules/services/web-servers/apache-httpd/zabbix.nix diff --git a/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh similarity index 100% rename from modules/services/web-servers/jboss/builder.sh rename to nixos/modules/services/web-servers/jboss/builder.sh diff --git a/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix similarity index 100% rename from modules/services/web-servers/jboss/default.nix rename to nixos/modules/services/web-servers/jboss/default.nix diff --git a/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix similarity index 100% rename from modules/services/web-servers/lighttpd/cgit.nix rename to nixos/modules/services/web-servers/lighttpd/cgit.nix diff --git a/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix similarity index 100% rename from modules/services/web-servers/lighttpd/default.nix rename to nixos/modules/services/web-servers/lighttpd/default.nix diff --git a/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix similarity index 100% rename from modules/services/web-servers/lighttpd/gitweb.nix rename to nixos/modules/services/web-servers/lighttpd/gitweb.nix diff --git a/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix similarity index 100% rename from modules/services/web-servers/nginx/default.nix rename to nixos/modules/services/web-servers/nginx/default.nix diff --git a/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix similarity index 100% rename from modules/services/web-servers/tomcat.nix rename to nixos/modules/services/web-servers/tomcat.nix diff --git a/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix similarity index 100% rename from modules/services/web-servers/varnish/default.nix rename to nixos/modules/services/web-servers/varnish/default.nix diff --git a/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix similarity index 100% rename from modules/services/web-servers/zope2.nix rename to nixos/modules/services/web-servers/zope2.nix diff --git a/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix similarity index 100% rename from modules/services/x11/desktop-managers/default.nix rename to nixos/modules/services/x11/desktop-managers/default.nix diff --git a/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix similarity index 100% rename from modules/services/x11/desktop-managers/e17.nix rename to nixos/modules/services/x11/desktop-managers/e17.nix diff --git a/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix similarity index 100% rename from modules/services/x11/desktop-managers/gnome.nix rename to nixos/modules/services/x11/desktop-managers/gnome.nix diff --git a/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix similarity index 100% rename from modules/services/x11/desktop-managers/kde4.nix rename to nixos/modules/services/x11/desktop-managers/kde4.nix diff --git a/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix similarity index 100% rename from modules/services/x11/desktop-managers/none.nix rename to nixos/modules/services/x11/desktop-managers/none.nix diff --git a/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix similarity index 100% rename from modules/services/x11/desktop-managers/xfce.nix rename to nixos/modules/services/x11/desktop-managers/xfce.nix diff --git a/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix similarity index 100% rename from modules/services/x11/desktop-managers/xterm.nix rename to nixos/modules/services/x11/desktop-managers/xterm.nix diff --git a/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix similarity index 100% rename from modules/services/x11/display-managers/auto.nix rename to nixos/modules/services/x11/display-managers/auto.nix diff --git a/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix similarity index 100% rename from modules/services/x11/display-managers/default.nix rename to nixos/modules/services/x11/display-managers/default.nix diff --git a/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix similarity index 100% rename from modules/services/x11/display-managers/kdm.nix rename to nixos/modules/services/x11/display-managers/kdm.nix diff --git a/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix similarity index 100% rename from modules/services/x11/display-managers/lightdm.nix rename to nixos/modules/services/x11/display-managers/lightdm.nix diff --git a/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix similarity index 100% rename from modules/services/x11/display-managers/slim.nix rename to nixos/modules/services/x11/display-managers/slim.nix diff --git a/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix similarity index 100% rename from modules/services/x11/hardware/multitouch.nix rename to nixos/modules/services/x11/hardware/multitouch.nix diff --git a/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix similarity index 100% rename from modules/services/x11/hardware/synaptics.nix rename to nixos/modules/services/x11/hardware/synaptics.nix diff --git a/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix similarity index 100% rename from modules/services/x11/hardware/wacom.nix rename to nixos/modules/services/x11/hardware/wacom.nix diff --git a/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix similarity index 100% rename from modules/services/x11/terminal-server.nix rename to nixos/modules/services/x11/terminal-server.nix diff --git a/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix similarity index 100% rename from modules/services/x11/window-managers/awesome.nix rename to nixos/modules/services/x11/window-managers/awesome.nix diff --git a/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix similarity index 100% rename from modules/services/x11/window-managers/compiz.nix rename to nixos/modules/services/x11/window-managers/compiz.nix diff --git a/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix similarity index 100% rename from modules/services/x11/window-managers/default.nix rename to nixos/modules/services/x11/window-managers/default.nix diff --git a/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix similarity index 100% rename from modules/services/x11/window-managers/i3.nix rename to nixos/modules/services/x11/window-managers/i3.nix diff --git a/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix similarity index 100% rename from modules/services/x11/window-managers/icewm.nix rename to nixos/modules/services/x11/window-managers/icewm.nix diff --git a/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix similarity index 100% rename from modules/services/x11/window-managers/metacity.nix rename to nixos/modules/services/x11/window-managers/metacity.nix diff --git a/modules/services/x11/window-managers/none.nix b/nixos/modules/services/x11/window-managers/none.nix similarity index 100% rename from modules/services/x11/window-managers/none.nix rename to nixos/modules/services/x11/window-managers/none.nix diff --git a/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix similarity index 100% rename from modules/services/x11/window-managers/openbox.nix rename to nixos/modules/services/x11/window-managers/openbox.nix diff --git a/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix similarity index 100% rename from modules/services/x11/window-managers/twm.nix rename to nixos/modules/services/x11/window-managers/twm.nix diff --git a/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix similarity index 100% rename from modules/services/x11/window-managers/wmii.nix rename to nixos/modules/services/x11/window-managers/wmii.nix diff --git a/modules/services/x11/window-managers/xbmc.nix b/nixos/modules/services/x11/window-managers/xbmc.nix similarity index 100% rename from modules/services/x11/window-managers/xbmc.nix rename to nixos/modules/services/x11/window-managers/xbmc.nix diff --git a/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix similarity index 100% rename from modules/services/x11/window-managers/xmonad.nix rename to nixos/modules/services/x11/window-managers/xmonad.nix diff --git a/modules/services/x11/xfs.conf b/nixos/modules/services/x11/xfs.conf similarity index 100% rename from modules/services/x11/xfs.conf rename to nixos/modules/services/x11/xfs.conf diff --git a/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix similarity index 100% rename from modules/services/x11/xfs.nix rename to nixos/modules/services/x11/xfs.nix diff --git a/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix similarity index 100% rename from modules/services/x11/xserver.nix rename to nixos/modules/services/x11/xserver.nix diff --git a/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix similarity index 100% rename from modules/system/activation/activation-script.nix rename to nixos/modules/system/activation/activation-script.nix diff --git a/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix similarity index 100% rename from modules/system/activation/no-clone.nix rename to nixos/modules/system/activation/no-clone.nix diff --git a/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl similarity index 100% rename from modules/system/activation/switch-to-configuration.pl rename to nixos/modules/system/activation/switch-to-configuration.pl diff --git a/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix similarity index 100% rename from modules/system/activation/top-level.nix rename to nixos/modules/system/activation/top-level.nix diff --git a/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix similarity index 100% rename from modules/system/boot/kernel.nix rename to nixos/modules/system/boot/kernel.nix diff --git a/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix similarity index 100% rename from modules/system/boot/kexec.nix rename to nixos/modules/system/boot/kexec.nix diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh similarity index 100% rename from modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh rename to nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub-builder.sh diff --git a/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix b/nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix similarity index 100% rename from modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix rename to nixos/modules/system/boot/loader/efi-boot-stub/efi-boot-stub.nix diff --git a/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix similarity index 100% rename from modules/system/boot/loader/efi.nix rename to nixos/modules/system/boot/loader/efi.nix diff --git a/modules/system/boot/loader/generations-dir/generations-dir-builder.sh b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh similarity index 100% rename from modules/system/boot/loader/generations-dir/generations-dir-builder.sh rename to nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix similarity index 100% rename from modules/system/boot/loader/generations-dir/generations-dir.nix rename to nixos/modules/system/boot/loader/generations-dir/generations-dir.nix diff --git a/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix similarity index 100% rename from modules/system/boot/loader/grub/grub.nix rename to nixos/modules/system/boot/loader/grub/grub.nix diff --git a/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl similarity index 100% rename from modules/system/boot/loader/grub/install-grub.pl rename to nixos/modules/system/boot/loader/grub/install-grub.pl diff --git a/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix similarity index 100% rename from modules/system/boot/loader/grub/memtest.nix rename to nixos/modules/system/boot/loader/grub/memtest.nix diff --git a/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png similarity index 100% rename from modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png rename to nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png diff --git a/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README similarity index 100% rename from modules/system/boot/loader/grub/winkler-gnu-blue.README rename to nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README diff --git a/modules/system/boot/loader/gummiboot/gummiboot-builder.py b/nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py similarity index 100% rename from modules/system/boot/loader/gummiboot/gummiboot-builder.py rename to nixos/modules/system/boot/loader/gummiboot/gummiboot-builder.py diff --git a/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix similarity index 100% rename from modules/system/boot/loader/gummiboot/gummiboot.nix rename to nixos/modules/system/boot/loader/gummiboot/gummiboot.nix diff --git a/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh similarity index 100% rename from modules/system/boot/loader/init-script/init-script-builder.sh rename to nixos/modules/system/boot/loader/init-script/init-script-builder.sh diff --git a/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix similarity index 100% rename from modules/system/boot/loader/init-script/init-script.nix rename to nixos/modules/system/boot/loader/init-script/init-script.nix diff --git a/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh similarity index 100% rename from modules/system/boot/loader/raspberrypi/builder.sh rename to nixos/modules/system/boot/loader/raspberrypi/builder.sh diff --git a/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix similarity index 100% rename from modules/system/boot/loader/raspberrypi/raspberrypi.nix rename to nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix diff --git a/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix similarity index 100% rename from modules/system/boot/luksroot.nix rename to nixos/modules/system/boot/luksroot.nix diff --git a/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix similarity index 100% rename from modules/system/boot/modprobe.nix rename to nixos/modules/system/boot/modprobe.nix diff --git a/modules/system/boot/readonly-mountpoint.c b/nixos/modules/system/boot/readonly-mountpoint.c similarity index 100% rename from modules/system/boot/readonly-mountpoint.c rename to nixos/modules/system/boot/readonly-mountpoint.c diff --git a/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix similarity index 100% rename from modules/system/boot/shutdown.nix rename to nixos/modules/system/boot/shutdown.nix diff --git a/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh similarity index 100% rename from modules/system/boot/stage-1-init.sh rename to nixos/modules/system/boot/stage-1-init.sh diff --git a/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix similarity index 100% rename from modules/system/boot/stage-1.nix rename to nixos/modules/system/boot/stage-1.nix diff --git a/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh similarity index 100% rename from modules/system/boot/stage-2-init.sh rename to nixos/modules/system/boot/stage-2-init.sh diff --git a/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix similarity index 100% rename from modules/system/boot/stage-2.nix rename to nixos/modules/system/boot/stage-2.nix diff --git a/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix similarity index 100% rename from modules/system/boot/systemd-unit-options.nix rename to nixos/modules/system/boot/systemd-unit-options.nix diff --git a/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix similarity index 100% rename from modules/system/boot/systemd.nix rename to nixos/modules/system/boot/systemd.nix diff --git a/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix similarity index 100% rename from modules/system/etc/etc.nix rename to nixos/modules/system/etc/etc.nix diff --git a/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh similarity index 100% rename from modules/system/etc/make-etc.sh rename to nixos/modules/system/etc/make-etc.sh diff --git a/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl similarity index 100% rename from modules/system/etc/setup-etc.pl rename to nixos/modules/system/etc/setup-etc.pl diff --git a/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix similarity index 100% rename from modules/system/upstart/upstart.nix rename to nixos/modules/system/upstart/upstart.nix diff --git a/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix similarity index 100% rename from modules/tasks/cpu-freq.nix rename to nixos/modules/tasks/cpu-freq.nix diff --git a/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix similarity index 100% rename from modules/tasks/filesystems.nix rename to nixos/modules/tasks/filesystems.nix diff --git a/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix similarity index 100% rename from modules/tasks/filesystems/btrfs.nix rename to nixos/modules/tasks/filesystems/btrfs.nix diff --git a/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix similarity index 100% rename from modules/tasks/filesystems/ext.nix rename to nixos/modules/tasks/filesystems/ext.nix diff --git a/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix similarity index 100% rename from modules/tasks/filesystems/nfs.nix rename to nixos/modules/tasks/filesystems/nfs.nix diff --git a/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix similarity index 100% rename from modules/tasks/filesystems/reiserfs.nix rename to nixos/modules/tasks/filesystems/reiserfs.nix diff --git a/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix similarity index 100% rename from modules/tasks/filesystems/unionfs-fuse.nix rename to nixos/modules/tasks/filesystems/unionfs-fuse.nix diff --git a/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix similarity index 100% rename from modules/tasks/filesystems/vfat.nix rename to nixos/modules/tasks/filesystems/vfat.nix diff --git a/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix similarity index 100% rename from modules/tasks/filesystems/xfs.nix rename to nixos/modules/tasks/filesystems/xfs.nix diff --git a/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix similarity index 100% rename from modules/tasks/filesystems/zfs.nix rename to nixos/modules/tasks/filesystems/zfs.nix diff --git a/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix similarity index 100% rename from modules/tasks/kbd.nix rename to nixos/modules/tasks/kbd.nix diff --git a/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix similarity index 100% rename from modules/tasks/lvm.nix rename to nixos/modules/tasks/lvm.nix diff --git a/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix similarity index 100% rename from modules/tasks/network-interfaces.nix rename to nixos/modules/tasks/network-interfaces.nix diff --git a/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix similarity index 100% rename from modules/tasks/scsi-link-power-management.nix rename to nixos/modules/tasks/scsi-link-power-management.nix diff --git a/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix similarity index 100% rename from modules/tasks/swraid.nix rename to nixos/modules/tasks/swraid.nix diff --git a/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh similarity index 100% rename from modules/tasks/tty-backgrounds-combine.sh rename to nixos/modules/tasks/tty-backgrounds-combine.sh diff --git a/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix similarity index 100% rename from modules/testing/minimal-kernel.nix rename to nixos/modules/testing/minimal-kernel.nix diff --git a/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix similarity index 100% rename from modules/testing/test-instrumentation.nix rename to nixos/modules/testing/test-instrumentation.nix diff --git a/modules/virtualisation/amazon-config.nix b/nixos/modules/virtualisation/amazon-config.nix similarity index 100% rename from modules/virtualisation/amazon-config.nix rename to nixos/modules/virtualisation/amazon-config.nix diff --git a/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix similarity index 100% rename from modules/virtualisation/amazon-image.nix rename to nixos/modules/virtualisation/amazon-image.nix diff --git a/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix similarity index 100% rename from modules/virtualisation/ec2-data.nix rename to nixos/modules/virtualisation/ec2-data.nix diff --git a/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix similarity index 100% rename from modules/virtualisation/libvirtd.nix rename to nixos/modules/virtualisation/libvirtd.nix diff --git a/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix similarity index 100% rename from modules/virtualisation/nova-config.nix rename to nixos/modules/virtualisation/nova-config.nix diff --git a/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix similarity index 100% rename from modules/virtualisation/nova-image.nix rename to nixos/modules/virtualisation/nova-image.nix diff --git a/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix similarity index 100% rename from modules/virtualisation/nova.nix rename to nixos/modules/virtualisation/nova.nix diff --git a/modules/virtualisation/qemu-opts b/nixos/modules/virtualisation/qemu-opts similarity index 100% rename from modules/virtualisation/qemu-opts rename to nixos/modules/virtualisation/qemu-opts diff --git a/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix similarity index 100% rename from modules/virtualisation/qemu-vm.nix rename to nixos/modules/virtualisation/qemu-vm.nix diff --git a/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix similarity index 100% rename from modules/virtualisation/virtualbox-guest.nix rename to nixos/modules/virtualisation/virtualbox-guest.nix diff --git a/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix similarity index 100% rename from modules/virtualisation/virtualbox-image.nix rename to nixos/modules/virtualisation/virtualbox-image.nix diff --git a/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix similarity index 100% rename from modules/virtualisation/xen-dom0.nix rename to nixos/modules/virtualisation/xen-dom0.nix diff --git a/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix similarity index 100% rename from modules/virtualisation/xen-domU.nix rename to nixos/modules/virtualisation/xen-domU.nix diff --git a/release-combined.nix b/nixos/release-combined.nix similarity index 100% rename from release-combined.nix rename to nixos/release-combined.nix diff --git a/release.nix b/nixos/release.nix similarity index 100% rename from release.nix rename to nixos/release.nix diff --git a/tests/avahi.nix b/nixos/tests/avahi.nix similarity index 100% rename from tests/avahi.nix rename to nixos/tests/avahi.nix diff --git a/tests/bittorrent.nix b/nixos/tests/bittorrent.nix similarity index 100% rename from tests/bittorrent.nix rename to nixos/tests/bittorrent.nix diff --git a/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix similarity index 100% rename from tests/check-filesystems.nix rename to nixos/tests/check-filesystems.nix diff --git a/tests/common/user-account.nix b/nixos/tests/common/user-account.nix similarity index 100% rename from tests/common/user-account.nix rename to nixos/tests/common/user-account.nix diff --git a/tests/common/x11.nix b/nixos/tests/common/x11.nix similarity index 100% rename from tests/common/x11.nix rename to nixos/tests/common/x11.nix diff --git a/tests/default.nix b/nixos/tests/default.nix similarity index 100% rename from tests/default.nix rename to nixos/tests/default.nix diff --git a/tests/efi-installer.nix b/nixos/tests/efi-installer.nix similarity index 100% rename from tests/efi-installer.nix rename to nixos/tests/efi-installer.nix diff --git a/tests/firefox.nix b/nixos/tests/firefox.nix similarity index 100% rename from tests/firefox.nix rename to nixos/tests/firefox.nix diff --git a/tests/firewall.nix b/nixos/tests/firewall.nix similarity index 100% rename from tests/firewall.nix rename to nixos/tests/firewall.nix diff --git a/tests/installer.nix b/nixos/tests/installer.nix similarity index 100% rename from tests/installer.nix rename to nixos/tests/installer.nix diff --git a/tests/ipv6.nix b/nixos/tests/ipv6.nix similarity index 100% rename from tests/ipv6.nix rename to nixos/tests/ipv6.nix diff --git a/tests/kde4.nix b/nixos/tests/kde4.nix similarity index 100% rename from tests/kde4.nix rename to nixos/tests/kde4.nix diff --git a/tests/kexec.nix b/nixos/tests/kexec.nix similarity index 100% rename from tests/kexec.nix rename to nixos/tests/kexec.nix diff --git a/tests/login.nix b/nixos/tests/login.nix similarity index 100% rename from tests/login.nix rename to nixos/tests/login.nix diff --git a/tests/misc.nix b/nixos/tests/misc.nix similarity index 100% rename from tests/misc.nix rename to nixos/tests/misc.nix diff --git a/tests/mpich-example.c b/nixos/tests/mpich-example.c similarity index 100% rename from tests/mpich-example.c rename to nixos/tests/mpich-example.c diff --git a/tests/mpich.nix b/nixos/tests/mpich.nix similarity index 100% rename from tests/mpich.nix rename to nixos/tests/mpich.nix diff --git a/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix similarity index 100% rename from tests/mysql-replication.nix rename to nixos/tests/mysql-replication.nix diff --git a/tests/mysql.nix b/nixos/tests/mysql.nix similarity index 100% rename from tests/mysql.nix rename to nixos/tests/mysql.nix diff --git a/tests/nat.nix b/nixos/tests/nat.nix similarity index 100% rename from tests/nat.nix rename to nixos/tests/nat.nix diff --git a/tests/nfs.nix b/nixos/tests/nfs.nix similarity index 100% rename from tests/nfs.nix rename to nixos/tests/nfs.nix diff --git a/tests/openssh.nix b/nixos/tests/openssh.nix similarity index 100% rename from tests/openssh.nix rename to nixos/tests/openssh.nix diff --git a/tests/partition.nix b/nixos/tests/partition.nix similarity index 100% rename from tests/partition.nix rename to nixos/tests/partition.nix diff --git a/tests/printing.nix b/nixos/tests/printing.nix similarity index 100% rename from tests/printing.nix rename to nixos/tests/printing.nix diff --git a/tests/proxy.nix b/nixos/tests/proxy.nix similarity index 100% rename from tests/proxy.nix rename to nixos/tests/proxy.nix diff --git a/tests/quake3.nix b/nixos/tests/quake3.nix similarity index 100% rename from tests/quake3.nix rename to nixos/tests/quake3.nix diff --git a/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix similarity index 100% rename from tests/run-in-machine.nix rename to nixos/tests/run-in-machine.nix diff --git a/tests/simple.nix b/nixos/tests/simple.nix similarity index 100% rename from tests/simple.nix rename to nixos/tests/simple.nix diff --git a/tests/subversion.nix b/nixos/tests/subversion.nix similarity index 100% rename from tests/subversion.nix rename to nixos/tests/subversion.nix diff --git a/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh similarity index 100% rename from tests/test-config-examples.sh rename to nixos/tests/test-config-examples.sh diff --git a/tests/testdb.sql b/nixos/tests/testdb.sql similarity index 100% rename from tests/testdb.sql rename to nixos/tests/testdb.sql diff --git a/tests/tomcat.nix b/nixos/tests/tomcat.nix similarity index 100% rename from tests/tomcat.nix rename to nixos/tests/tomcat.nix diff --git a/tests/trac.nix b/nixos/tests/trac.nix similarity index 100% rename from tests/trac.nix rename to nixos/tests/trac.nix diff --git a/tests/xfce.nix b/nixos/tests/xfce.nix similarity index 100% rename from tests/xfce.nix rename to nixos/tests/xfce.nix