diff --git a/nixos/hosts/adampad/default.nix b/hosts/adampad/default.nix
similarity index 100%
rename from nixos/hosts/adampad/default.nix
rename to hosts/adampad/default.nix
diff --git a/nixos/hosts/adampad/hardware-configuration.nix b/hosts/adampad/hardware-configuration.nix
similarity index 100%
rename from nixos/hosts/adampad/hardware-configuration.nix
rename to hosts/adampad/hardware-configuration.nix
diff --git a/nixos/hosts/cnix/default.nix b/hosts/cnix/default.nix
similarity index 100%
rename from nixos/hosts/cnix/default.nix
rename to hosts/cnix/default.nix
diff --git a/nixos/hosts/cnix/hardware-configuration.nix b/hosts/cnix/hardware-configuration.nix
similarity index 100%
rename from nixos/hosts/cnix/hardware-configuration.nix
rename to hosts/cnix/hardware-configuration.nix
diff --git a/nixos/hosts/cnix/xkb/compat/README b/hosts/cnix/xkb/compat/README
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/README
rename to hosts/cnix/xkb/compat/README
diff --git a/nixos/hosts/cnix/xkb/compat/accessx b/hosts/cnix/xkb/compat/accessx
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/accessx
rename to hosts/cnix/xkb/compat/accessx
diff --git a/nixos/hosts/cnix/xkb/compat/basic b/hosts/cnix/xkb/compat/basic
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/basic
rename to hosts/cnix/xkb/compat/basic
diff --git a/nixos/hosts/cnix/xkb/compat/caps b/hosts/cnix/xkb/compat/caps
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/caps
rename to hosts/cnix/xkb/compat/caps
diff --git a/nixos/hosts/cnix/xkb/compat/complete b/hosts/cnix/xkb/compat/complete
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/complete
rename to hosts/cnix/xkb/compat/complete
diff --git a/nixos/hosts/cnix/xkb/compat/grab b/hosts/cnix/xkb/compat/grab
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/grab
rename to hosts/cnix/xkb/compat/grab
diff --git a/nixos/hosts/cnix/xkb/compat/grp_led b/hosts/cnix/xkb/compat/grp_led
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/grp_led
rename to hosts/cnix/xkb/compat/grp_led
diff --git a/nixos/hosts/cnix/xkb/compat/iso9995 b/hosts/cnix/xkb/compat/iso9995
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/iso9995
rename to hosts/cnix/xkb/compat/iso9995
diff --git a/nixos/hosts/cnix/xkb/compat/japan b/hosts/cnix/xkb/compat/japan
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/japan
rename to hosts/cnix/xkb/compat/japan
diff --git a/nixos/hosts/cnix/xkb/compat/ledcaps b/hosts/cnix/xkb/compat/ledcaps
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/ledcaps
rename to hosts/cnix/xkb/compat/ledcaps
diff --git a/nixos/hosts/cnix/xkb/compat/ledcompose b/hosts/cnix/xkb/compat/ledcompose
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/ledcompose
rename to hosts/cnix/xkb/compat/ledcompose
diff --git a/nixos/hosts/cnix/xkb/compat/lednum b/hosts/cnix/xkb/compat/lednum
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/lednum
rename to hosts/cnix/xkb/compat/lednum
diff --git a/nixos/hosts/cnix/xkb/compat/ledscroll b/hosts/cnix/xkb/compat/ledscroll
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/ledscroll
rename to hosts/cnix/xkb/compat/ledscroll
diff --git a/nixos/hosts/cnix/xkb/compat/level5 b/hosts/cnix/xkb/compat/level5
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/level5
rename to hosts/cnix/xkb/compat/level5
diff --git a/nixos/hosts/cnix/xkb/compat/misc b/hosts/cnix/xkb/compat/misc
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/misc
rename to hosts/cnix/xkb/compat/misc
diff --git a/nixos/hosts/cnix/xkb/compat/mod_led b/hosts/cnix/xkb/compat/mod_led
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/mod_led
rename to hosts/cnix/xkb/compat/mod_led
diff --git a/nixos/hosts/cnix/xkb/compat/mousekeys b/hosts/cnix/xkb/compat/mousekeys
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/mousekeys
rename to hosts/cnix/xkb/compat/mousekeys
diff --git a/nixos/hosts/cnix/xkb/compat/olpc b/hosts/cnix/xkb/compat/olpc
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/olpc
rename to hosts/cnix/xkb/compat/olpc
diff --git a/nixos/hosts/cnix/xkb/compat/pc b/hosts/cnix/xkb/compat/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/pc
rename to hosts/cnix/xkb/compat/pc
diff --git a/nixos/hosts/cnix/xkb/compat/pc98 b/hosts/cnix/xkb/compat/pc98
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/pc98
rename to hosts/cnix/xkb/compat/pc98
diff --git a/nixos/hosts/cnix/xkb/compat/xfree86 b/hosts/cnix/xkb/compat/xfree86
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/xfree86
rename to hosts/cnix/xkb/compat/xfree86
diff --git a/nixos/hosts/cnix/xkb/compat/xtest b/hosts/cnix/xkb/compat/xtest
similarity index 100%
rename from nixos/hosts/cnix/xkb/compat/xtest
rename to hosts/cnix/xkb/compat/xtest
diff --git a/nixos/hosts/cnix/xkb/geometry/README b/hosts/cnix/xkb/geometry/README
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/README
rename to hosts/cnix/xkb/geometry/README
diff --git a/nixos/hosts/cnix/xkb/geometry/amiga b/hosts/cnix/xkb/geometry/amiga
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/amiga
rename to hosts/cnix/xkb/geometry/amiga
diff --git a/nixos/hosts/cnix/xkb/geometry/ataritt b/hosts/cnix/xkb/geometry/ataritt
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/ataritt
rename to hosts/cnix/xkb/geometry/ataritt
diff --git a/nixos/hosts/cnix/xkb/geometry/chicony b/hosts/cnix/xkb/geometry/chicony
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/chicony
rename to hosts/cnix/xkb/geometry/chicony
diff --git a/nixos/hosts/cnix/xkb/geometry/dell b/hosts/cnix/xkb/geometry/dell
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/dell
rename to hosts/cnix/xkb/geometry/dell
diff --git a/nixos/hosts/cnix/xkb/geometry/digital_vndr/lk b/hosts/cnix/xkb/geometry/digital_vndr/lk
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/digital_vndr/lk
rename to hosts/cnix/xkb/geometry/digital_vndr/lk
diff --git a/nixos/hosts/cnix/xkb/geometry/digital_vndr/pc b/hosts/cnix/xkb/geometry/digital_vndr/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/digital_vndr/pc
rename to hosts/cnix/xkb/geometry/digital_vndr/pc
diff --git a/nixos/hosts/cnix/xkb/geometry/digital_vndr/unix b/hosts/cnix/xkb/geometry/digital_vndr/unix
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/digital_vndr/unix
rename to hosts/cnix/xkb/geometry/digital_vndr/unix
diff --git a/nixos/hosts/cnix/xkb/geometry/everex b/hosts/cnix/xkb/geometry/everex
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/everex
rename to hosts/cnix/xkb/geometry/everex
diff --git a/nixos/hosts/cnix/xkb/geometry/fujitsu b/hosts/cnix/xkb/geometry/fujitsu
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/fujitsu
rename to hosts/cnix/xkb/geometry/fujitsu
diff --git a/nixos/hosts/cnix/xkb/geometry/hhk b/hosts/cnix/xkb/geometry/hhk
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/hhk
rename to hosts/cnix/xkb/geometry/hhk
diff --git a/nixos/hosts/cnix/xkb/geometry/hp b/hosts/cnix/xkb/geometry/hp
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/hp
rename to hosts/cnix/xkb/geometry/hp
diff --git a/nixos/hosts/cnix/xkb/geometry/keytronic b/hosts/cnix/xkb/geometry/keytronic
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/keytronic
rename to hosts/cnix/xkb/geometry/keytronic
diff --git a/nixos/hosts/cnix/xkb/geometry/kinesis b/hosts/cnix/xkb/geometry/kinesis
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/kinesis
rename to hosts/cnix/xkb/geometry/kinesis
diff --git a/nixos/hosts/cnix/xkb/geometry/macintosh b/hosts/cnix/xkb/geometry/macintosh
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/macintosh
rename to hosts/cnix/xkb/geometry/macintosh
diff --git a/nixos/hosts/cnix/xkb/geometry/microsoft b/hosts/cnix/xkb/geometry/microsoft
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/microsoft
rename to hosts/cnix/xkb/geometry/microsoft
diff --git a/nixos/hosts/cnix/xkb/geometry/nec b/hosts/cnix/xkb/geometry/nec
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/nec
rename to hosts/cnix/xkb/geometry/nec
diff --git a/nixos/hosts/cnix/xkb/geometry/northgate b/hosts/cnix/xkb/geometry/northgate
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/northgate
rename to hosts/cnix/xkb/geometry/northgate
diff --git a/nixos/hosts/cnix/xkb/geometry/pc b/hosts/cnix/xkb/geometry/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/pc
rename to hosts/cnix/xkb/geometry/pc
diff --git a/nixos/hosts/cnix/xkb/geometry/sanwa b/hosts/cnix/xkb/geometry/sanwa
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sanwa
rename to hosts/cnix/xkb/geometry/sanwa
diff --git a/nixos/hosts/cnix/xkb/geometry/sgi_vndr/O2 b/hosts/cnix/xkb/geometry/sgi_vndr/O2
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sgi_vndr/O2
rename to hosts/cnix/xkb/geometry/sgi_vndr/O2
diff --git a/nixos/hosts/cnix/xkb/geometry/sgi_vndr/indigo b/hosts/cnix/xkb/geometry/sgi_vndr/indigo
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sgi_vndr/indigo
rename to hosts/cnix/xkb/geometry/sgi_vndr/indigo
diff --git a/nixos/hosts/cnix/xkb/geometry/sgi_vndr/indy b/hosts/cnix/xkb/geometry/sgi_vndr/indy
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sgi_vndr/indy
rename to hosts/cnix/xkb/geometry/sgi_vndr/indy
diff --git a/nixos/hosts/cnix/xkb/geometry/sony b/hosts/cnix/xkb/geometry/sony
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sony
rename to hosts/cnix/xkb/geometry/sony
diff --git a/nixos/hosts/cnix/xkb/geometry/steelseries b/hosts/cnix/xkb/geometry/steelseries
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/steelseries
rename to hosts/cnix/xkb/geometry/steelseries
diff --git a/nixos/hosts/cnix/xkb/geometry/sun b/hosts/cnix/xkb/geometry/sun
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/sun
rename to hosts/cnix/xkb/geometry/sun
diff --git a/nixos/hosts/cnix/xkb/geometry/teck b/hosts/cnix/xkb/geometry/teck
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/teck
rename to hosts/cnix/xkb/geometry/teck
diff --git a/nixos/hosts/cnix/xkb/geometry/thinkpad b/hosts/cnix/xkb/geometry/thinkpad
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/thinkpad
rename to hosts/cnix/xkb/geometry/thinkpad
diff --git a/nixos/hosts/cnix/xkb/geometry/typematrix b/hosts/cnix/xkb/geometry/typematrix
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/typematrix
rename to hosts/cnix/xkb/geometry/typematrix
diff --git a/nixos/hosts/cnix/xkb/geometry/winbook b/hosts/cnix/xkb/geometry/winbook
similarity index 100%
rename from nixos/hosts/cnix/xkb/geometry/winbook
rename to hosts/cnix/xkb/geometry/winbook
diff --git a/nixos/hosts/cnix/xkb/keycodes/README b/hosts/cnix/xkb/keycodes/README
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/README
rename to hosts/cnix/xkb/keycodes/README
diff --git a/nixos/hosts/cnix/xkb/keycodes/aliases b/hosts/cnix/xkb/keycodes/aliases
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/aliases
rename to hosts/cnix/xkb/keycodes/aliases
diff --git a/nixos/hosts/cnix/xkb/keycodes/amiga b/hosts/cnix/xkb/keycodes/amiga
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/amiga
rename to hosts/cnix/xkb/keycodes/amiga
diff --git a/nixos/hosts/cnix/xkb/keycodes/ataritt b/hosts/cnix/xkb/keycodes/ataritt
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/ataritt
rename to hosts/cnix/xkb/keycodes/ataritt
diff --git a/nixos/hosts/cnix/xkb/keycodes/digital_vndr/lk b/hosts/cnix/xkb/keycodes/digital_vndr/lk
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/digital_vndr/lk
rename to hosts/cnix/xkb/keycodes/digital_vndr/lk
diff --git a/nixos/hosts/cnix/xkb/keycodes/digital_vndr/pc b/hosts/cnix/xkb/keycodes/digital_vndr/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/digital_vndr/pc
rename to hosts/cnix/xkb/keycodes/digital_vndr/pc
diff --git a/nixos/hosts/cnix/xkb/keycodes/empty b/hosts/cnix/xkb/keycodes/empty
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/empty
rename to hosts/cnix/xkb/keycodes/empty
diff --git a/nixos/hosts/cnix/xkb/keycodes/evdev b/hosts/cnix/xkb/keycodes/evdev
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/evdev
rename to hosts/cnix/xkb/keycodes/evdev
diff --git a/nixos/hosts/cnix/xkb/keycodes/fujitsu b/hosts/cnix/xkb/keycodes/fujitsu
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/fujitsu
rename to hosts/cnix/xkb/keycodes/fujitsu
diff --git a/nixos/hosts/cnix/xkb/keycodes/hp b/hosts/cnix/xkb/keycodes/hp
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/hp
rename to hosts/cnix/xkb/keycodes/hp
diff --git a/nixos/hosts/cnix/xkb/keycodes/ibm b/hosts/cnix/xkb/keycodes/ibm
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/ibm
rename to hosts/cnix/xkb/keycodes/ibm
diff --git a/nixos/hosts/cnix/xkb/keycodes/jolla b/hosts/cnix/xkb/keycodes/jolla
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/jolla
rename to hosts/cnix/xkb/keycodes/jolla
diff --git a/nixos/hosts/cnix/xkb/keycodes/macintosh b/hosts/cnix/xkb/keycodes/macintosh
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/macintosh
rename to hosts/cnix/xkb/keycodes/macintosh
diff --git a/nixos/hosts/cnix/xkb/keycodes/olpc b/hosts/cnix/xkb/keycodes/olpc
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/olpc
rename to hosts/cnix/xkb/keycodes/olpc
diff --git a/nixos/hosts/cnix/xkb/keycodes/sgi_vndr/indigo b/hosts/cnix/xkb/keycodes/sgi_vndr/indigo
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/sgi_vndr/indigo
rename to hosts/cnix/xkb/keycodes/sgi_vndr/indigo
diff --git a/nixos/hosts/cnix/xkb/keycodes/sgi_vndr/indy b/hosts/cnix/xkb/keycodes/sgi_vndr/indy
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/sgi_vndr/indy
rename to hosts/cnix/xkb/keycodes/sgi_vndr/indy
diff --git a/nixos/hosts/cnix/xkb/keycodes/sgi_vndr/iris b/hosts/cnix/xkb/keycodes/sgi_vndr/iris
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/sgi_vndr/iris
rename to hosts/cnix/xkb/keycodes/sgi_vndr/iris
diff --git a/nixos/hosts/cnix/xkb/keycodes/sony b/hosts/cnix/xkb/keycodes/sony
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/sony
rename to hosts/cnix/xkb/keycodes/sony
diff --git a/nixos/hosts/cnix/xkb/keycodes/sun b/hosts/cnix/xkb/keycodes/sun
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/sun
rename to hosts/cnix/xkb/keycodes/sun
diff --git a/nixos/hosts/cnix/xkb/keycodes/xfree86 b/hosts/cnix/xkb/keycodes/xfree86
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/xfree86
rename to hosts/cnix/xkb/keycodes/xfree86
diff --git a/nixos/hosts/cnix/xkb/keycodes/xfree98 b/hosts/cnix/xkb/keycodes/xfree98
similarity index 100%
rename from nixos/hosts/cnix/xkb/keycodes/xfree98
rename to hosts/cnix/xkb/keycodes/xfree98
diff --git a/nixos/hosts/cnix/xkb/rules/README b/hosts/cnix/xkb/rules/README
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/README
rename to hosts/cnix/xkb/rules/README
diff --git a/nixos/hosts/cnix/xkb/rules/base b/hosts/cnix/xkb/rules/base
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/base
rename to hosts/cnix/xkb/rules/base
diff --git a/nixos/hosts/cnix/xkb/rules/base.extras.xml b/hosts/cnix/xkb/rules/base.extras.xml
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/base.extras.xml
rename to hosts/cnix/xkb/rules/base.extras.xml
diff --git a/nixos/hosts/cnix/xkb/rules/base.lst b/hosts/cnix/xkb/rules/base.lst
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/base.lst
rename to hosts/cnix/xkb/rules/base.lst
diff --git a/nixos/hosts/cnix/xkb/rules/base.xml b/hosts/cnix/xkb/rules/base.xml
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/base.xml
rename to hosts/cnix/xkb/rules/base.xml
diff --git a/nixos/hosts/cnix/xkb/rules/evdev b/hosts/cnix/xkb/rules/evdev
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/evdev
rename to hosts/cnix/xkb/rules/evdev
diff --git a/nixos/hosts/cnix/xkb/rules/evdev.extras.xml b/hosts/cnix/xkb/rules/evdev.extras.xml
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/evdev.extras.xml
rename to hosts/cnix/xkb/rules/evdev.extras.xml
diff --git a/nixos/hosts/cnix/xkb/rules/evdev.lst b/hosts/cnix/xkb/rules/evdev.lst
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/evdev.lst
rename to hosts/cnix/xkb/rules/evdev.lst
diff --git a/nixos/hosts/cnix/xkb/rules/evdev.xml b/hosts/cnix/xkb/rules/evdev.xml
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/evdev.xml
rename to hosts/cnix/xkb/rules/evdev.xml
diff --git a/nixos/hosts/cnix/xkb/rules/xfree98 b/hosts/cnix/xkb/rules/xfree98
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/xfree98
rename to hosts/cnix/xkb/rules/xfree98
diff --git a/nixos/hosts/cnix/xkb/rules/xkb.dtd b/hosts/cnix/xkb/rules/xkb.dtd
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/xkb.dtd
rename to hosts/cnix/xkb/rules/xkb.dtd
diff --git a/nixos/hosts/cnix/xkb/rules/xorg b/hosts/cnix/xkb/rules/xorg
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/xorg
rename to hosts/cnix/xkb/rules/xorg
diff --git a/nixos/hosts/cnix/xkb/rules/xorg.lst b/hosts/cnix/xkb/rules/xorg.lst
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/xorg.lst
rename to hosts/cnix/xkb/rules/xorg.lst
diff --git a/nixos/hosts/cnix/xkb/rules/xorg.xml b/hosts/cnix/xkb/rules/xorg.xml
similarity index 100%
rename from nixos/hosts/cnix/xkb/rules/xorg.xml
rename to hosts/cnix/xkb/rules/xorg.xml
diff --git a/nixos/hosts/cnix/xkb/symbols/af b/hosts/cnix/xkb/symbols/af
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/af
rename to hosts/cnix/xkb/symbols/af
diff --git a/nixos/hosts/cnix/xkb/symbols/al b/hosts/cnix/xkb/symbols/al
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/al
rename to hosts/cnix/xkb/symbols/al
diff --git a/nixos/hosts/cnix/xkb/symbols/altwin b/hosts/cnix/xkb/symbols/altwin
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/altwin
rename to hosts/cnix/xkb/symbols/altwin
diff --git a/nixos/hosts/cnix/xkb/symbols/am b/hosts/cnix/xkb/symbols/am
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/am
rename to hosts/cnix/xkb/symbols/am
diff --git a/nixos/hosts/cnix/xkb/symbols/ancient b/hosts/cnix/xkb/symbols/ancient
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ancient
rename to hosts/cnix/xkb/symbols/ancient
diff --git a/nixos/hosts/cnix/xkb/symbols/apl b/hosts/cnix/xkb/symbols/apl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/apl
rename to hosts/cnix/xkb/symbols/apl
diff --git a/nixos/hosts/cnix/xkb/symbols/ara b/hosts/cnix/xkb/symbols/ara
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ara
rename to hosts/cnix/xkb/symbols/ara
diff --git a/nixos/hosts/cnix/xkb/symbols/at b/hosts/cnix/xkb/symbols/at
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/at
rename to hosts/cnix/xkb/symbols/at
diff --git a/nixos/hosts/cnix/xkb/symbols/au b/hosts/cnix/xkb/symbols/au
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/au
rename to hosts/cnix/xkb/symbols/au
diff --git a/nixos/hosts/cnix/xkb/symbols/az b/hosts/cnix/xkb/symbols/az
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/az
rename to hosts/cnix/xkb/symbols/az
diff --git a/nixos/hosts/cnix/xkb/symbols/ba b/hosts/cnix/xkb/symbols/ba
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ba
rename to hosts/cnix/xkb/symbols/ba
diff --git a/nixos/hosts/cnix/xkb/symbols/bd b/hosts/cnix/xkb/symbols/bd
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/bd
rename to hosts/cnix/xkb/symbols/bd
diff --git a/nixos/hosts/cnix/xkb/symbols/be b/hosts/cnix/xkb/symbols/be
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/be
rename to hosts/cnix/xkb/symbols/be
diff --git a/nixos/hosts/cnix/xkb/symbols/bg b/hosts/cnix/xkb/symbols/bg
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/bg
rename to hosts/cnix/xkb/symbols/bg
diff --git a/nixos/hosts/cnix/xkb/symbols/bqn b/hosts/cnix/xkb/symbols/bqn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/bqn
rename to hosts/cnix/xkb/symbols/bqn
diff --git a/nixos/hosts/cnix/xkb/symbols/br b/hosts/cnix/xkb/symbols/br
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/br
rename to hosts/cnix/xkb/symbols/br
diff --git a/nixos/hosts/cnix/xkb/symbols/brai b/hosts/cnix/xkb/symbols/brai
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/brai
rename to hosts/cnix/xkb/symbols/brai
diff --git a/nixos/hosts/cnix/xkb/symbols/bt b/hosts/cnix/xkb/symbols/bt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/bt
rename to hosts/cnix/xkb/symbols/bt
diff --git a/nixos/hosts/cnix/xkb/symbols/bw b/hosts/cnix/xkb/symbols/bw
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/bw
rename to hosts/cnix/xkb/symbols/bw
diff --git a/nixos/hosts/cnix/xkb/symbols/by b/hosts/cnix/xkb/symbols/by
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/by
rename to hosts/cnix/xkb/symbols/by
diff --git a/nixos/hosts/cnix/xkb/symbols/ca b/hosts/cnix/xkb/symbols/ca
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ca
rename to hosts/cnix/xkb/symbols/ca
diff --git a/nixos/hosts/cnix/xkb/symbols/capslock b/hosts/cnix/xkb/symbols/capslock
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/capslock
rename to hosts/cnix/xkb/symbols/capslock
diff --git a/nixos/hosts/cnix/xkb/symbols/cd b/hosts/cnix/xkb/symbols/cd
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/cd
rename to hosts/cnix/xkb/symbols/cd
diff --git a/nixos/hosts/cnix/xkb/symbols/ch b/hosts/cnix/xkb/symbols/ch
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ch
rename to hosts/cnix/xkb/symbols/ch
diff --git a/nixos/hosts/cnix/xkb/symbols/cm b/hosts/cnix/xkb/symbols/cm
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/cm
rename to hosts/cnix/xkb/symbols/cm
diff --git a/nixos/hosts/cnix/xkb/symbols/cn b/hosts/cnix/xkb/symbols/cn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/cn
rename to hosts/cnix/xkb/symbols/cn
diff --git a/nixos/hosts/cnix/xkb/symbols/compose b/hosts/cnix/xkb/symbols/compose
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/compose
rename to hosts/cnix/xkb/symbols/compose
diff --git a/nixos/hosts/cnix/xkb/symbols/ctrl b/hosts/cnix/xkb/symbols/ctrl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ctrl
rename to hosts/cnix/xkb/symbols/ctrl
diff --git a/nixos/hosts/cnix/xkb/symbols/cz b/hosts/cnix/xkb/symbols/cz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/cz
rename to hosts/cnix/xkb/symbols/cz
diff --git a/nixos/hosts/cnix/xkb/symbols/de b/hosts/cnix/xkb/symbols/de
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/de
rename to hosts/cnix/xkb/symbols/de
diff --git a/nixos/hosts/cnix/xkb/symbols/digital_vndr/lk b/hosts/cnix/xkb/symbols/digital_vndr/lk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/digital_vndr/lk
rename to hosts/cnix/xkb/symbols/digital_vndr/lk
diff --git a/nixos/hosts/cnix/xkb/symbols/digital_vndr/pc b/hosts/cnix/xkb/symbols/digital_vndr/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/digital_vndr/pc
rename to hosts/cnix/xkb/symbols/digital_vndr/pc
diff --git a/nixos/hosts/cnix/xkb/symbols/digital_vndr/us b/hosts/cnix/xkb/symbols/digital_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/digital_vndr/us
rename to hosts/cnix/xkb/symbols/digital_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/digital_vndr/vt b/hosts/cnix/xkb/symbols/digital_vndr/vt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/digital_vndr/vt
rename to hosts/cnix/xkb/symbols/digital_vndr/vt
diff --git a/nixos/hosts/cnix/xkb/symbols/dk b/hosts/cnix/xkb/symbols/dk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/dk
rename to hosts/cnix/xkb/symbols/dk
diff --git a/nixos/hosts/cnix/xkb/symbols/dz b/hosts/cnix/xkb/symbols/dz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/dz
rename to hosts/cnix/xkb/symbols/dz
diff --git a/nixos/hosts/cnix/xkb/symbols/ee b/hosts/cnix/xkb/symbols/ee
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ee
rename to hosts/cnix/xkb/symbols/ee
diff --git a/nixos/hosts/cnix/xkb/symbols/eg b/hosts/cnix/xkb/symbols/eg
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/eg
rename to hosts/cnix/xkb/symbols/eg
diff --git a/nixos/hosts/cnix/xkb/symbols/empty b/hosts/cnix/xkb/symbols/empty
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/empty
rename to hosts/cnix/xkb/symbols/empty
diff --git a/nixos/hosts/cnix/xkb/symbols/epo b/hosts/cnix/xkb/symbols/epo
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/epo
rename to hosts/cnix/xkb/symbols/epo
diff --git a/nixos/hosts/cnix/xkb/symbols/es b/hosts/cnix/xkb/symbols/es
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/es
rename to hosts/cnix/xkb/symbols/es
diff --git a/nixos/hosts/cnix/xkb/symbols/et b/hosts/cnix/xkb/symbols/et
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/et
rename to hosts/cnix/xkb/symbols/et
diff --git a/nixos/hosts/cnix/xkb/symbols/eu b/hosts/cnix/xkb/symbols/eu
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/eu
rename to hosts/cnix/xkb/symbols/eu
diff --git a/nixos/hosts/cnix/xkb/symbols/eurosign b/hosts/cnix/xkb/symbols/eurosign
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/eurosign
rename to hosts/cnix/xkb/symbols/eurosign
diff --git a/nixos/hosts/cnix/xkb/symbols/fi b/hosts/cnix/xkb/symbols/fi
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/fi
rename to hosts/cnix/xkb/symbols/fi
diff --git a/nixos/hosts/cnix/xkb/symbols/fo b/hosts/cnix/xkb/symbols/fo
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/fo
rename to hosts/cnix/xkb/symbols/fo
diff --git a/nixos/hosts/cnix/xkb/symbols/fr b/hosts/cnix/xkb/symbols/fr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/fr
rename to hosts/cnix/xkb/symbols/fr
diff --git a/nixos/hosts/cnix/xkb/symbols/fujitsu_vndr/jp b/hosts/cnix/xkb/symbols/fujitsu_vndr/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/fujitsu_vndr/jp
rename to hosts/cnix/xkb/symbols/fujitsu_vndr/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/fujitsu_vndr/us b/hosts/cnix/xkb/symbols/fujitsu_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/fujitsu_vndr/us
rename to hosts/cnix/xkb/symbols/fujitsu_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/gb b/hosts/cnix/xkb/symbols/gb
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/gb
rename to hosts/cnix/xkb/symbols/gb
diff --git a/nixos/hosts/cnix/xkb/symbols/ge b/hosts/cnix/xkb/symbols/ge
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ge
rename to hosts/cnix/xkb/symbols/ge
diff --git a/nixos/hosts/cnix/xkb/symbols/gh b/hosts/cnix/xkb/symbols/gh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/gh
rename to hosts/cnix/xkb/symbols/gh
diff --git a/nixos/hosts/cnix/xkb/symbols/gn b/hosts/cnix/xkb/symbols/gn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/gn
rename to hosts/cnix/xkb/symbols/gn
diff --git a/nixos/hosts/cnix/xkb/symbols/gr b/hosts/cnix/xkb/symbols/gr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/gr
rename to hosts/cnix/xkb/symbols/gr
diff --git a/nixos/hosts/cnix/xkb/symbols/grab b/hosts/cnix/xkb/symbols/grab
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/grab
rename to hosts/cnix/xkb/symbols/grab
diff --git a/nixos/hosts/cnix/xkb/symbols/group b/hosts/cnix/xkb/symbols/group
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/group
rename to hosts/cnix/xkb/symbols/group
diff --git a/nixos/hosts/cnix/xkb/symbols/hhkbse b/hosts/cnix/xkb/symbols/hhkbse
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/hhkbse
rename to hosts/cnix/xkb/symbols/hhkbse
diff --git a/nixos/hosts/cnix/xkb/symbols/hp_vndr/us b/hosts/cnix/xkb/symbols/hp_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/hp_vndr/us
rename to hosts/cnix/xkb/symbols/hp_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/hr b/hosts/cnix/xkb/symbols/hr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/hr
rename to hosts/cnix/xkb/symbols/hr
diff --git a/nixos/hosts/cnix/xkb/symbols/hu b/hosts/cnix/xkb/symbols/hu
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/hu
rename to hosts/cnix/xkb/symbols/hu
diff --git a/nixos/hosts/cnix/xkb/symbols/id b/hosts/cnix/xkb/symbols/id
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/id
rename to hosts/cnix/xkb/symbols/id
diff --git a/nixos/hosts/cnix/xkb/symbols/ie b/hosts/cnix/xkb/symbols/ie
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ie
rename to hosts/cnix/xkb/symbols/ie
diff --git a/nixos/hosts/cnix/xkb/symbols/il b/hosts/cnix/xkb/symbols/il
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/il
rename to hosts/cnix/xkb/symbols/il
diff --git a/nixos/hosts/cnix/xkb/symbols/in b/hosts/cnix/xkb/symbols/in
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/in
rename to hosts/cnix/xkb/symbols/in
diff --git a/nixos/hosts/cnix/xkb/symbols/inet b/hosts/cnix/xkb/symbols/inet
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/inet
rename to hosts/cnix/xkb/symbols/inet
diff --git a/nixos/hosts/cnix/xkb/symbols/iq b/hosts/cnix/xkb/symbols/iq
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/iq
rename to hosts/cnix/xkb/symbols/iq
diff --git a/nixos/hosts/cnix/xkb/symbols/ir b/hosts/cnix/xkb/symbols/ir
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ir
rename to hosts/cnix/xkb/symbols/ir
diff --git a/nixos/hosts/cnix/xkb/symbols/is b/hosts/cnix/xkb/symbols/is
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/is
rename to hosts/cnix/xkb/symbols/is
diff --git a/nixos/hosts/cnix/xkb/symbols/it b/hosts/cnix/xkb/symbols/it
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/it
rename to hosts/cnix/xkb/symbols/it
diff --git a/nixos/hosts/cnix/xkb/symbols/jolla_vndr/sbj b/hosts/cnix/xkb/symbols/jolla_vndr/sbj
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/jolla_vndr/sbj
rename to hosts/cnix/xkb/symbols/jolla_vndr/sbj
diff --git a/nixos/hosts/cnix/xkb/symbols/jp b/hosts/cnix/xkb/symbols/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/jp
rename to hosts/cnix/xkb/symbols/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/ke b/hosts/cnix/xkb/symbols/ke
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ke
rename to hosts/cnix/xkb/symbols/ke
diff --git a/nixos/hosts/cnix/xkb/symbols/keypad b/hosts/cnix/xkb/symbols/keypad
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/keypad
rename to hosts/cnix/xkb/symbols/keypad
diff --git a/nixos/hosts/cnix/xkb/symbols/kg b/hosts/cnix/xkb/symbols/kg
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/kg
rename to hosts/cnix/xkb/symbols/kg
diff --git a/nixos/hosts/cnix/xkb/symbols/kh b/hosts/cnix/xkb/symbols/kh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/kh
rename to hosts/cnix/xkb/symbols/kh
diff --git a/nixos/hosts/cnix/xkb/symbols/kpdl b/hosts/cnix/xkb/symbols/kpdl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/kpdl
rename to hosts/cnix/xkb/symbols/kpdl
diff --git a/nixos/hosts/cnix/xkb/symbols/kr b/hosts/cnix/xkb/symbols/kr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/kr
rename to hosts/cnix/xkb/symbols/kr
diff --git a/nixos/hosts/cnix/xkb/symbols/kz b/hosts/cnix/xkb/symbols/kz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/kz
rename to hosts/cnix/xkb/symbols/kz
diff --git a/nixos/hosts/cnix/xkb/symbols/la b/hosts/cnix/xkb/symbols/la
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/la
rename to hosts/cnix/xkb/symbols/la
diff --git a/nixos/hosts/cnix/xkb/symbols/latam b/hosts/cnix/xkb/symbols/latam
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/latam
rename to hosts/cnix/xkb/symbols/latam
diff --git a/nixos/hosts/cnix/xkb/symbols/latin b/hosts/cnix/xkb/symbols/latin
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/latin
rename to hosts/cnix/xkb/symbols/latin
diff --git a/nixos/hosts/cnix/xkb/symbols/level2 b/hosts/cnix/xkb/symbols/level2
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/level2
rename to hosts/cnix/xkb/symbols/level2
diff --git a/nixos/hosts/cnix/xkb/symbols/level3 b/hosts/cnix/xkb/symbols/level3
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/level3
rename to hosts/cnix/xkb/symbols/level3
diff --git a/nixos/hosts/cnix/xkb/symbols/level5 b/hosts/cnix/xkb/symbols/level5
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/level5
rename to hosts/cnix/xkb/symbols/level5
diff --git a/nixos/hosts/cnix/xkb/symbols/lk b/hosts/cnix/xkb/symbols/lk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/lk
rename to hosts/cnix/xkb/symbols/lk
diff --git a/nixos/hosts/cnix/xkb/symbols/lt b/hosts/cnix/xkb/symbols/lt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/lt
rename to hosts/cnix/xkb/symbols/lt
diff --git a/nixos/hosts/cnix/xkb/symbols/lv b/hosts/cnix/xkb/symbols/lv
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/lv
rename to hosts/cnix/xkb/symbols/lv
diff --git a/nixos/hosts/cnix/xkb/symbols/ma b/hosts/cnix/xkb/symbols/ma
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ma
rename to hosts/cnix/xkb/symbols/ma
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/apple b/hosts/cnix/xkb/symbols/macintosh_vndr/apple
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/apple
rename to hosts/cnix/xkb/symbols/macintosh_vndr/apple
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/ch b/hosts/cnix/xkb/symbols/macintosh_vndr/ch
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/ch
rename to hosts/cnix/xkb/symbols/macintosh_vndr/ch
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/de b/hosts/cnix/xkb/symbols/macintosh_vndr/de
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/de
rename to hosts/cnix/xkb/symbols/macintosh_vndr/de
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/dk b/hosts/cnix/xkb/symbols/macintosh_vndr/dk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/dk
rename to hosts/cnix/xkb/symbols/macintosh_vndr/dk
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/fi b/hosts/cnix/xkb/symbols/macintosh_vndr/fi
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/fi
rename to hosts/cnix/xkb/symbols/macintosh_vndr/fi
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/fr b/hosts/cnix/xkb/symbols/macintosh_vndr/fr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/fr
rename to hosts/cnix/xkb/symbols/macintosh_vndr/fr
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/gb b/hosts/cnix/xkb/symbols/macintosh_vndr/gb
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/gb
rename to hosts/cnix/xkb/symbols/macintosh_vndr/gb
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/is b/hosts/cnix/xkb/symbols/macintosh_vndr/is
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/is
rename to hosts/cnix/xkb/symbols/macintosh_vndr/is
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/it b/hosts/cnix/xkb/symbols/macintosh_vndr/it
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/it
rename to hosts/cnix/xkb/symbols/macintosh_vndr/it
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/jp b/hosts/cnix/xkb/symbols/macintosh_vndr/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/jp
rename to hosts/cnix/xkb/symbols/macintosh_vndr/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/latam b/hosts/cnix/xkb/symbols/macintosh_vndr/latam
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/latam
rename to hosts/cnix/xkb/symbols/macintosh_vndr/latam
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/nl b/hosts/cnix/xkb/symbols/macintosh_vndr/nl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/nl
rename to hosts/cnix/xkb/symbols/macintosh_vndr/nl
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/no b/hosts/cnix/xkb/symbols/macintosh_vndr/no
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/no
rename to hosts/cnix/xkb/symbols/macintosh_vndr/no
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/pt b/hosts/cnix/xkb/symbols/macintosh_vndr/pt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/pt
rename to hosts/cnix/xkb/symbols/macintosh_vndr/pt
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/se b/hosts/cnix/xkb/symbols/macintosh_vndr/se
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/se
rename to hosts/cnix/xkb/symbols/macintosh_vndr/se
diff --git a/nixos/hosts/cnix/xkb/symbols/macintosh_vndr/us b/hosts/cnix/xkb/symbols/macintosh_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/macintosh_vndr/us
rename to hosts/cnix/xkb/symbols/macintosh_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/md b/hosts/cnix/xkb/symbols/md
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/md
rename to hosts/cnix/xkb/symbols/md
diff --git a/nixos/hosts/cnix/xkb/symbols/me b/hosts/cnix/xkb/symbols/me
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/me
rename to hosts/cnix/xkb/symbols/me
diff --git a/nixos/hosts/cnix/xkb/symbols/mk b/hosts/cnix/xkb/symbols/mk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/mk
rename to hosts/cnix/xkb/symbols/mk
diff --git a/nixos/hosts/cnix/xkb/symbols/ml b/hosts/cnix/xkb/symbols/ml
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ml
rename to hosts/cnix/xkb/symbols/ml
diff --git a/nixos/hosts/cnix/xkb/symbols/mm b/hosts/cnix/xkb/symbols/mm
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/mm
rename to hosts/cnix/xkb/symbols/mm
diff --git a/nixos/hosts/cnix/xkb/symbols/mn b/hosts/cnix/xkb/symbols/mn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/mn
rename to hosts/cnix/xkb/symbols/mn
diff --git a/nixos/hosts/cnix/xkb/symbols/mt b/hosts/cnix/xkb/symbols/mt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/mt
rename to hosts/cnix/xkb/symbols/mt
diff --git a/nixos/hosts/cnix/xkb/symbols/mv b/hosts/cnix/xkb/symbols/mv
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/mv
rename to hosts/cnix/xkb/symbols/mv
diff --git a/nixos/hosts/cnix/xkb/symbols/my b/hosts/cnix/xkb/symbols/my
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/my
rename to hosts/cnix/xkb/symbols/my
diff --git a/nixos/hosts/cnix/xkb/symbols/nbsp b/hosts/cnix/xkb/symbols/nbsp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/nbsp
rename to hosts/cnix/xkb/symbols/nbsp
diff --git a/nixos/hosts/cnix/xkb/symbols/nec_vndr/jp b/hosts/cnix/xkb/symbols/nec_vndr/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/nec_vndr/jp
rename to hosts/cnix/xkb/symbols/nec_vndr/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/ng b/hosts/cnix/xkb/symbols/ng
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ng
rename to hosts/cnix/xkb/symbols/ng
diff --git a/nixos/hosts/cnix/xkb/symbols/nl b/hosts/cnix/xkb/symbols/nl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/nl
rename to hosts/cnix/xkb/symbols/nl
diff --git a/nixos/hosts/cnix/xkb/symbols/no b/hosts/cnix/xkb/symbols/no
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/no
rename to hosts/cnix/xkb/symbols/no
diff --git a/nixos/hosts/cnix/xkb/symbols/np b/hosts/cnix/xkb/symbols/np
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/np
rename to hosts/cnix/xkb/symbols/np
diff --git a/nixos/hosts/cnix/xkb/symbols/nz b/hosts/cnix/xkb/symbols/nz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/nz
rename to hosts/cnix/xkb/symbols/nz
diff --git a/nixos/hosts/cnix/xkb/symbols/olpc b/hosts/cnix/xkb/symbols/olpc
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/olpc
rename to hosts/cnix/xkb/symbols/olpc
diff --git a/nixos/hosts/cnix/xkb/symbols/parens b/hosts/cnix/xkb/symbols/parens
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/parens
rename to hosts/cnix/xkb/symbols/parens
diff --git a/nixos/hosts/cnix/xkb/symbols/pc b/hosts/cnix/xkb/symbols/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/pc
rename to hosts/cnix/xkb/symbols/pc
diff --git a/nixos/hosts/cnix/xkb/symbols/ph b/hosts/cnix/xkb/symbols/ph
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ph
rename to hosts/cnix/xkb/symbols/ph
diff --git a/nixos/hosts/cnix/xkb/symbols/pk b/hosts/cnix/xkb/symbols/pk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/pk
rename to hosts/cnix/xkb/symbols/pk
diff --git a/nixos/hosts/cnix/xkb/symbols/pl b/hosts/cnix/xkb/symbols/pl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/pl
rename to hosts/cnix/xkb/symbols/pl
diff --git a/nixos/hosts/cnix/xkb/symbols/pt b/hosts/cnix/xkb/symbols/pt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/pt
rename to hosts/cnix/xkb/symbols/pt
diff --git a/nixos/hosts/cnix/xkb/symbols/ro b/hosts/cnix/xkb/symbols/ro
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ro
rename to hosts/cnix/xkb/symbols/ro
diff --git a/nixos/hosts/cnix/xkb/symbols/rs b/hosts/cnix/xkb/symbols/rs
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/rs
rename to hosts/cnix/xkb/symbols/rs
diff --git a/nixos/hosts/cnix/xkb/symbols/ru b/hosts/cnix/xkb/symbols/ru
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ru
rename to hosts/cnix/xkb/symbols/ru
diff --git a/nixos/hosts/cnix/xkb/symbols/rupeesign b/hosts/cnix/xkb/symbols/rupeesign
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/rupeesign
rename to hosts/cnix/xkb/symbols/rupeesign
diff --git a/nixos/hosts/cnix/xkb/symbols/scrolllock b/hosts/cnix/xkb/symbols/scrolllock
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/scrolllock
rename to hosts/cnix/xkb/symbols/scrolllock
diff --git a/nixos/hosts/cnix/xkb/symbols/se b/hosts/cnix/xkb/symbols/se
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/se
rename to hosts/cnix/xkb/symbols/se
diff --git a/nixos/hosts/cnix/xkb/symbols/sgi_vndr/jp b/hosts/cnix/xkb/symbols/sgi_vndr/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sgi_vndr/jp
rename to hosts/cnix/xkb/symbols/sgi_vndr/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/sharp_vndr/sl-c3x00 b/hosts/cnix/xkb/symbols/sharp_vndr/sl-c3x00
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sharp_vndr/sl-c3x00
rename to hosts/cnix/xkb/symbols/sharp_vndr/sl-c3x00
diff --git a/nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws003sh b/hosts/cnix/xkb/symbols/sharp_vndr/ws003sh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws003sh
rename to hosts/cnix/xkb/symbols/sharp_vndr/ws003sh
diff --git a/nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws007sh b/hosts/cnix/xkb/symbols/sharp_vndr/ws007sh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws007sh
rename to hosts/cnix/xkb/symbols/sharp_vndr/ws007sh
diff --git a/nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws011sh b/hosts/cnix/xkb/symbols/sharp_vndr/ws011sh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws011sh
rename to hosts/cnix/xkb/symbols/sharp_vndr/ws011sh
diff --git a/nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws020sh b/hosts/cnix/xkb/symbols/sharp_vndr/ws020sh
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sharp_vndr/ws020sh
rename to hosts/cnix/xkb/symbols/sharp_vndr/ws020sh
diff --git a/nixos/hosts/cnix/xkb/symbols/shift b/hosts/cnix/xkb/symbols/shift
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/shift
rename to hosts/cnix/xkb/symbols/shift
diff --git a/nixos/hosts/cnix/xkb/symbols/si b/hosts/cnix/xkb/symbols/si
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/si
rename to hosts/cnix/xkb/symbols/si
diff --git a/nixos/hosts/cnix/xkb/symbols/sk b/hosts/cnix/xkb/symbols/sk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sk
rename to hosts/cnix/xkb/symbols/sk
diff --git a/nixos/hosts/cnix/xkb/symbols/sn b/hosts/cnix/xkb/symbols/sn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sn
rename to hosts/cnix/xkb/symbols/sn
diff --git a/nixos/hosts/cnix/xkb/symbols/sony_vndr/us b/hosts/cnix/xkb/symbols/sony_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sony_vndr/us
rename to hosts/cnix/xkb/symbols/sony_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/srvr_ctrl b/hosts/cnix/xkb/symbols/srvr_ctrl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/srvr_ctrl
rename to hosts/cnix/xkb/symbols/srvr_ctrl
diff --git a/nixos/hosts/cnix/xkb/symbols/srvrkeys b/hosts/cnix/xkb/symbols/srvrkeys
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/srvrkeys
rename to hosts/cnix/xkb/symbols/srvrkeys
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ara b/hosts/cnix/xkb/symbols/sun_vndr/ara
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ara
rename to hosts/cnix/xkb/symbols/sun_vndr/ara
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/be b/hosts/cnix/xkb/symbols/sun_vndr/be
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/be
rename to hosts/cnix/xkb/symbols/sun_vndr/be
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/br b/hosts/cnix/xkb/symbols/sun_vndr/br
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/br
rename to hosts/cnix/xkb/symbols/sun_vndr/br
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ca b/hosts/cnix/xkb/symbols/sun_vndr/ca
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ca
rename to hosts/cnix/xkb/symbols/sun_vndr/ca
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ch b/hosts/cnix/xkb/symbols/sun_vndr/ch
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ch
rename to hosts/cnix/xkb/symbols/sun_vndr/ch
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/cz b/hosts/cnix/xkb/symbols/sun_vndr/cz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/cz
rename to hosts/cnix/xkb/symbols/sun_vndr/cz
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/de b/hosts/cnix/xkb/symbols/sun_vndr/de
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/de
rename to hosts/cnix/xkb/symbols/sun_vndr/de
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/dk b/hosts/cnix/xkb/symbols/sun_vndr/dk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/dk
rename to hosts/cnix/xkb/symbols/sun_vndr/dk
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ee b/hosts/cnix/xkb/symbols/sun_vndr/ee
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ee
rename to hosts/cnix/xkb/symbols/sun_vndr/ee
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/es b/hosts/cnix/xkb/symbols/sun_vndr/es
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/es
rename to hosts/cnix/xkb/symbols/sun_vndr/es
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/fi b/hosts/cnix/xkb/symbols/sun_vndr/fi
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/fi
rename to hosts/cnix/xkb/symbols/sun_vndr/fi
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/fr b/hosts/cnix/xkb/symbols/sun_vndr/fr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/fr
rename to hosts/cnix/xkb/symbols/sun_vndr/fr
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/gb b/hosts/cnix/xkb/symbols/sun_vndr/gb
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/gb
rename to hosts/cnix/xkb/symbols/sun_vndr/gb
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/gr b/hosts/cnix/xkb/symbols/sun_vndr/gr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/gr
rename to hosts/cnix/xkb/symbols/sun_vndr/gr
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/it b/hosts/cnix/xkb/symbols/sun_vndr/it
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/it
rename to hosts/cnix/xkb/symbols/sun_vndr/it
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/jp b/hosts/cnix/xkb/symbols/sun_vndr/jp
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/jp
rename to hosts/cnix/xkb/symbols/sun_vndr/jp
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/kr b/hosts/cnix/xkb/symbols/sun_vndr/kr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/kr
rename to hosts/cnix/xkb/symbols/sun_vndr/kr
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/lt b/hosts/cnix/xkb/symbols/sun_vndr/lt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/lt
rename to hosts/cnix/xkb/symbols/sun_vndr/lt
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/lv b/hosts/cnix/xkb/symbols/sun_vndr/lv
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/lv
rename to hosts/cnix/xkb/symbols/sun_vndr/lv
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/nl b/hosts/cnix/xkb/symbols/sun_vndr/nl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/nl
rename to hosts/cnix/xkb/symbols/sun_vndr/nl
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/no b/hosts/cnix/xkb/symbols/sun_vndr/no
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/no
rename to hosts/cnix/xkb/symbols/sun_vndr/no
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/pl b/hosts/cnix/xkb/symbols/sun_vndr/pl
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/pl
rename to hosts/cnix/xkb/symbols/sun_vndr/pl
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/pt b/hosts/cnix/xkb/symbols/sun_vndr/pt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/pt
rename to hosts/cnix/xkb/symbols/sun_vndr/pt
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ro b/hosts/cnix/xkb/symbols/sun_vndr/ro
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ro
rename to hosts/cnix/xkb/symbols/sun_vndr/ro
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ru b/hosts/cnix/xkb/symbols/sun_vndr/ru
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ru
rename to hosts/cnix/xkb/symbols/sun_vndr/ru
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/se b/hosts/cnix/xkb/symbols/sun_vndr/se
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/se
rename to hosts/cnix/xkb/symbols/sun_vndr/se
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/sk b/hosts/cnix/xkb/symbols/sun_vndr/sk
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/sk
rename to hosts/cnix/xkb/symbols/sun_vndr/sk
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/solaris b/hosts/cnix/xkb/symbols/sun_vndr/solaris
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/solaris
rename to hosts/cnix/xkb/symbols/sun_vndr/solaris
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/tr b/hosts/cnix/xkb/symbols/sun_vndr/tr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/tr
rename to hosts/cnix/xkb/symbols/sun_vndr/tr
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/tw b/hosts/cnix/xkb/symbols/sun_vndr/tw
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/tw
rename to hosts/cnix/xkb/symbols/sun_vndr/tw
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/ua b/hosts/cnix/xkb/symbols/sun_vndr/ua
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/ua
rename to hosts/cnix/xkb/symbols/sun_vndr/ua
diff --git a/nixos/hosts/cnix/xkb/symbols/sun_vndr/us b/hosts/cnix/xkb/symbols/sun_vndr/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sun_vndr/us
rename to hosts/cnix/xkb/symbols/sun_vndr/us
diff --git a/nixos/hosts/cnix/xkb/symbols/sy b/hosts/cnix/xkb/symbols/sy
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/sy
rename to hosts/cnix/xkb/symbols/sy
diff --git a/nixos/hosts/cnix/xkb/symbols/terminate b/hosts/cnix/xkb/symbols/terminate
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/terminate
rename to hosts/cnix/xkb/symbols/terminate
diff --git a/nixos/hosts/cnix/xkb/symbols/tg b/hosts/cnix/xkb/symbols/tg
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tg
rename to hosts/cnix/xkb/symbols/tg
diff --git a/nixos/hosts/cnix/xkb/symbols/th b/hosts/cnix/xkb/symbols/th
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/th
rename to hosts/cnix/xkb/symbols/th
diff --git a/nixos/hosts/cnix/xkb/symbols/tj b/hosts/cnix/xkb/symbols/tj
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tj
rename to hosts/cnix/xkb/symbols/tj
diff --git a/nixos/hosts/cnix/xkb/symbols/tm b/hosts/cnix/xkb/symbols/tm
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tm
rename to hosts/cnix/xkb/symbols/tm
diff --git a/nixos/hosts/cnix/xkb/symbols/tr b/hosts/cnix/xkb/symbols/tr
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tr
rename to hosts/cnix/xkb/symbols/tr
diff --git a/nixos/hosts/cnix/xkb/symbols/trans b/hosts/cnix/xkb/symbols/trans
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/trans
rename to hosts/cnix/xkb/symbols/trans
diff --git a/nixos/hosts/cnix/xkb/symbols/tw b/hosts/cnix/xkb/symbols/tw
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tw
rename to hosts/cnix/xkb/symbols/tw
diff --git a/nixos/hosts/cnix/xkb/symbols/typo b/hosts/cnix/xkb/symbols/typo
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/typo
rename to hosts/cnix/xkb/symbols/typo
diff --git a/nixos/hosts/cnix/xkb/symbols/tz b/hosts/cnix/xkb/symbols/tz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/tz
rename to hosts/cnix/xkb/symbols/tz
diff --git a/nixos/hosts/cnix/xkb/symbols/ua b/hosts/cnix/xkb/symbols/ua
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/ua
rename to hosts/cnix/xkb/symbols/ua
diff --git a/nixos/hosts/cnix/xkb/symbols/us b/hosts/cnix/xkb/symbols/us
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/us
rename to hosts/cnix/xkb/symbols/us
diff --git a/nixos/hosts/cnix/xkb/symbols/uz b/hosts/cnix/xkb/symbols/uz
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/uz
rename to hosts/cnix/xkb/symbols/uz
diff --git a/nixos/hosts/cnix/xkb/symbols/vn b/hosts/cnix/xkb/symbols/vn
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/vn
rename to hosts/cnix/xkb/symbols/vn
diff --git a/nixos/hosts/cnix/xkb/symbols/xfree68_vndr/amiga b/hosts/cnix/xkb/symbols/xfree68_vndr/amiga
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/xfree68_vndr/amiga
rename to hosts/cnix/xkb/symbols/xfree68_vndr/amiga
diff --git a/nixos/hosts/cnix/xkb/symbols/xfree68_vndr/ataritt b/hosts/cnix/xkb/symbols/xfree68_vndr/ataritt
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/xfree68_vndr/ataritt
rename to hosts/cnix/xkb/symbols/xfree68_vndr/ataritt
diff --git a/nixos/hosts/cnix/xkb/symbols/za b/hosts/cnix/xkb/symbols/za
similarity index 100%
rename from nixos/hosts/cnix/xkb/symbols/za
rename to hosts/cnix/xkb/symbols/za
diff --git a/nixos/hosts/cnix/xkb/types/README b/hosts/cnix/xkb/types/README
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/README
rename to hosts/cnix/xkb/types/README
diff --git a/nixos/hosts/cnix/xkb/types/basic b/hosts/cnix/xkb/types/basic
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/basic
rename to hosts/cnix/xkb/types/basic
diff --git a/nixos/hosts/cnix/xkb/types/cancel b/hosts/cnix/xkb/types/cancel
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/cancel
rename to hosts/cnix/xkb/types/cancel
diff --git a/nixos/hosts/cnix/xkb/types/caps b/hosts/cnix/xkb/types/caps
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/caps
rename to hosts/cnix/xkb/types/caps
diff --git a/nixos/hosts/cnix/xkb/types/complete b/hosts/cnix/xkb/types/complete
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/complete
rename to hosts/cnix/xkb/types/complete
diff --git a/nixos/hosts/cnix/xkb/types/default b/hosts/cnix/xkb/types/default
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/default
rename to hosts/cnix/xkb/types/default
diff --git a/nixos/hosts/cnix/xkb/types/extra b/hosts/cnix/xkb/types/extra
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/extra
rename to hosts/cnix/xkb/types/extra
diff --git a/nixos/hosts/cnix/xkb/types/iso9995 b/hosts/cnix/xkb/types/iso9995
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/iso9995
rename to hosts/cnix/xkb/types/iso9995
diff --git a/nixos/hosts/cnix/xkb/types/level5 b/hosts/cnix/xkb/types/level5
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/level5
rename to hosts/cnix/xkb/types/level5
diff --git a/nixos/hosts/cnix/xkb/types/mousekeys b/hosts/cnix/xkb/types/mousekeys
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/mousekeys
rename to hosts/cnix/xkb/types/mousekeys
diff --git a/nixos/hosts/cnix/xkb/types/numpad b/hosts/cnix/xkb/types/numpad
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/numpad
rename to hosts/cnix/xkb/types/numpad
diff --git a/nixos/hosts/cnix/xkb/types/pc b/hosts/cnix/xkb/types/pc
similarity index 100%
rename from nixos/hosts/cnix/xkb/types/pc
rename to hosts/cnix/xkb/types/pc
diff --git a/nixos/hosts/default.nix b/hosts/default.nix
similarity index 62%
rename from nixos/hosts/default.nix
rename to hosts/default.nix
index f089fc9f..a07f8fc1 100644
--- a/nixos/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,10 +7,10 @@
   flake.nixosConfigurations = let
     # shorten paths
     inherit (inputs.nixpkgs.lib) nixosSystem;
-    mod = "${self}/nixos";
+    mod = "${self}/sys";
 
     # get the basic config to build on top of
-    inherit (import "${self}/nixos") adampad cnix toothpc;
+    inherit (import "${self}/sys") adampad cnix toothpc;
 
     # get these into the module system
     specialArgs = {inherit inputs self;};
@@ -21,18 +21,15 @@
         cnix
         ++ [
           ./cnix
-          "${mod}/system/boot/lanzaboote.nix"
-          "${mod}/system/var/network/cnix.nix"
-
-          "${mod}/srv/blueman"
-
-          "${mod}/opt/gaming.nix"
-          "${mod}/opt/android"
-          "${mod}/opt/workstation"
+          "${mod}/opt/boot/lanzaboote.nix"
+          "${mod}/opt/hardware/cnix.nix"
+          "${mod}/opt/network/cnix.nix"
+          "${mod}/opt/nh/cnix.nix"
+          "${mod}/opt/xserver/cnix.nix"
           {
             home-manager = {
               users.cnst.imports = homeImports."cnst@cnix";
-              optSpecialArgs = specialArgs;
+              extraSpecialArgs = specialArgs;
             };
           }
 
@@ -46,14 +43,15 @@
         toothpc
         ++ [
           ./toothpc
-          "${mod}/system/boot/lanzaboote.nix"
-          "${mod}/system/var/network/toothpc.nix"
-
-          "${mod}/opt/gaming.nix"
+          "${mod}/opt/boot/lanzaboote.nix"
+          "${mod}/opt/hardware/toothpc.nix"
+          "${mod}/opt/network/toothpc.nix"
+          "${mod}/opt/nh/toothpc.nix"
+          "${mod}/opt/xserver/toothpc.nix"
           {
             home-manager = {
               users.toothpick.imports = homeImports."toothpick@toothpc";
-              optSpecialArgs = specialArgs;
+              extraSpecialArgs = specialArgs;
             };
           }
 
@@ -67,16 +65,15 @@
         adampad
         ++ [
           ./adampad
-          "${mod}/system/boot/boot.nix"
-          "${mod}/system/var/network/adampad.nix"
-
-          "${mod}/srv/blueman"
-
-          "${mod}/opt/android"
+          "${mod}/opt/boot/boot.nix"
+          "${mod}/opt/hardware/adampad.nix"
+          "${mod}/opt/network/adampad.nix"
+          "${mod}/opt/nh/adampad.nix"
+          "${mod}/opt/xserver/adampad.nix"
           {
             home-manager = {
               users.adam.imports = homeImports."adam@adampad";
-              optSpecialArgs = specialArgs;
+              extraSpecialArgs = specialArgs;
             };
           }
 
diff --git a/nixos/hosts/toothpc/default.nix b/hosts/toothpc/default.nix
similarity index 100%
rename from nixos/hosts/toothpc/default.nix
rename to hosts/toothpc/default.nix
diff --git a/nixos/hosts/toothpc/hardware-configuration.nix b/hosts/toothpc/hardware-configuration.nix
similarity index 100%
rename from nixos/hosts/toothpc/hardware-configuration.nix
rename to hosts/toothpc/hardware-configuration.nix
diff --git a/nixos/default.nix b/nixos/default.nix
deleted file mode 100644
index 855e623f..00000000
--- a/nixos/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-let
-  shared = [
-    ./system
-
-    ./locale
-
-    ./srv/audio
-    ./srv/greetd
-    ./srv/gnome-keyring
-    ./srv/gvfs
-    ./srv/locate
-    ./srv/mullvad
-    ./srv/openssh
-    ./srv/power
-    ./srv/samba
-    ./srv/udisks
-    ./srv/fwupd
-  ];
-
-  adampad =
-    shared
-    ++ [
-      ./system/var/nh/adampad.nix
-      ./srv/xserver/adampad.nix
-      ./hardware/adampad.nix
-    ];
-  cnix =
-    shared
-    ++ [
-      ./system/var/nh/cnix.nix
-      ./srv/xserver/cnix.nix
-      ./hardware/cnix.nix
-    ];
-  toothpc =
-    shared
-    ++ [
-      ./system/var/nh/toothpc.nix
-      ./srv/xserver/toothpc.nix
-      ./hardware/toothpc.nix
-    ];
-in {
-  inherit shared adampad cnix toothpc;
-}
diff --git a/nixos/system/default.nix b/nixos/system/default.nix
deleted file mode 100644
index 4a3847ec..00000000
--- a/nixos/system/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./etc
-    ./shell/sh
-  ];
-
-  console.useXkbConfig = true;
-  environment.systemPackages = with pkgs; [
-    anyrun
-  ];
-}
diff --git a/nixos/pkgs/bibata-hyprcursor/configure.py b/pkgs/bibata-hyprcursor/configure.py
similarity index 100%
rename from nixos/pkgs/bibata-hyprcursor/configure.py
rename to pkgs/bibata-hyprcursor/configure.py
diff --git a/nixos/pkgs/bibata-hyprcursor/default.nix b/pkgs/bibata-hyprcursor/default.nix
similarity index 100%
rename from nixos/pkgs/bibata-hyprcursor/default.nix
rename to pkgs/bibata-hyprcursor/default.nix
diff --git a/nixos/pkgs/default.nix b/pkgs/default.nix
similarity index 100%
rename from nixos/pkgs/default.nix
rename to pkgs/default.nix
diff --git a/nixos/pkgs/wl-ocr/default.nix b/pkgs/wl-ocr/default.nix
similarity index 100%
rename from nixos/pkgs/wl-ocr/default.nix
rename to pkgs/wl-ocr/default.nix
diff --git a/nixos/opt/android/default.nix b/sys/bin/android/default.nix
similarity index 100%
rename from nixos/opt/android/default.nix
rename to sys/bin/android/default.nix
diff --git a/sys/bin/anyrun/default.nix b/sys/bin/anyrun/default.nix
new file mode 100644
index 00000000..5e576449
--- /dev/null
+++ b/sys/bin/anyrun/default.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.anyrun
+  ];
+}
diff --git a/nixos/opt/bottles/default.nix b/sys/bin/bottles/default.nix
similarity index 100%
rename from nixos/opt/bottles/default.nix
rename to sys/bin/bottles/default.nix
diff --git a/nixos/opt/corectrl/default.nix b/sys/bin/corectrl/default.nix
similarity index 100%
rename from nixos/opt/corectrl/default.nix
rename to sys/bin/corectrl/default.nix
diff --git a/sys/bin/default.nix b/sys/bin/default.nix
new file mode 100644
index 00000000..33d7f262
--- /dev/null
+++ b/sys/bin/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./anyrun
+    ./hyprland
+  ];
+}
diff --git a/nixos/opt/gamemode/default.nix b/sys/bin/gamemode/default.nix
similarity index 100%
rename from nixos/opt/gamemode/default.nix
rename to sys/bin/gamemode/default.nix
diff --git a/nixos/opt/gamescope/default.nix b/sys/bin/gamescope/default.nix
similarity index 100%
rename from nixos/opt/gamescope/default.nix
rename to sys/bin/gamescope/default.nix
diff --git a/nixos/opt/gaming.nix b/sys/bin/gaming.nix
similarity index 95%
rename from nixos/opt/gaming.nix
rename to sys/bin/gaming.nix
index a0adad67..514a3b93 100644
--- a/nixos/opt/gaming.nix
+++ b/sys/bin/gaming.nix
@@ -2,7 +2,7 @@
   imports = [
     ./steam
     ./lutris
-    ./bottles
+    # ./bottles
     ./gamemode
     ./gamescope
     ./corectrl
diff --git a/nixos/opt/workstation/default.nix b/sys/bin/gimp/default.nix
similarity index 75%
rename from nixos/opt/workstation/default.nix
rename to sys/bin/gimp/default.nix
index 3f9d79f3..0bb26949 100644
--- a/nixos/opt/workstation/default.nix
+++ b/sys/bin/gimp/default.nix
@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     gimp-with-plugins
-    inkscape-with-extensions
   ];
 }
diff --git a/nixos/opt/gnome/default.nix b/sys/bin/gnome/default.nix
similarity index 100%
rename from nixos/opt/gnome/default.nix
rename to sys/bin/gnome/default.nix
diff --git a/nixos/system/etc/hyprland/default.nix b/sys/bin/hyprland/default.nix
similarity index 100%
rename from nixos/system/etc/hyprland/default.nix
rename to sys/bin/hyprland/default.nix
diff --git a/sys/bin/inkscape/default.nix b/sys/bin/inkscape/default.nix
new file mode 100644
index 00000000..0bb26949
--- /dev/null
+++ b/sys/bin/inkscape/default.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    gimp-with-plugins
+  ];
+}
diff --git a/nixos/opt/lutris/default.nix b/sys/bin/lutris/default.nix
similarity index 100%
rename from nixos/opt/lutris/default.nix
rename to sys/bin/lutris/default.nix
diff --git a/nixos/opt/steam/default.nix b/sys/bin/steam/default.nix
similarity index 100%
rename from nixos/opt/steam/default.nix
rename to sys/bin/steam/default.nix
diff --git a/sys/default.nix b/sys/default.nix
new file mode 100644
index 00000000..b63fe017
--- /dev/null
+++ b/sys/default.nix
@@ -0,0 +1,31 @@
+let
+  shared = [
+    ./nixos
+    ./etc
+    ./bin
+    ./srv
+  ];
+
+  adampad =
+    shared
+    ++ [
+      ./bin/android
+      ./srv/blueman
+    ];
+  cnix =
+    shared
+    ++ [
+      ./bin/gaming.nix
+      ./bin/android
+      ./bin/gimp
+      ./bin/inkscape
+      ./srv/blueman
+    ];
+  toothpc =
+    shared
+    ++ [
+      ./bin/gaming.nix
+    ];
+in {
+  inherit shared adampad cnix toothpc;
+}
diff --git a/nixos/system/shell/dev.nix b/sys/dev/dev.nix
similarity index 100%
rename from nixos/system/shell/dev.nix
rename to sys/dev/dev.nix
diff --git a/nixos/system/etc/dconf/default.nix b/sys/etc/dconf/default.nix
similarity index 100%
rename from nixos/system/etc/dconf/default.nix
rename to sys/etc/dconf/default.nix
diff --git a/sys/etc/default.nix b/sys/etc/default.nix
new file mode 100644
index 00000000..67c51708
--- /dev/null
+++ b/sys/etc/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./dconf
+    ./fonts
+    ./locale
+    # ./nix-ld
+    ./security
+    ./xdg
+    ./zsh
+  ];
+}
diff --git a/nixos/system/etc/fonts/default.nix b/sys/etc/fonts/default.nix
similarity index 100%
rename from nixos/system/etc/fonts/default.nix
rename to sys/etc/fonts/default.nix
diff --git a/nixos/locale/default.nix b/sys/etc/locale/default.nix
similarity index 100%
rename from nixos/locale/default.nix
rename to sys/etc/locale/default.nix
diff --git a/nixos/opt/nix-ld/default.nix b/sys/etc/nix-ld/default.nix
similarity index 100%
rename from nixos/opt/nix-ld/default.nix
rename to sys/etc/nix-ld/default.nix
diff --git a/nixos/system/etc/security/default.nix b/sys/etc/security/default.nix
similarity index 100%
rename from nixos/system/etc/security/default.nix
rename to sys/etc/security/default.nix
diff --git a/nixos/system/etc/xdg/default.nix b/sys/etc/xdg/default.nix
similarity index 100%
rename from nixos/system/etc/xdg/default.nix
rename to sys/etc/xdg/default.nix
diff --git a/nixos/system/shell/sh/default.nix b/sys/etc/zsh/default.nix
similarity index 100%
rename from nixos/system/shell/sh/default.nix
rename to sys/etc/zsh/default.nix
diff --git a/nixos/system/etc/default.nix b/sys/nixos/default.nix
similarity index 93%
rename from nixos/system/etc/default.nix
rename to sys/nixos/default.nix
index caa1a98e..dad3e7cb 100644
--- a/nixos/system/etc/default.nix
+++ b/sys/nixos/default.nix
@@ -6,14 +6,9 @@
   ...
 }: {
   imports = [
-    ./dconf
-    ./fonts
-    ./hyprland
     ./nixpkgs
-    ./security
     ./home-manager
     ./substituters
-    ./xdg
   ];
 
   environment = {
diff --git a/nixos/system/etc/home-manager/default.nix b/sys/nixos/home-manager/default.nix
similarity index 100%
rename from nixos/system/etc/home-manager/default.nix
rename to sys/nixos/home-manager/default.nix
diff --git a/nixos/system/etc/nixpkgs/default.nix b/sys/nixos/nixpkgs/default.nix
similarity index 100%
rename from nixos/system/etc/nixpkgs/default.nix
rename to sys/nixos/nixpkgs/default.nix
diff --git a/nixos/system/etc/substituters/default.nix b/sys/nixos/substituters/default.nix
similarity index 100%
rename from nixos/system/etc/substituters/default.nix
rename to sys/nixos/substituters/default.nix
diff --git a/nixos/system/boot/boot.nix b/sys/opt/boot/boot.nix
similarity index 100%
rename from nixos/system/boot/boot.nix
rename to sys/opt/boot/boot.nix
diff --git a/nixos/system/boot/lanzaboote.nix b/sys/opt/boot/lanzaboote.nix
similarity index 100%
rename from nixos/system/boot/lanzaboote.nix
rename to sys/opt/boot/lanzaboote.nix
diff --git a/nixos/hardware/adampad.nix b/sys/opt/hardware/adampad.nix
similarity index 100%
rename from nixos/hardware/adampad.nix
rename to sys/opt/hardware/adampad.nix
diff --git a/nixos/hardware/cnix.nix b/sys/opt/hardware/cnix.nix
similarity index 100%
rename from nixos/hardware/cnix.nix
rename to sys/opt/hardware/cnix.nix
diff --git a/nixos/hardware/toothpc.nix b/sys/opt/hardware/toothpc.nix
similarity index 100%
rename from nixos/hardware/toothpc.nix
rename to sys/opt/hardware/toothpc.nix
diff --git a/nixos/system/var/network/adampad.nix b/sys/opt/network/adampad.nix
similarity index 100%
rename from nixos/system/var/network/adampad.nix
rename to sys/opt/network/adampad.nix
diff --git a/nixos/system/var/network/cnix.nix b/sys/opt/network/cnix.nix
similarity index 100%
rename from nixos/system/var/network/cnix.nix
rename to sys/opt/network/cnix.nix
diff --git a/nixos/system/var/network/toothpc.nix b/sys/opt/network/toothpc.nix
similarity index 100%
rename from nixos/system/var/network/toothpc.nix
rename to sys/opt/network/toothpc.nix
diff --git a/nixos/system/var/nh/adampad.nix b/sys/opt/nh/adampad.nix
similarity index 100%
rename from nixos/system/var/nh/adampad.nix
rename to sys/opt/nh/adampad.nix
diff --git a/nixos/system/var/nh/cnix.nix b/sys/opt/nh/cnix.nix
similarity index 100%
rename from nixos/system/var/nh/cnix.nix
rename to sys/opt/nh/cnix.nix
diff --git a/nixos/system/var/nh/toothpc.nix b/sys/opt/nh/toothpc.nix
similarity index 100%
rename from nixos/system/var/nh/toothpc.nix
rename to sys/opt/nh/toothpc.nix
diff --git a/nixos/srv/xserver/adampad.nix b/sys/opt/xserver/adampad.nix
similarity index 100%
rename from nixos/srv/xserver/adampad.nix
rename to sys/opt/xserver/adampad.nix
diff --git a/nixos/srv/xserver/cnix.nix b/sys/opt/xserver/cnix.nix
similarity index 100%
rename from nixos/srv/xserver/cnix.nix
rename to sys/opt/xserver/cnix.nix
diff --git a/nixos/srv/xserver/toothpc.nix b/sys/opt/xserver/toothpc.nix
similarity index 100%
rename from nixos/srv/xserver/toothpc.nix
rename to sys/opt/xserver/toothpc.nix
diff --git a/nixos/srv/audio/default.nix b/sys/srv/audio/default.nix
similarity index 100%
rename from nixos/srv/audio/default.nix
rename to sys/srv/audio/default.nix
diff --git a/nixos/srv/blueman/default.nix b/sys/srv/blueman/default.nix
similarity index 100%
rename from nixos/srv/blueman/default.nix
rename to sys/srv/blueman/default.nix
diff --git a/nixos/srv/dbus/default.nix b/sys/srv/dbus/default.nix
similarity index 100%
rename from nixos/srv/dbus/default.nix
rename to sys/srv/dbus/default.nix
diff --git a/sys/srv/default.nix b/sys/srv/default.nix
new file mode 100644
index 00000000..bebb709d
--- /dev/null
+++ b/sys/srv/default.nix
@@ -0,0 +1,16 @@
+{
+  imports = [
+    ./audio
+    ./dbus
+    ./fwupd
+    ./gnome-keyring
+    ./greetd
+    ./gvfs
+    ./locate
+    ./mullvad
+    ./openssh
+    ./power
+    ./samba
+    ./udisks
+  ];
+}
diff --git a/nixos/srv/fwupd/default.nix b/sys/srv/fwupd/default.nix
similarity index 100%
rename from nixos/srv/fwupd/default.nix
rename to sys/srv/fwupd/default.nix
diff --git a/nixos/srv/gnome-keyring/default.nix b/sys/srv/gnome-keyring/default.nix
similarity index 100%
rename from nixos/srv/gnome-keyring/default.nix
rename to sys/srv/gnome-keyring/default.nix
diff --git a/nixos/srv/greetd/default.nix b/sys/srv/greetd/default.nix
similarity index 100%
rename from nixos/srv/greetd/default.nix
rename to sys/srv/greetd/default.nix
diff --git a/nixos/srv/gvfs/default.nix b/sys/srv/gvfs/default.nix
similarity index 100%
rename from nixos/srv/gvfs/default.nix
rename to sys/srv/gvfs/default.nix
diff --git a/nixos/srv/locate/default.nix b/sys/srv/locate/default.nix
similarity index 100%
rename from nixos/srv/locate/default.nix
rename to sys/srv/locate/default.nix
diff --git a/nixos/srv/mullvad/default.nix b/sys/srv/mullvad/default.nix
similarity index 100%
rename from nixos/srv/mullvad/default.nix
rename to sys/srv/mullvad/default.nix
diff --git a/nixos/srv/openssh/default.nix b/sys/srv/openssh/default.nix
similarity index 100%
rename from nixos/srv/openssh/default.nix
rename to sys/srv/openssh/default.nix
diff --git a/nixos/srv/power/default.nix b/sys/srv/power/default.nix
similarity index 100%
rename from nixos/srv/power/default.nix
rename to sys/srv/power/default.nix
diff --git a/nixos/srv/samba/default.nix b/sys/srv/samba/default.nix
similarity index 100%
rename from nixos/srv/samba/default.nix
rename to sys/srv/samba/default.nix
diff --git a/nixos/srv/udisks/default.nix b/sys/srv/udisks/default.nix
similarity index 100%
rename from nixos/srv/udisks/default.nix
rename to sys/srv/udisks/default.nix