diff --git a/nixos/desktopish/README.md b/nixos/gui/desktopish/README.md
similarity index 100%
rename from nixos/desktopish/README.md
rename to nixos/gui/desktopish/README.md
diff --git a/nixos/desktopish/autolock.nix b/nixos/gui/desktopish/autolock.nix
similarity index 100%
rename from nixos/desktopish/autolock.nix
rename to nixos/gui/desktopish/autolock.nix
diff --git a/nixos/desktopish/default.nix b/nixos/gui/desktopish/default.nix
similarity index 100%
rename from nixos/desktopish/default.nix
rename to nixos/gui/desktopish/default.nix
diff --git a/nixos/desktopish/fonts.nix b/nixos/gui/desktopish/fonts.nix
similarity index 100%
rename from nixos/desktopish/fonts.nix
rename to nixos/gui/desktopish/fonts.nix
diff --git a/nixos/desktopish/gnome-keyring.nix b/nixos/gui/desktopish/gnome-keyring.nix
similarity index 100%
rename from nixos/desktopish/gnome-keyring.nix
rename to nixos/gui/desktopish/gnome-keyring.nix
diff --git a/nixos/desktopish/guiapps.nix b/nixos/gui/desktopish/guiapps.nix
similarity index 100%
rename from nixos/desktopish/guiapps.nix
rename to nixos/gui/desktopish/guiapps.nix
diff --git a/nixos/desktopish/hidpi.nix b/nixos/gui/desktopish/hidpi.nix
similarity index 100%
rename from nixos/desktopish/hidpi.nix
rename to nixos/gui/desktopish/hidpi.nix
diff --git a/nixos/desktopish/hotplug.nix b/nixos/gui/desktopish/hotplug.nix
similarity index 100%
rename from nixos/desktopish/hotplug.nix
rename to nixos/gui/desktopish/hotplug.nix
diff --git a/nixos/desktopish/light-terminal.nix b/nixos/gui/desktopish/light-terminal.nix
similarity index 100%
rename from nixos/desktopish/light-terminal.nix
rename to nixos/gui/desktopish/light-terminal.nix
diff --git a/nixos/monitor-brightness.nix b/nixos/gui/desktopish/monitor-brightness.nix
similarity index 100%
rename from nixos/monitor-brightness.nix
rename to nixos/gui/desktopish/monitor-brightness.nix
diff --git a/nixos/desktopish/polybar b/nixos/gui/desktopish/polybar
similarity index 100%
rename from nixos/desktopish/polybar
rename to nixos/gui/desktopish/polybar
diff --git a/nixos/desktopish/polybar.nix b/nixos/gui/desktopish/polybar.nix
similarity index 100%
rename from nixos/desktopish/polybar.nix
rename to nixos/gui/desktopish/polybar.nix
diff --git a/nixos/desktopish/redshift.nix b/nixos/gui/desktopish/redshift.nix
similarity index 100%
rename from nixos/desktopish/redshift.nix
rename to nixos/gui/desktopish/redshift.nix
diff --git a/nixos/desktopish/screencapture.nix b/nixos/gui/desktopish/screencapture.nix
similarity index 100%
rename from nixos/desktopish/screencapture.nix
rename to nixos/gui/desktopish/screencapture.nix
diff --git a/nixos/desktopish/steam.nix b/nixos/gui/desktopish/steam.nix
similarity index 100%
rename from nixos/desktopish/steam.nix
rename to nixos/gui/desktopish/steam.nix
diff --git a/nixos/desktopish/swap-caps-ctrl.nix b/nixos/gui/desktopish/swap-caps-ctrl.nix
similarity index 100%
rename from nixos/desktopish/swap-caps-ctrl.nix
rename to nixos/gui/desktopish/swap-caps-ctrl.nix
diff --git a/nixos/desktopish/taffybar/default.nix b/nixos/gui/desktopish/taffybar/default.nix
similarity index 100%
rename from nixos/desktopish/taffybar/default.nix
rename to nixos/gui/desktopish/taffybar/default.nix
diff --git a/nixos/desktopish/taffybar/taffybar-srid/.gitignore b/nixos/gui/desktopish/taffybar/taffybar-srid/.gitignore
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/.gitignore
rename to nixos/gui/desktopish/taffybar/taffybar-srid/.gitignore
diff --git a/nixos/desktopish/taffybar/taffybar-srid/.vscode/extensions.json b/nixos/gui/desktopish/taffybar/taffybar-srid/.vscode/extensions.json
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/.vscode/extensions.json
rename to nixos/gui/desktopish/taffybar/taffybar-srid/.vscode/extensions.json
diff --git a/nixos/desktopish/taffybar/taffybar-srid/.vscode/settings.json b/nixos/gui/desktopish/taffybar/taffybar-srid/.vscode/settings.json
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/.vscode/settings.json
rename to nixos/gui/desktopish/taffybar/taffybar-srid/.vscode/settings.json
diff --git a/nixos/desktopish/taffybar/taffybar-srid/CHANGELOG.md b/nixos/gui/desktopish/taffybar/taffybar-srid/CHANGELOG.md
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/CHANGELOG.md
rename to nixos/gui/desktopish/taffybar/taffybar-srid/CHANGELOG.md
diff --git a/nixos/desktopish/taffybar/taffybar-srid/Main.hs b/nixos/gui/desktopish/taffybar/taffybar-srid/Main.hs
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/Main.hs
rename to nixos/gui/desktopish/taffybar/taffybar-srid/Main.hs
diff --git a/nixos/desktopish/taffybar/taffybar-srid/README.md b/nixos/gui/desktopish/taffybar/taffybar-srid/README.md
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/README.md
rename to nixos/gui/desktopish/taffybar/taffybar-srid/README.md
diff --git a/nixos/desktopish/taffybar/taffybar-srid/Setup.hs b/nixos/gui/desktopish/taffybar/taffybar-srid/Setup.hs
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/Setup.hs
rename to nixos/gui/desktopish/taffybar/taffybar-srid/Setup.hs
diff --git a/nixos/desktopish/taffybar/taffybar-srid/bin/run b/nixos/gui/desktopish/taffybar/taffybar-srid/bin/run
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/bin/run
rename to nixos/gui/desktopish/taffybar/taffybar-srid/bin/run
diff --git a/nixos/desktopish/taffybar/taffybar-srid/default.nix b/nixos/gui/desktopish/taffybar/taffybar-srid/default.nix
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/default.nix
rename to nixos/gui/desktopish/taffybar/taffybar-srid/default.nix
diff --git a/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix b/nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
rename to nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
diff --git a/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json b/nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json
rename to nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json
diff --git a/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix b/nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
rename to nixos/gui/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
diff --git a/nixos/desktopish/taffybar/taffybar-srid/hie.yaml b/nixos/gui/desktopish/taffybar/taffybar-srid/hie.yaml
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/hie.yaml
rename to nixos/gui/desktopish/taffybar/taffybar-srid/hie.yaml
diff --git a/nixos/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal b/nixos/gui/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal
similarity index 100%
rename from nixos/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal
rename to nixos/gui/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal
diff --git a/nixos/desktopish/touchpad-trackpoint.nix b/nixos/gui/desktopish/touchpad-trackpoint.nix
similarity index 100%
rename from nixos/desktopish/touchpad-trackpoint.nix
rename to nixos/gui/desktopish/touchpad-trackpoint.nix
diff --git a/nixos/desktopish/vscode.nix b/nixos/gui/desktopish/vscode.nix
similarity index 100%
rename from nixos/desktopish/vscode.nix
rename to nixos/gui/desktopish/vscode.nix
diff --git a/nixos/desktopish/xmobar/default.nix b/nixos/gui/desktopish/xmobar/default.nix
similarity index 100%
rename from nixos/desktopish/xmobar/default.nix
rename to nixos/gui/desktopish/xmobar/default.nix
diff --git a/nixos/desktopish/xmobar/xmobar-srid/.gitignore b/nixos/gui/desktopish/xmobar/xmobar-srid/.gitignore
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/.gitignore
rename to nixos/gui/desktopish/xmobar/xmobar-srid/.gitignore
diff --git a/nixos/desktopish/xmobar/xmobar-srid/.vscode/extensions.json b/nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/extensions.json
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/.vscode/extensions.json
rename to nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/extensions.json
diff --git a/nixos/desktopish/xmobar/xmobar-srid/.vscode/settings.json b/nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/settings.json
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/.vscode/settings.json
rename to nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/settings.json
diff --git a/nixos/desktopish/xmobar/xmobar-srid/.vscode/tasks.json b/nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/tasks.json
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/.vscode/tasks.json
rename to nixos/gui/desktopish/xmobar/xmobar-srid/.vscode/tasks.json
diff --git a/nixos/desktopish/xmobar/xmobar-srid/CHANGELOG.md b/nixos/gui/desktopish/xmobar/xmobar-srid/CHANGELOG.md
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/CHANGELOG.md
rename to nixos/gui/desktopish/xmobar/xmobar-srid/CHANGELOG.md
diff --git a/nixos/desktopish/xmobar/xmobar-srid/Main.hs b/nixos/gui/desktopish/xmobar/xmobar-srid/Main.hs
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/Main.hs
rename to nixos/gui/desktopish/xmobar/xmobar-srid/Main.hs
diff --git a/nixos/desktopish/xmobar/xmobar-srid/Setup.hs b/nixos/gui/desktopish/xmobar/xmobar-srid/Setup.hs
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/Setup.hs
rename to nixos/gui/desktopish/xmobar/xmobar-srid/Setup.hs
diff --git a/nixos/desktopish/xmobar/xmobar-srid/default.nix b/nixos/gui/desktopish/xmobar/xmobar-srid/default.nix
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/default.nix
rename to nixos/gui/desktopish/xmobar/xmobar-srid/default.nix
diff --git a/nixos/desktopish/xmobar/xmobar-srid/hie.yaml b/nixos/gui/desktopish/xmobar/xmobar-srid/hie.yaml
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/hie.yaml
rename to nixos/gui/desktopish/xmobar/xmobar-srid/hie.yaml
diff --git a/nixos/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal b/nixos/gui/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
similarity index 100%
rename from nixos/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
rename to nixos/gui/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal
diff --git a/nixos/desktopish/xmonad/default.nix b/nixos/gui/desktopish/xmonad/default.nix
similarity index 100%
rename from nixos/desktopish/xmonad/default.nix
rename to nixos/gui/desktopish/xmonad/default.nix
diff --git a/nixos/desktopish/xmonad/xmonad-srid/.gitignore b/nixos/gui/desktopish/xmonad/xmonad-srid/.gitignore
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/.gitignore
rename to nixos/gui/desktopish/xmonad/xmonad-srid/.gitignore
diff --git a/nixos/desktopish/xmonad/xmonad-srid/.vscode/extensions.json b/nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/extensions.json
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/.vscode/extensions.json
rename to nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/extensions.json
diff --git a/nixos/desktopish/xmonad/xmonad-srid/.vscode/settings.json b/nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/settings.json
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/.vscode/settings.json
rename to nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/settings.json
diff --git a/nixos/desktopish/xmonad/xmonad-srid/.vscode/tasks.json b/nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/tasks.json
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/.vscode/tasks.json
rename to nixos/gui/desktopish/xmonad/xmonad-srid/.vscode/tasks.json
diff --git a/nixos/desktopish/xmonad/xmonad-srid/CHANGELOG.md b/nixos/gui/desktopish/xmonad/xmonad-srid/CHANGELOG.md
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/CHANGELOG.md
rename to nixos/gui/desktopish/xmonad/xmonad-srid/CHANGELOG.md
diff --git a/nixos/desktopish/xmonad/xmonad-srid/Main.hs b/nixos/gui/desktopish/xmonad/xmonad-srid/Main.hs
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/Main.hs
rename to nixos/gui/desktopish/xmonad/xmonad-srid/Main.hs
diff --git a/nixos/desktopish/xmonad/xmonad-srid/README.md b/nixos/gui/desktopish/xmonad/xmonad-srid/README.md
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/README.md
rename to nixos/gui/desktopish/xmonad/xmonad-srid/README.md
diff --git a/nixos/desktopish/xmonad/xmonad-srid/Setup.hs b/nixos/gui/desktopish/xmonad/xmonad-srid/Setup.hs
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/Setup.hs
rename to nixos/gui/desktopish/xmonad/xmonad-srid/Setup.hs
diff --git a/nixos/desktopish/xmonad/xmonad-srid/default.nix b/nixos/gui/desktopish/xmonad/xmonad-srid/default.nix
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/default.nix
rename to nixos/gui/desktopish/xmonad/xmonad-srid/default.nix
diff --git a/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix b/nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
rename to nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
diff --git a/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json b/nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json
rename to nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json
diff --git a/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix b/nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
rename to nixos/gui/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
diff --git a/nixos/desktopish/xmonad/xmonad-srid/hie.yaml b/nixos/gui/desktopish/xmonad/xmonad-srid/hie.yaml
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/hie.yaml
rename to nixos/gui/desktopish/xmonad/xmonad-srid/hie.yaml
diff --git a/nixos/desktopish/xmonad/xmonad-srid/overlay.nix b/nixos/gui/desktopish/xmonad/xmonad-srid/overlay.nix
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/overlay.nix
rename to nixos/gui/desktopish/xmonad/xmonad-srid/overlay.nix
diff --git a/nixos/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal b/nixos/gui/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal
similarity index 100%
rename from nixos/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal
rename to nixos/gui/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal
diff --git a/nixos/gnome.nix b/nixos/gui/gnome.nix
similarity index 100%
rename from nixos/gnome.nix
rename to nixos/gui/gnome.nix
diff --git a/nixos/kde.nix b/nixos/gui/kde.nix
similarity index 100%
rename from nixos/kde.nix
rename to nixos/gui/kde.nix
diff --git a/nixos/virtualbox.nix b/nixos/gui/virtualbox.nix
similarity index 100%
rename from nixos/virtualbox.nix
rename to nixos/gui/virtualbox.nix