diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/default.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/default.nix | 6 | ||||
| -rw-r--r-- | modules/desktop/variables/default.nix (renamed from modules/core/variables/default.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/electron.nix (renamed from modules/core/variables/electron.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/fcitx.nix (renamed from modules/core/variables/fcitx.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/mozilla.nix (renamed from modules/core/variables/mozilla.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/nvidia.nix (renamed from modules/core/variables/nvidia.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/opengl.nix (renamed from modules/core/variables/opengl.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/qt.nix (renamed from modules/core/variables/qt.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/wayland.nix (renamed from modules/core/variables/wayland.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/variables/wlroots.nix (renamed from modules/core/variables/wlroots.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/virtualisation/default.nix (renamed from modules/core/virtualisation/default.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/virtualisation/docker.nix (renamed from modules/core/virtualisation/docker.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/virtualisation/libvirtd.nix (renamed from modules/core/virtualisation/libvirtd.nix) | 0 | ||||
| -rw-r--r-- | modules/desktop/virtualisation/qemu.nix (renamed from modules/core/virtualisation/qemu.nix) | 0 |
15 files changed, 5 insertions, 3 deletions
diff --git a/modules/core/default.nix b/modules/core/default.nix index 44da8e2..ef9131a 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -5,7 +5,5 @@ ./nix ./security ./software - ./variables - ./virtualisation ]; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index f20e009..e4fe30d 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,6 +1,10 @@ { config, ... }: { - imports = [ ./networking ]; + imports = [ + ./networking + ./variables + ./virtualisation + ]; sops.defaultSopsFile = ../../secrets/${config.networking.hostName}.yaml; } diff --git a/modules/core/variables/default.nix b/modules/desktop/variables/default.nix index 8315ceb..8315ceb 100644 --- a/modules/core/variables/default.nix +++ b/modules/desktop/variables/default.nix diff --git a/modules/core/variables/electron.nix b/modules/desktop/variables/electron.nix index 62e7c72..62e7c72 100644 --- a/modules/core/variables/electron.nix +++ b/modules/desktop/variables/electron.nix diff --git a/modules/core/variables/fcitx.nix b/modules/desktop/variables/fcitx.nix index 0ac550f..0ac550f 100644 --- a/modules/core/variables/fcitx.nix +++ b/modules/desktop/variables/fcitx.nix diff --git a/modules/core/variables/mozilla.nix b/modules/desktop/variables/mozilla.nix index e85d27c..e85d27c 100644 --- a/modules/core/variables/mozilla.nix +++ b/modules/desktop/variables/mozilla.nix diff --git a/modules/core/variables/nvidia.nix b/modules/desktop/variables/nvidia.nix index 3d50fdf..3d50fdf 100644 --- a/modules/core/variables/nvidia.nix +++ b/modules/desktop/variables/nvidia.nix diff --git a/modules/core/variables/opengl.nix b/modules/desktop/variables/opengl.nix index 1edce45..1edce45 100644 --- a/modules/core/variables/opengl.nix +++ b/modules/desktop/variables/opengl.nix diff --git a/modules/core/variables/qt.nix b/modules/desktop/variables/qt.nix index cedf6a0..cedf6a0 100644 --- a/modules/core/variables/qt.nix +++ b/modules/desktop/variables/qt.nix diff --git a/modules/core/variables/wayland.nix b/modules/desktop/variables/wayland.nix index ee21d52..ee21d52 100644 --- a/modules/core/variables/wayland.nix +++ b/modules/desktop/variables/wayland.nix diff --git a/modules/core/variables/wlroots.nix b/modules/desktop/variables/wlroots.nix index 25aaf4d..25aaf4d 100644 --- a/modules/core/variables/wlroots.nix +++ b/modules/desktop/variables/wlroots.nix diff --git a/modules/core/virtualisation/default.nix b/modules/desktop/virtualisation/default.nix index 97aa4b9..97aa4b9 100644 --- a/modules/core/virtualisation/default.nix +++ b/modules/desktop/virtualisation/default.nix diff --git a/modules/core/virtualisation/docker.nix b/modules/desktop/virtualisation/docker.nix index c35beb6..c35beb6 100644 --- a/modules/core/virtualisation/docker.nix +++ b/modules/desktop/virtualisation/docker.nix diff --git a/modules/core/virtualisation/libvirtd.nix b/modules/desktop/virtualisation/libvirtd.nix index 556135b..556135b 100644 --- a/modules/core/virtualisation/libvirtd.nix +++ b/modules/desktop/virtualisation/libvirtd.nix diff --git a/modules/core/virtualisation/qemu.nix b/modules/desktop/virtualisation/qemu.nix index 849ead1..849ead1 100644 --- a/modules/core/virtualisation/qemu.nix +++ b/modules/desktop/virtualisation/qemu.nix |