From 401c51fd35b27fb8ab725f8636dacd7ada4e3da9 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 30 Apr 2022 11:49:28 -0400 Subject: [PATCH] refactor:features -> nixos --- flake.nix | 16 ++++++++-------- {features => nixos}/caches/default.nix | 0 {features => nixos}/caches/iohk.nix | 0 {features => nixos}/caches/oss.nix | 0 {features => nixos}/caches/platonic.nix | 0 {features => nixos}/caches/reflex.nix | 0 {features => nixos}/current-location.nix | 0 {features => nixos}/desktopish/README.md | 0 {features => nixos}/desktopish/autolock.nix | 0 {features => nixos}/desktopish/default.nix | 0 {features => nixos}/desktopish/fonts.nix | 0 {features => nixos}/desktopish/gnome-keyring.nix | 0 {features => nixos}/desktopish/guiapps.nix | 0 {features => nixos}/desktopish/hidpi.nix | 0 {features => nixos}/desktopish/hotplug.nix | 0 .../desktopish/light-terminal.nix | 0 {features => nixos}/desktopish/polybar.nix | 0 {features => nixos}/desktopish/redshift.nix | 0 {features => nixos}/desktopish/screencapture.nix | 0 {features => nixos}/desktopish/steam.nix | 0 .../desktopish/swap-caps-ctrl.nix | 0 .../desktopish/taffybar/default.nix | 0 .../desktopish/taffybar/taffybar-srid/.gitignore | 0 .../taffybar-srid/.vscode/extensions.json | 0 .../taffybar/taffybar-srid/.vscode/settings.json | 0 .../taffybar/taffybar-srid/CHANGELOG.md | 0 .../desktopish/taffybar/taffybar-srid/Main.hs | 0 .../desktopish/taffybar/taffybar-srid/README.md | 0 .../desktopish/taffybar/taffybar-srid/Setup.hs | 0 .../desktopish/taffybar/taffybar-srid/bin/run | 0 .../taffybar/taffybar-srid/default.nix | 0 .../taffybar-srid/dep/gitignoresrc/default.nix | 0 .../taffybar-srid/dep/gitignoresrc/github.json | 0 .../taffybar-srid/dep/gitignoresrc/thunk.nix | 0 .../desktopish/taffybar/taffybar-srid/hie.yaml | 0 .../taffybar/taffybar-srid/taffybar-srid.cabal | 0 .../desktopish/touchpad-trackpoint.nix | 0 {features => nixos}/desktopish/vscode.nix | 0 .../desktopish/xmobar/default.nix | 0 .../desktopish/xmobar/xmobar-srid/.gitignore | 0 .../xmobar/xmobar-srid/.vscode/extensions.json | 0 .../xmobar/xmobar-srid/.vscode/settings.json | 0 .../xmobar/xmobar-srid/.vscode/tasks.json | 0 .../desktopish/xmobar/xmobar-srid/CHANGELOG.md | 0 .../desktopish/xmobar/xmobar-srid/Main.hs | 0 .../desktopish/xmobar/xmobar-srid/Setup.hs | 0 .../desktopish/xmobar/xmobar-srid/default.nix | 0 .../desktopish/xmobar/xmobar-srid/hie.yaml | 0 .../xmobar/xmobar-srid/xmobar-srid.cabal | 0 .../desktopish/xmonad/default.nix | 0 .../desktopish/xmonad/xmonad-srid/.gitignore | 0 .../xmonad/xmonad-srid/.vscode/extensions.json | 0 .../xmonad/xmonad-srid/.vscode/settings.json | 0 .../xmonad/xmonad-srid/.vscode/tasks.json | 0 .../desktopish/xmonad/xmonad-srid/CHANGELOG.md | 0 .../desktopish/xmonad/xmonad-srid/Main.hs | 0 .../desktopish/xmonad/xmonad-srid/README.md | 0 .../desktopish/xmonad/xmonad-srid/Setup.hs | 0 .../desktopish/xmonad/xmonad-srid/default.nix | 0 .../xmonad-srid/dep/gitignoresrc/default.nix | 0 .../xmonad-srid/dep/gitignoresrc/github.json | 0 .../xmonad-srid/dep/gitignoresrc/thunk.nix | 0 .../desktopish/xmonad/xmonad-srid/hie.yaml | 0 .../desktopish/xmonad/xmonad-srid/overlay.nix | 0 .../xmonad/xmonad-srid/xmonad-srid.cabal | 0 {features => nixos}/distributed-build.nix | 0 {features => nixos}/docker.nix | 0 {features => nixos}/ema/emanote.nix | 0 {features => nixos}/email/default.nix | 0 {features => nixos}/email/protonmail-bridge.nix | 0 {features => nixos}/gnome.nix | 0 {features => nixos}/hercules.nix | 0 {features => nixos}/kde.nix | 0 {features => nixos}/lxd.nix | 0 {features => nixos}/monitor-brightness.nix | 0 {features => nixos}/passwordstore.nix | 0 {features => nixos}/postgres.nix | 0 {features => nixos}/postgrest.nix | 0 {features => nixos}/protonvpn.nix | 0 {features => nixos}/self-ide.nix | 0 {features => nixos}/server/devserver.nix | 0 {features => nixos}/server/harden.nix | 0 {features => nixos}/server/unlaptop.nix | 0 {features => nixos}/server/wakeonlan.nix | 0 {features => nixos}/takemessh/default.nix | 0 {features => nixos}/takemessh/id_rsa.pub | 0 {features => nixos}/virtualbox.nix | 0 87 files changed, 8 insertions(+), 8 deletions(-) rename {features => nixos}/caches/default.nix (100%) rename {features => nixos}/caches/iohk.nix (100%) rename {features => nixos}/caches/oss.nix (100%) rename {features => nixos}/caches/platonic.nix (100%) rename {features => nixos}/caches/reflex.nix (100%) rename {features => nixos}/current-location.nix (100%) rename {features => nixos}/desktopish/README.md (100%) rename {features => nixos}/desktopish/autolock.nix (100%) rename {features => nixos}/desktopish/default.nix (100%) rename {features => nixos}/desktopish/fonts.nix (100%) rename {features => nixos}/desktopish/gnome-keyring.nix (100%) rename {features => nixos}/desktopish/guiapps.nix (100%) rename {features => nixos}/desktopish/hidpi.nix (100%) rename {features => nixos}/desktopish/hotplug.nix (100%) rename {features => nixos}/desktopish/light-terminal.nix (100%) rename {features => nixos}/desktopish/polybar.nix (100%) rename {features => nixos}/desktopish/redshift.nix (100%) rename {features => nixos}/desktopish/screencapture.nix (100%) rename {features => nixos}/desktopish/steam.nix (100%) rename {features => nixos}/desktopish/swap-caps-ctrl.nix (100%) rename {features => nixos}/desktopish/taffybar/default.nix (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/.gitignore (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/.vscode/extensions.json (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/.vscode/settings.json (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/CHANGELOG.md (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/Main.hs (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/README.md (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/Setup.hs (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/bin/run (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/default.nix (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/hie.yaml (100%) rename {features => nixos}/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal (100%) rename {features => nixos}/desktopish/touchpad-trackpoint.nix (100%) rename {features => nixos}/desktopish/vscode.nix (100%) rename {features => nixos}/desktopish/xmobar/default.nix (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/.gitignore (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/.vscode/extensions.json (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/.vscode/settings.json (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/.vscode/tasks.json (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/CHANGELOG.md (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/Main.hs (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/Setup.hs (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/default.nix (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/hie.yaml (100%) rename {features => nixos}/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal (100%) rename {features => nixos}/desktopish/xmonad/default.nix (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/.gitignore (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/.vscode/extensions.json (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/.vscode/settings.json (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/.vscode/tasks.json (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/CHANGELOG.md (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/Main.hs (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/README.md (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/Setup.hs (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/default.nix (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/hie.yaml (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/overlay.nix (100%) rename {features => nixos}/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal (100%) rename {features => nixos}/distributed-build.nix (100%) rename {features => nixos}/docker.nix (100%) rename {features => nixos}/ema/emanote.nix (100%) rename {features => nixos}/email/default.nix (100%) rename {features => nixos}/email/protonmail-bridge.nix (100%) rename {features => nixos}/gnome.nix (100%) rename {features => nixos}/hercules.nix (100%) rename {features => nixos}/kde.nix (100%) rename {features => nixos}/lxd.nix (100%) rename {features => nixos}/monitor-brightness.nix (100%) rename {features => nixos}/passwordstore.nix (100%) rename {features => nixos}/postgres.nix (100%) rename {features => nixos}/postgrest.nix (100%) rename {features => nixos}/protonvpn.nix (100%) rename {features => nixos}/self-ide.nix (100%) rename {features => nixos}/server/devserver.nix (100%) rename {features => nixos}/server/harden.nix (100%) rename {features => nixos}/server/unlaptop.nix (100%) rename {features => nixos}/server/wakeonlan.nix (100%) rename {features => nixos}/takemessh/default.nix (100%) rename {features => nixos}/takemessh/id_rsa.pub (100%) rename {features => nixos}/virtualbox.nix (100%) diff --git a/flake.nix b/flake.nix index 67c8c0a..00f3e31 100644 --- a/flake.nix +++ b/flake.nix @@ -49,10 +49,10 @@ # Configuration common to all Linux systems commonFeatures = [ overlayModule - ./features/self-ide.nix - ./features/takemessh - ./features/caches - ./features/current-location.nix + ./nixos/self-ide.nix + ./nixos/takemessh + ./nixos/caches + ./nixos/current-location.nix ]; homeFeatures = [ home-manager.nixosModules.home-manager @@ -89,9 +89,9 @@ now = mkLinuxSystem [ ./hosts/hetzner/ax101.nix - ./features/server/harden.nix - ./features/server/devserver.nix - ./features/hercules.nix + ./nixos/server/harden.nix + ./nixos/server/devserver.nix + ./nixos/hercules.nix ]; # This is run in qemu only. # > nixos-shell --flake github:srid/nixos-config#corsair @@ -137,7 +137,7 @@ modules = [ overlayModule ./hosts/darwin.nix - ./features/caches/oss.nix + ./nixos/caches/oss.nix home-manager.darwinModules.home-manager { home-manager.extraSpecialArgs = { inherit system inputs; }; diff --git a/features/caches/default.nix b/nixos/caches/default.nix similarity index 100% rename from features/caches/default.nix rename to nixos/caches/default.nix diff --git a/features/caches/iohk.nix b/nixos/caches/iohk.nix similarity index 100% rename from features/caches/iohk.nix rename to nixos/caches/iohk.nix diff --git a/features/caches/oss.nix b/nixos/caches/oss.nix similarity index 100% rename from features/caches/oss.nix rename to nixos/caches/oss.nix diff --git a/features/caches/platonic.nix b/nixos/caches/platonic.nix similarity index 100% rename from features/caches/platonic.nix rename to nixos/caches/platonic.nix diff --git a/features/caches/reflex.nix b/nixos/caches/reflex.nix similarity index 100% rename from features/caches/reflex.nix rename to nixos/caches/reflex.nix diff --git a/features/current-location.nix b/nixos/current-location.nix similarity index 100% rename from features/current-location.nix rename to nixos/current-location.nix diff --git a/features/desktopish/README.md b/nixos/desktopish/README.md similarity index 100% rename from features/desktopish/README.md rename to nixos/desktopish/README.md diff --git a/features/desktopish/autolock.nix b/nixos/desktopish/autolock.nix similarity index 100% rename from features/desktopish/autolock.nix rename to nixos/desktopish/autolock.nix diff --git a/features/desktopish/default.nix b/nixos/desktopish/default.nix similarity index 100% rename from features/desktopish/default.nix rename to nixos/desktopish/default.nix diff --git a/features/desktopish/fonts.nix b/nixos/desktopish/fonts.nix similarity index 100% rename from features/desktopish/fonts.nix rename to nixos/desktopish/fonts.nix diff --git a/features/desktopish/gnome-keyring.nix b/nixos/desktopish/gnome-keyring.nix similarity index 100% rename from features/desktopish/gnome-keyring.nix rename to nixos/desktopish/gnome-keyring.nix diff --git a/features/desktopish/guiapps.nix b/nixos/desktopish/guiapps.nix similarity index 100% rename from features/desktopish/guiapps.nix rename to nixos/desktopish/guiapps.nix diff --git a/features/desktopish/hidpi.nix b/nixos/desktopish/hidpi.nix similarity index 100% rename from features/desktopish/hidpi.nix rename to nixos/desktopish/hidpi.nix diff --git a/features/desktopish/hotplug.nix b/nixos/desktopish/hotplug.nix similarity index 100% rename from features/desktopish/hotplug.nix rename to nixos/desktopish/hotplug.nix diff --git a/features/desktopish/light-terminal.nix b/nixos/desktopish/light-terminal.nix similarity index 100% rename from features/desktopish/light-terminal.nix rename to nixos/desktopish/light-terminal.nix diff --git a/features/desktopish/polybar.nix b/nixos/desktopish/polybar.nix similarity index 100% rename from features/desktopish/polybar.nix rename to nixos/desktopish/polybar.nix diff --git a/features/desktopish/redshift.nix b/nixos/desktopish/redshift.nix similarity index 100% rename from features/desktopish/redshift.nix rename to nixos/desktopish/redshift.nix diff --git a/features/desktopish/screencapture.nix b/nixos/desktopish/screencapture.nix similarity index 100% rename from features/desktopish/screencapture.nix rename to nixos/desktopish/screencapture.nix diff --git a/features/desktopish/steam.nix b/nixos/desktopish/steam.nix similarity index 100% rename from features/desktopish/steam.nix rename to nixos/desktopish/steam.nix diff --git a/features/desktopish/swap-caps-ctrl.nix b/nixos/desktopish/swap-caps-ctrl.nix similarity index 100% rename from features/desktopish/swap-caps-ctrl.nix rename to nixos/desktopish/swap-caps-ctrl.nix diff --git a/features/desktopish/taffybar/default.nix b/nixos/desktopish/taffybar/default.nix similarity index 100% rename from features/desktopish/taffybar/default.nix rename to nixos/desktopish/taffybar/default.nix diff --git a/features/desktopish/taffybar/taffybar-srid/.gitignore b/nixos/desktopish/taffybar/taffybar-srid/.gitignore similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/.gitignore rename to nixos/desktopish/taffybar/taffybar-srid/.gitignore diff --git a/features/desktopish/taffybar/taffybar-srid/.vscode/extensions.json b/nixos/desktopish/taffybar/taffybar-srid/.vscode/extensions.json similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/.vscode/extensions.json rename to nixos/desktopish/taffybar/taffybar-srid/.vscode/extensions.json diff --git a/features/desktopish/taffybar/taffybar-srid/.vscode/settings.json b/nixos/desktopish/taffybar/taffybar-srid/.vscode/settings.json similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/.vscode/settings.json rename to nixos/desktopish/taffybar/taffybar-srid/.vscode/settings.json diff --git a/features/desktopish/taffybar/taffybar-srid/CHANGELOG.md b/nixos/desktopish/taffybar/taffybar-srid/CHANGELOG.md similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/CHANGELOG.md rename to nixos/desktopish/taffybar/taffybar-srid/CHANGELOG.md diff --git a/features/desktopish/taffybar/taffybar-srid/Main.hs b/nixos/desktopish/taffybar/taffybar-srid/Main.hs similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/Main.hs rename to nixos/desktopish/taffybar/taffybar-srid/Main.hs diff --git a/features/desktopish/taffybar/taffybar-srid/README.md b/nixos/desktopish/taffybar/taffybar-srid/README.md similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/README.md rename to nixos/desktopish/taffybar/taffybar-srid/README.md diff --git a/features/desktopish/taffybar/taffybar-srid/Setup.hs b/nixos/desktopish/taffybar/taffybar-srid/Setup.hs similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/Setup.hs rename to nixos/desktopish/taffybar/taffybar-srid/Setup.hs diff --git a/features/desktopish/taffybar/taffybar-srid/bin/run b/nixos/desktopish/taffybar/taffybar-srid/bin/run similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/bin/run rename to nixos/desktopish/taffybar/taffybar-srid/bin/run diff --git a/features/desktopish/taffybar/taffybar-srid/default.nix b/nixos/desktopish/taffybar/taffybar-srid/default.nix similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/default.nix rename to nixos/desktopish/taffybar/taffybar-srid/default.nix diff --git a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix b/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix rename to nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix diff --git a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json b/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json rename to nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json diff --git a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix b/nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix rename to nixos/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix diff --git a/features/desktopish/taffybar/taffybar-srid/hie.yaml b/nixos/desktopish/taffybar/taffybar-srid/hie.yaml similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/hie.yaml rename to nixos/desktopish/taffybar/taffybar-srid/hie.yaml diff --git a/features/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal b/nixos/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal similarity index 100% rename from features/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal rename to nixos/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal diff --git a/features/desktopish/touchpad-trackpoint.nix b/nixos/desktopish/touchpad-trackpoint.nix similarity index 100% rename from features/desktopish/touchpad-trackpoint.nix rename to nixos/desktopish/touchpad-trackpoint.nix diff --git a/features/desktopish/vscode.nix b/nixos/desktopish/vscode.nix similarity index 100% rename from features/desktopish/vscode.nix rename to nixos/desktopish/vscode.nix diff --git a/features/desktopish/xmobar/default.nix b/nixos/desktopish/xmobar/default.nix similarity index 100% rename from features/desktopish/xmobar/default.nix rename to nixos/desktopish/xmobar/default.nix diff --git a/features/desktopish/xmobar/xmobar-srid/.gitignore b/nixos/desktopish/xmobar/xmobar-srid/.gitignore similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/.gitignore rename to nixos/desktopish/xmobar/xmobar-srid/.gitignore diff --git a/features/desktopish/xmobar/xmobar-srid/.vscode/extensions.json b/nixos/desktopish/xmobar/xmobar-srid/.vscode/extensions.json similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/.vscode/extensions.json rename to nixos/desktopish/xmobar/xmobar-srid/.vscode/extensions.json diff --git a/features/desktopish/xmobar/xmobar-srid/.vscode/settings.json b/nixos/desktopish/xmobar/xmobar-srid/.vscode/settings.json similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/.vscode/settings.json rename to nixos/desktopish/xmobar/xmobar-srid/.vscode/settings.json diff --git a/features/desktopish/xmobar/xmobar-srid/.vscode/tasks.json b/nixos/desktopish/xmobar/xmobar-srid/.vscode/tasks.json similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/.vscode/tasks.json rename to nixos/desktopish/xmobar/xmobar-srid/.vscode/tasks.json diff --git a/features/desktopish/xmobar/xmobar-srid/CHANGELOG.md b/nixos/desktopish/xmobar/xmobar-srid/CHANGELOG.md similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/CHANGELOG.md rename to nixos/desktopish/xmobar/xmobar-srid/CHANGELOG.md diff --git a/features/desktopish/xmobar/xmobar-srid/Main.hs b/nixos/desktopish/xmobar/xmobar-srid/Main.hs similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/Main.hs rename to nixos/desktopish/xmobar/xmobar-srid/Main.hs diff --git a/features/desktopish/xmobar/xmobar-srid/Setup.hs b/nixos/desktopish/xmobar/xmobar-srid/Setup.hs similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/Setup.hs rename to nixos/desktopish/xmobar/xmobar-srid/Setup.hs diff --git a/features/desktopish/xmobar/xmobar-srid/default.nix b/nixos/desktopish/xmobar/xmobar-srid/default.nix similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/default.nix rename to nixos/desktopish/xmobar/xmobar-srid/default.nix diff --git a/features/desktopish/xmobar/xmobar-srid/hie.yaml b/nixos/desktopish/xmobar/xmobar-srid/hie.yaml similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/hie.yaml rename to nixos/desktopish/xmobar/xmobar-srid/hie.yaml diff --git a/features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal b/nixos/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal similarity index 100% rename from features/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal rename to nixos/desktopish/xmobar/xmobar-srid/xmobar-srid.cabal diff --git a/features/desktopish/xmonad/default.nix b/nixos/desktopish/xmonad/default.nix similarity index 100% rename from features/desktopish/xmonad/default.nix rename to nixos/desktopish/xmonad/default.nix diff --git a/features/desktopish/xmonad/xmonad-srid/.gitignore b/nixos/desktopish/xmonad/xmonad-srid/.gitignore similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/.gitignore rename to nixos/desktopish/xmonad/xmonad-srid/.gitignore diff --git a/features/desktopish/xmonad/xmonad-srid/.vscode/extensions.json b/nixos/desktopish/xmonad/xmonad-srid/.vscode/extensions.json similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/.vscode/extensions.json rename to nixos/desktopish/xmonad/xmonad-srid/.vscode/extensions.json diff --git a/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json b/nixos/desktopish/xmonad/xmonad-srid/.vscode/settings.json similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/.vscode/settings.json rename to nixos/desktopish/xmonad/xmonad-srid/.vscode/settings.json diff --git a/features/desktopish/xmonad/xmonad-srid/.vscode/tasks.json b/nixos/desktopish/xmonad/xmonad-srid/.vscode/tasks.json similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/.vscode/tasks.json rename to nixos/desktopish/xmonad/xmonad-srid/.vscode/tasks.json diff --git a/features/desktopish/xmonad/xmonad-srid/CHANGELOG.md b/nixos/desktopish/xmonad/xmonad-srid/CHANGELOG.md similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/CHANGELOG.md rename to nixos/desktopish/xmonad/xmonad-srid/CHANGELOG.md diff --git a/features/desktopish/xmonad/xmonad-srid/Main.hs b/nixos/desktopish/xmonad/xmonad-srid/Main.hs similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/Main.hs rename to nixos/desktopish/xmonad/xmonad-srid/Main.hs diff --git a/features/desktopish/xmonad/xmonad-srid/README.md b/nixos/desktopish/xmonad/xmonad-srid/README.md similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/README.md rename to nixos/desktopish/xmonad/xmonad-srid/README.md diff --git a/features/desktopish/xmonad/xmonad-srid/Setup.hs b/nixos/desktopish/xmonad/xmonad-srid/Setup.hs similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/Setup.hs rename to nixos/desktopish/xmonad/xmonad-srid/Setup.hs diff --git a/features/desktopish/xmonad/xmonad-srid/default.nix b/nixos/desktopish/xmonad/xmonad-srid/default.nix similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/default.nix rename to nixos/desktopish/xmonad/xmonad-srid/default.nix diff --git a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix b/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix rename to nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix diff --git a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json b/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json rename to nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json diff --git a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix b/nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix rename to nixos/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix diff --git a/features/desktopish/xmonad/xmonad-srid/hie.yaml b/nixos/desktopish/xmonad/xmonad-srid/hie.yaml similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/hie.yaml rename to nixos/desktopish/xmonad/xmonad-srid/hie.yaml diff --git a/features/desktopish/xmonad/xmonad-srid/overlay.nix b/nixos/desktopish/xmonad/xmonad-srid/overlay.nix similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/overlay.nix rename to nixos/desktopish/xmonad/xmonad-srid/overlay.nix diff --git a/features/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal b/nixos/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal similarity index 100% rename from features/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal rename to nixos/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal diff --git a/features/distributed-build.nix b/nixos/distributed-build.nix similarity index 100% rename from features/distributed-build.nix rename to nixos/distributed-build.nix diff --git a/features/docker.nix b/nixos/docker.nix similarity index 100% rename from features/docker.nix rename to nixos/docker.nix diff --git a/features/ema/emanote.nix b/nixos/ema/emanote.nix similarity index 100% rename from features/ema/emanote.nix rename to nixos/ema/emanote.nix diff --git a/features/email/default.nix b/nixos/email/default.nix similarity index 100% rename from features/email/default.nix rename to nixos/email/default.nix diff --git a/features/email/protonmail-bridge.nix b/nixos/email/protonmail-bridge.nix similarity index 100% rename from features/email/protonmail-bridge.nix rename to nixos/email/protonmail-bridge.nix diff --git a/features/gnome.nix b/nixos/gnome.nix similarity index 100% rename from features/gnome.nix rename to nixos/gnome.nix diff --git a/features/hercules.nix b/nixos/hercules.nix similarity index 100% rename from features/hercules.nix rename to nixos/hercules.nix diff --git a/features/kde.nix b/nixos/kde.nix similarity index 100% rename from features/kde.nix rename to nixos/kde.nix diff --git a/features/lxd.nix b/nixos/lxd.nix similarity index 100% rename from features/lxd.nix rename to nixos/lxd.nix diff --git a/features/monitor-brightness.nix b/nixos/monitor-brightness.nix similarity index 100% rename from features/monitor-brightness.nix rename to nixos/monitor-brightness.nix diff --git a/features/passwordstore.nix b/nixos/passwordstore.nix similarity index 100% rename from features/passwordstore.nix rename to nixos/passwordstore.nix diff --git a/features/postgres.nix b/nixos/postgres.nix similarity index 100% rename from features/postgres.nix rename to nixos/postgres.nix diff --git a/features/postgrest.nix b/nixos/postgrest.nix similarity index 100% rename from features/postgrest.nix rename to nixos/postgrest.nix diff --git a/features/protonvpn.nix b/nixos/protonvpn.nix similarity index 100% rename from features/protonvpn.nix rename to nixos/protonvpn.nix diff --git a/features/self-ide.nix b/nixos/self-ide.nix similarity index 100% rename from features/self-ide.nix rename to nixos/self-ide.nix diff --git a/features/server/devserver.nix b/nixos/server/devserver.nix similarity index 100% rename from features/server/devserver.nix rename to nixos/server/devserver.nix diff --git a/features/server/harden.nix b/nixos/server/harden.nix similarity index 100% rename from features/server/harden.nix rename to nixos/server/harden.nix diff --git a/features/server/unlaptop.nix b/nixos/server/unlaptop.nix similarity index 100% rename from features/server/unlaptop.nix rename to nixos/server/unlaptop.nix diff --git a/features/server/wakeonlan.nix b/nixos/server/wakeonlan.nix similarity index 100% rename from features/server/wakeonlan.nix rename to nixos/server/wakeonlan.nix diff --git a/features/takemessh/default.nix b/nixos/takemessh/default.nix similarity index 100% rename from features/takemessh/default.nix rename to nixos/takemessh/default.nix diff --git a/features/takemessh/id_rsa.pub b/nixos/takemessh/id_rsa.pub similarity index 100% rename from features/takemessh/id_rsa.pub rename to nixos/takemessh/id_rsa.pub diff --git a/features/virtualbox.nix b/nixos/virtualbox.nix similarity index 100% rename from features/virtualbox.nix rename to nixos/virtualbox.nix