From 0fbb7831c9a66edb42a03d5c6ec7d5c3f5e91d97 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Tue, 7 Apr 2020 15:26:35 +0200
Subject: [PATCH] Move 'nixos/' directory contents to '/'

---
 .../channels => channels}/nixos-19.09/channel.json  |   0
 .../channels => channels}/nixos-19.09/default.nix   |   0
 {nixos/channels => channels}/nixos-19.09/update     |   0
 .../nixos-unstable/channel.json                     |   0
 .../nixos-unstable/default.nix                      |   0
 {nixos/channels => channels}/nixos-unstable/update  |   0
 nixos/configuration.nix => configuration.nix        |   0
 nixos/helpers.nix => helpers.nix                    |   0
 {nixos/layers => layers}/base.nix                   |   0
 {nixos/layers => layers}/cpu-amd.nix                |   0
 {nixos/layers => layers}/cpu-intel.nix              |   0
 {nixos/layers => layers}/desktop.nix                |   0
 {nixos/layers => layers}/dev-dotnet.nix             |   0
 {nixos/layers => layers}/dev-haskell.nix            |   0
 {nixos/layers => layers}/dev-latex.nix              |   0
 {nixos/layers => layers}/dev-nix.nix                |   0
 {nixos/layers => layers}/dev-python.nix             |   0
 {nixos/layers => layers}/dev.nix                    |   0
 {nixos/layers => layers}/laptop.nix                 |   0
 {nixos/layers => layers}/mqtt-server.nix            |   0
 {nixos/layers => layers}/steam.nix                  |   0
 {nixos/layers => layers}/streaming.nix              |   0
 {nixos/layers => layers}/subraum.nix                |   0
 {nixos/layers => layers}/teamspeak.nix              |   0
 {nixos/layers => layers}/vscode.nix                 |   0
 {nixos/layers => layers}/wine.nix                   |   0
 {nixos/layers => layers}/workstation.nix            |   0
 {nixos/layers => layers}/zsh.nix                    |   2 +-
 nixos/machine-manager.nix => machine-manager.nix    |   0
 {nixos/modules => modules}/default.nix              |   0
 {nixos/modules => modules}/dotfiles.nix             |   2 +-
 {nixos/modules => modules}/heDns.nix                |   0
 {nixos/modules => modules}/loginctl-linger.nix      |   0
 {nixos/modules => modules}/webserver.nix            |   0
 {nixos/pkgs => pkgs}/default.nix                    |   0
 {nixos/pkgs => pkgs}/dotnet-sdk/default.nix         |   0
 .../pkgs => pkgs}/haskell-ide-engine/all-hies.json  |   0
 {nixos/pkgs => pkgs}/haskell-ide-engine/default.nix |   0
 {nixos/pkgs => pkgs}/haskell-ide-engine/update      |   0
 {nixos/pkgs => pkgs}/neatvnc/default.nix            |   0
 {nixos/pkgs => pkgs}/neatvnc/neatvnc.nix            |   0
 {nixos/pkgs => pkgs}/neatvnc/repo.json              |   0
 {nixos/pkgs => pkgs}/neatvnc/update                 |   0
 {nixos/pkgs => pkgs}/neovim/default.nix             |   0
 {nixos/pkgs => pkgs}/nginx-sso/default.nix          |   0
 {nixos/pkgs => pkgs}/qbar/default.nix               |   0
 {nixos/pkgs => pkgs}/qbar/repo.json                 |   0
 {nixos/pkgs => pkgs}/qbar/update                    |   0
 .../simpleandsoft/28427-simpleandsoft-0.2.tar.gz    | Bin
 {nixos/pkgs => pkgs}/simpleandsoft/default.nix      |   0
 .../pkgs => pkgs}/simpleandsoft/simpleandsoft.nix   |   0
 {nixos/pkgs => pkgs}/wayvnc/default.nix             |   0
 {nixos/pkgs => pkgs}/wayvnc/repo.json               |   0
 {nixos/pkgs => pkgs}/wayvnc/update                  |   0
 {nixos/pkgs => pkgs}/wayvnc/wayvnc.nix              |   0
 55 files changed, 2 insertions(+), 2 deletions(-)
 rename {nixos/channels => channels}/nixos-19.09/channel.json (100%)
 rename {nixos/channels => channels}/nixos-19.09/default.nix (100%)
 rename {nixos/channels => channels}/nixos-19.09/update (100%)
 rename {nixos/channels => channels}/nixos-unstable/channel.json (100%)
 rename {nixos/channels => channels}/nixos-unstable/default.nix (100%)
 rename {nixos/channels => channels}/nixos-unstable/update (100%)
 rename nixos/configuration.nix => configuration.nix (100%)
 rename nixos/helpers.nix => helpers.nix (100%)
 rename {nixos/layers => layers}/base.nix (100%)
 rename {nixos/layers => layers}/cpu-amd.nix (100%)
 rename {nixos/layers => layers}/cpu-intel.nix (100%)
 rename {nixos/layers => layers}/desktop.nix (100%)
 rename {nixos/layers => layers}/dev-dotnet.nix (100%)
 rename {nixos/layers => layers}/dev-haskell.nix (100%)
 rename {nixos/layers => layers}/dev-latex.nix (100%)
 rename {nixos/layers => layers}/dev-nix.nix (100%)
 rename {nixos/layers => layers}/dev-python.nix (100%)
 rename {nixos/layers => layers}/dev.nix (100%)
 rename {nixos/layers => layers}/laptop.nix (100%)
 rename {nixos/layers => layers}/mqtt-server.nix (100%)
 rename {nixos/layers => layers}/steam.nix (100%)
 rename {nixos/layers => layers}/streaming.nix (100%)
 rename {nixos/layers => layers}/subraum.nix (100%)
 rename {nixos/layers => layers}/teamspeak.nix (100%)
 rename {nixos/layers => layers}/vscode.nix (100%)
 rename {nixos/layers => layers}/wine.nix (100%)
 rename {nixos/layers => layers}/workstation.nix (100%)
 rename {nixos/layers => layers}/zsh.nix (99%)
 rename nixos/machine-manager.nix => machine-manager.nix (100%)
 rename {nixos/modules => modules}/default.nix (100%)
 rename {nixos/modules => modules}/dotfiles.nix (98%)
 rename {nixos/modules => modules}/heDns.nix (100%)
 rename {nixos/modules => modules}/loginctl-linger.nix (100%)
 rename {nixos/modules => modules}/webserver.nix (100%)
 rename {nixos/pkgs => pkgs}/default.nix (100%)
 rename {nixos/pkgs => pkgs}/dotnet-sdk/default.nix (100%)
 rename {nixos/pkgs => pkgs}/haskell-ide-engine/all-hies.json (100%)
 rename {nixos/pkgs => pkgs}/haskell-ide-engine/default.nix (100%)
 rename {nixos/pkgs => pkgs}/haskell-ide-engine/update (100%)
 rename {nixos/pkgs => pkgs}/neatvnc/default.nix (100%)
 rename {nixos/pkgs => pkgs}/neatvnc/neatvnc.nix (100%)
 rename {nixos/pkgs => pkgs}/neatvnc/repo.json (100%)
 rename {nixos/pkgs => pkgs}/neatvnc/update (100%)
 rename {nixos/pkgs => pkgs}/neovim/default.nix (100%)
 rename {nixos/pkgs => pkgs}/nginx-sso/default.nix (100%)
 rename {nixos/pkgs => pkgs}/qbar/default.nix (100%)
 rename {nixos/pkgs => pkgs}/qbar/repo.json (100%)
 rename {nixos/pkgs => pkgs}/qbar/update (100%)
 rename {nixos/pkgs => pkgs}/simpleandsoft/28427-simpleandsoft-0.2.tar.gz (100%)
 rename {nixos/pkgs => pkgs}/simpleandsoft/default.nix (100%)
 rename {nixos/pkgs => pkgs}/simpleandsoft/simpleandsoft.nix (100%)
 rename {nixos/pkgs => pkgs}/wayvnc/default.nix (100%)
 rename {nixos/pkgs => pkgs}/wayvnc/repo.json (100%)
 rename {nixos/pkgs => pkgs}/wayvnc/update (100%)
 rename {nixos/pkgs => pkgs}/wayvnc/wayvnc.nix (100%)

diff --git a/nixos/channels/nixos-19.09/channel.json b/channels/nixos-19.09/channel.json
similarity index 100%
rename from nixos/channels/nixos-19.09/channel.json
rename to channels/nixos-19.09/channel.json
diff --git a/nixos/channels/nixos-19.09/default.nix b/channels/nixos-19.09/default.nix
similarity index 100%
rename from nixos/channels/nixos-19.09/default.nix
rename to channels/nixos-19.09/default.nix
diff --git a/nixos/channels/nixos-19.09/update b/channels/nixos-19.09/update
similarity index 100%
rename from nixos/channels/nixos-19.09/update
rename to channels/nixos-19.09/update
diff --git a/nixos/channels/nixos-unstable/channel.json b/channels/nixos-unstable/channel.json
similarity index 100%
rename from nixos/channels/nixos-unstable/channel.json
rename to channels/nixos-unstable/channel.json
diff --git a/nixos/channels/nixos-unstable/default.nix b/channels/nixos-unstable/default.nix
similarity index 100%
rename from nixos/channels/nixos-unstable/default.nix
rename to channels/nixos-unstable/default.nix
diff --git a/nixos/channels/nixos-unstable/update b/channels/nixos-unstable/update
similarity index 100%
rename from nixos/channels/nixos-unstable/update
rename to channels/nixos-unstable/update
diff --git a/nixos/configuration.nix b/configuration.nix
similarity index 100%
rename from nixos/configuration.nix
rename to configuration.nix
diff --git a/nixos/helpers.nix b/helpers.nix
similarity index 100%
rename from nixos/helpers.nix
rename to helpers.nix
diff --git a/nixos/layers/base.nix b/layers/base.nix
similarity index 100%
rename from nixos/layers/base.nix
rename to layers/base.nix
diff --git a/nixos/layers/cpu-amd.nix b/layers/cpu-amd.nix
similarity index 100%
rename from nixos/layers/cpu-amd.nix
rename to layers/cpu-amd.nix
diff --git a/nixos/layers/cpu-intel.nix b/layers/cpu-intel.nix
similarity index 100%
rename from nixos/layers/cpu-intel.nix
rename to layers/cpu-intel.nix
diff --git a/nixos/layers/desktop.nix b/layers/desktop.nix
similarity index 100%
rename from nixos/layers/desktop.nix
rename to layers/desktop.nix
diff --git a/nixos/layers/dev-dotnet.nix b/layers/dev-dotnet.nix
similarity index 100%
rename from nixos/layers/dev-dotnet.nix
rename to layers/dev-dotnet.nix
diff --git a/nixos/layers/dev-haskell.nix b/layers/dev-haskell.nix
similarity index 100%
rename from nixos/layers/dev-haskell.nix
rename to layers/dev-haskell.nix
diff --git a/nixos/layers/dev-latex.nix b/layers/dev-latex.nix
similarity index 100%
rename from nixos/layers/dev-latex.nix
rename to layers/dev-latex.nix
diff --git a/nixos/layers/dev-nix.nix b/layers/dev-nix.nix
similarity index 100%
rename from nixos/layers/dev-nix.nix
rename to layers/dev-nix.nix
diff --git a/nixos/layers/dev-python.nix b/layers/dev-python.nix
similarity index 100%
rename from nixos/layers/dev-python.nix
rename to layers/dev-python.nix
diff --git a/nixos/layers/dev.nix b/layers/dev.nix
similarity index 100%
rename from nixos/layers/dev.nix
rename to layers/dev.nix
diff --git a/nixos/layers/laptop.nix b/layers/laptop.nix
similarity index 100%
rename from nixos/layers/laptop.nix
rename to layers/laptop.nix
diff --git a/nixos/layers/mqtt-server.nix b/layers/mqtt-server.nix
similarity index 100%
rename from nixos/layers/mqtt-server.nix
rename to layers/mqtt-server.nix
diff --git a/nixos/layers/steam.nix b/layers/steam.nix
similarity index 100%
rename from nixos/layers/steam.nix
rename to layers/steam.nix
diff --git a/nixos/layers/streaming.nix b/layers/streaming.nix
similarity index 100%
rename from nixos/layers/streaming.nix
rename to layers/streaming.nix
diff --git a/nixos/layers/subraum.nix b/layers/subraum.nix
similarity index 100%
rename from nixos/layers/subraum.nix
rename to layers/subraum.nix
diff --git a/nixos/layers/teamspeak.nix b/layers/teamspeak.nix
similarity index 100%
rename from nixos/layers/teamspeak.nix
rename to layers/teamspeak.nix
diff --git a/nixos/layers/vscode.nix b/layers/vscode.nix
similarity index 100%
rename from nixos/layers/vscode.nix
rename to layers/vscode.nix
diff --git a/nixos/layers/wine.nix b/layers/wine.nix
similarity index 100%
rename from nixos/layers/wine.nix
rename to layers/wine.nix
diff --git a/nixos/layers/workstation.nix b/layers/workstation.nix
similarity index 100%
rename from nixos/layers/workstation.nix
rename to layers/workstation.nix
diff --git a/nixos/layers/zsh.nix b/layers/zsh.nix
similarity index 99%
rename from nixos/layers/zsh.nix
rename to layers/zsh.nix
index 781ea9f..136acd6 100644
--- a/nixos/layers/zsh.nix
+++ b/layers/zsh.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  promptPath = ../../zsh/prompt;
+  promptPath = ../zsh/prompt;
 
 in
 {
diff --git a/nixos/machine-manager.nix b/machine-manager.nix
similarity index 100%
rename from nixos/machine-manager.nix
rename to machine-manager.nix
diff --git a/nixos/modules/default.nix b/modules/default.nix
similarity index 100%
rename from nixos/modules/default.nix
rename to modules/default.nix
diff --git a/nixos/modules/dotfiles.nix b/modules/dotfiles.nix
similarity index 98%
rename from nixos/modules/dotfiles.nix
rename to modules/dotfiles.nix
index e193d4a..9bdb4f2 100644
--- a/nixos/modules/dotfiles.nix
+++ b/modules/dotfiles.nix
@@ -11,7 +11,7 @@ in {
       dotfiles = {
         base = mkOption {
           type = types.path;
-          default = ../../home-profiles;
+          default = ../home-profiles;
           description = ''
             The `base` for the selected `profiles`.
 
diff --git a/nixos/modules/heDns.nix b/modules/heDns.nix
similarity index 100%
rename from nixos/modules/heDns.nix
rename to modules/heDns.nix
diff --git a/nixos/modules/loginctl-linger.nix b/modules/loginctl-linger.nix
similarity index 100%
rename from nixos/modules/loginctl-linger.nix
rename to modules/loginctl-linger.nix
diff --git a/nixos/modules/webserver.nix b/modules/webserver.nix
similarity index 100%
rename from nixos/modules/webserver.nix
rename to modules/webserver.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/dotnet-sdk/default.nix b/pkgs/dotnet-sdk/default.nix
similarity index 100%
rename from nixos/pkgs/dotnet-sdk/default.nix
rename to pkgs/dotnet-sdk/default.nix
diff --git a/nixos/pkgs/haskell-ide-engine/all-hies.json b/pkgs/haskell-ide-engine/all-hies.json
similarity index 100%
rename from nixos/pkgs/haskell-ide-engine/all-hies.json
rename to pkgs/haskell-ide-engine/all-hies.json
diff --git a/nixos/pkgs/haskell-ide-engine/default.nix b/pkgs/haskell-ide-engine/default.nix
similarity index 100%
rename from nixos/pkgs/haskell-ide-engine/default.nix
rename to pkgs/haskell-ide-engine/default.nix
diff --git a/nixos/pkgs/haskell-ide-engine/update b/pkgs/haskell-ide-engine/update
similarity index 100%
rename from nixos/pkgs/haskell-ide-engine/update
rename to pkgs/haskell-ide-engine/update
diff --git a/nixos/pkgs/neatvnc/default.nix b/pkgs/neatvnc/default.nix
similarity index 100%
rename from nixos/pkgs/neatvnc/default.nix
rename to pkgs/neatvnc/default.nix
diff --git a/nixos/pkgs/neatvnc/neatvnc.nix b/pkgs/neatvnc/neatvnc.nix
similarity index 100%
rename from nixos/pkgs/neatvnc/neatvnc.nix
rename to pkgs/neatvnc/neatvnc.nix
diff --git a/nixos/pkgs/neatvnc/repo.json b/pkgs/neatvnc/repo.json
similarity index 100%
rename from nixos/pkgs/neatvnc/repo.json
rename to pkgs/neatvnc/repo.json
diff --git a/nixos/pkgs/neatvnc/update b/pkgs/neatvnc/update
similarity index 100%
rename from nixos/pkgs/neatvnc/update
rename to pkgs/neatvnc/update
diff --git a/nixos/pkgs/neovim/default.nix b/pkgs/neovim/default.nix
similarity index 100%
rename from nixos/pkgs/neovim/default.nix
rename to pkgs/neovim/default.nix
diff --git a/nixos/pkgs/nginx-sso/default.nix b/pkgs/nginx-sso/default.nix
similarity index 100%
rename from nixos/pkgs/nginx-sso/default.nix
rename to pkgs/nginx-sso/default.nix
diff --git a/nixos/pkgs/qbar/default.nix b/pkgs/qbar/default.nix
similarity index 100%
rename from nixos/pkgs/qbar/default.nix
rename to pkgs/qbar/default.nix
diff --git a/nixos/pkgs/qbar/repo.json b/pkgs/qbar/repo.json
similarity index 100%
rename from nixos/pkgs/qbar/repo.json
rename to pkgs/qbar/repo.json
diff --git a/nixos/pkgs/qbar/update b/pkgs/qbar/update
similarity index 100%
rename from nixos/pkgs/qbar/update
rename to pkgs/qbar/update
diff --git a/nixos/pkgs/simpleandsoft/28427-simpleandsoft-0.2.tar.gz b/pkgs/simpleandsoft/28427-simpleandsoft-0.2.tar.gz
similarity index 100%
rename from nixos/pkgs/simpleandsoft/28427-simpleandsoft-0.2.tar.gz
rename to pkgs/simpleandsoft/28427-simpleandsoft-0.2.tar.gz
diff --git a/nixos/pkgs/simpleandsoft/default.nix b/pkgs/simpleandsoft/default.nix
similarity index 100%
rename from nixos/pkgs/simpleandsoft/default.nix
rename to pkgs/simpleandsoft/default.nix
diff --git a/nixos/pkgs/simpleandsoft/simpleandsoft.nix b/pkgs/simpleandsoft/simpleandsoft.nix
similarity index 100%
rename from nixos/pkgs/simpleandsoft/simpleandsoft.nix
rename to pkgs/simpleandsoft/simpleandsoft.nix
diff --git a/nixos/pkgs/wayvnc/default.nix b/pkgs/wayvnc/default.nix
similarity index 100%
rename from nixos/pkgs/wayvnc/default.nix
rename to pkgs/wayvnc/default.nix
diff --git a/nixos/pkgs/wayvnc/repo.json b/pkgs/wayvnc/repo.json
similarity index 100%
rename from nixos/pkgs/wayvnc/repo.json
rename to pkgs/wayvnc/repo.json
diff --git a/nixos/pkgs/wayvnc/update b/pkgs/wayvnc/update
similarity index 100%
rename from nixos/pkgs/wayvnc/update
rename to pkgs/wayvnc/update
diff --git a/nixos/pkgs/wayvnc/wayvnc.nix b/pkgs/wayvnc/wayvnc.nix
similarity index 100%
rename from nixos/pkgs/wayvnc/wayvnc.nix
rename to pkgs/wayvnc/wayvnc.nix
-- 
GitLab