modules: move variables and initrd systemd to pc

10 files changed, 1 insertions, 67 deletions

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 03879b4..aeed06a 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,8 +3,8 @@
   imports = [
     ./networking
     ./software
-    ./variables
     ./virtualisation
+    ./variables.nix
   ];
 
   sops.defaultSopsFile = "${self}/secrets/${config.networking.hostName}.yaml";
diff --git a/modules/desktop/software/systemd.nix b/modules/desktop/software/systemd.nix
index c475d96..2d524ac 100644
--- a/modules/desktop/software/systemd.nix
+++ b/modules/desktop/software/systemd.nix
@@ -1,7 +1,5 @@
 { pkgs, ... }:
 {
-  boot.initrd.systemd.enable = true;
-
   systemd.services.containerd.path = with pkgs; [
     containerd
     runc
diff --git a/modules/desktop/variables/nvidia.nix b/modules/desktop/variables.nix
index 3d50fdf..3d50fdf 100644
--- a/modules/desktop/variables/nvidia.nix
+++ b/modules/desktop/variables.nix
diff --git a/modules/desktop/variables/default.nix b/modules/desktop/variables/default.nix
deleted file mode 100644
index 0ca8cf0..0000000
--- a/modules/desktop/variables/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./electron.nix
-    ./mozilla.nix
-    ./nvidia.nix
-    ./opengl.nix
-    ./qt.nix
-    ./wayland.nix
-    ./wlroots.nix
-  ];
-}
diff --git a/modules/desktop/variables/electron.nix b/modules/desktop/variables/electron.nix
deleted file mode 100644
index 62e7c72..0000000
--- a/modules/desktop/variables/electron.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  environment.variables = {
-    # ELECTRON_OZONE_PLATFORM_HINT = "auto";
-    # OZONE_PLATFORM = "wayland";
-    NIXOS_OZONE_WL = "1";
-  };
-}
diff --git a/modules/desktop/variables/mozilla.nix b/modules/desktop/variables/mozilla.nix
deleted file mode 100644
index e85d27c..0000000
--- a/modules/desktop/variables/mozilla.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  environment.variables = {
-    MOZ_ENABLE_WAYLAND = "1";
-    MOZ_DISABLE_RDD_SANDBOX = "1";
-  };
-}
diff --git a/modules/desktop/variables/opengl.nix b/modules/desktop/variables/opengl.nix
deleted file mode 100644
index 1edce45..0000000
--- a/modules/desktop/variables/opengl.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  environment.variables = {
-    __GL_GSYNC_ALLOWED = "1";
-    __GL_VRR_ALLOWED = "0";
-    __GL_MaxFramesAllowed = "1";
-  };
-}
diff --git a/modules/desktop/variables/qt.nix b/modules/desktop/variables/qt.nix
deleted file mode 100644
index cedf6a0..0000000
--- a/modules/desktop/variables/qt.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  environment.variables = {
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    QT_QPA_PLATFORM = "wayland;xcb";
-    DISABLE_QT5_COMPAT = "0";
-    DISABLE_QT_COMPAT = "0";
-    QT_QPA_PLATFORMTHEME = "qt5ct";
-    # QT_STYLE_OVERRIDE = "kvantum";
-  };
-}
diff --git a/modules/desktop/variables/wayland.nix b/modules/desktop/variables/wayland.nix
deleted file mode 100644
index ee21d52..0000000
--- a/modules/desktop/variables/wayland.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  environment.variables = {
-    GDK_BACKEND = "wayland,x11,*";
-    SDL_VIDEODRIVER = "wayland";
-    CLUTTER_BACKEND = "wayland";
-    XWAYLAND_NO_GLAMOR = "0"; # Gamescope
-    ANKI_WAYLAND = "1";
-    XDG_SESSION_TYPE = "wayland";
-  };
-}
diff --git a/modules/desktop/variables/wlroots.nix b/modules/desktop/variables/wlroots.nix
deleted file mode 100644
index 25aaf4d..0000000
--- a/modules/desktop/variables/wlroots.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  environment.variables = {
-    WLR_NO_HARDWARE_CURSORS = "1";
-    WLR_DRM_NO_ATOMIC = "1";
-    WLR_USE_LIBINPUT = "1";
-    WLR_RENDERER_ALLOW_SOFTWARE = "1";
-    WLR_DRM_DEVICES = "/dev/dri/card0";
-    WLR_EGL_NO_MODIFIERS = "1";
-    WLR_BACKEND = "vulkan";
-    WLR_RENDERER = "vulkan";
-  };
-}