14 files changed, 0 insertions, 206 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/core/variables/default.nix b/modules/core/variables/default.nix
deleted file mode 100644
index 8315ceb..0000000
--- a/modules/core/variables/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  imports = [
-    ./electron.nix
-    ./fcitx.nix
-    ./mozilla.nix
-    ./nvidia.nix
-    ./opengl.nix
-    ./qt.nix
-    ./wayland.nix
-    ./wlroots.nix
-  ];
-
-  environment.variables = {
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    PROTON_ENABLE_NGX_UPDATER = "1";
-    GTK_USE_PORTAL = "1";
-    DIRENV_LOG_FORMAT = "";
-    SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
-  };
-}
diff --git a/modules/core/variables/electron.nix b/modules/core/variables/electron.nix
deleted file mode 100644
index 62e7c72..0000000
--- a/modules/core/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/core/variables/fcitx.nix b/modules/core/variables/fcitx.nix
deleted file mode 100644
index 0ac550f..0000000
--- a/modules/core/variables/fcitx.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  environment.variables = {
-    # https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland
-    QT_IM_MODULE = "fcitx";
-    XMODIFIERS = "@im=fcitx";
-    # GTK_IM_MODULE = "wayland";
-    # GTK_IM_MODULE = "fcitx";
-    SDL_IM_MODULE = "fcitx";
-    GLFW_IM_MODULE = "ibus";
-    INPUT_METHOD = "fcitx";
-    CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
-  };
-}
diff --git a/modules/core/variables/mozilla.nix b/modules/core/variables/mozilla.nix
deleted file mode 100644
index e85d27c..0000000
--- a/modules/core/variables/mozilla.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  environment.variables = {
-    MOZ_ENABLE_WAYLAND = "1";
-    MOZ_DISABLE_RDD_SANDBOX = "1";
-  };
-}
diff --git a/modules/core/variables/nvidia.nix b/modules/core/variables/nvidia.nix
deleted file mode 100644
index 3d50fdf..0000000
--- a/modules/core/variables/nvidia.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.variables = {
-    LIBVA_DRIVER_NAME = "nvidia";
-    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-    GBM_BACKEND = "nvidia-drm";
-    __VK_LAYER_NV_optimus = "NVIDIA_only";
-    __NV_PRIME_RENDER_OFFLOAD = "1";
-    NVD_BACKEND = "direct";
-    CUDA_PATH = "${pkgs.cudatoolkit}";
-  };
-}
diff --git a/modules/core/variables/opengl.nix b/modules/core/variables/opengl.nix
deleted file mode 100644
index 1edce45..0000000
--- a/modules/core/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/core/variables/qt.nix b/modules/core/variables/qt.nix
deleted file mode 100644
index cedf6a0..0000000
--- a/modules/core/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/core/variables/wayland.nix b/modules/core/variables/wayland.nix
deleted file mode 100644
index ee21d52..0000000
--- a/modules/core/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/core/variables/wlroots.nix b/modules/core/variables/wlroots.nix
deleted file mode 100644
index 25aaf4d..0000000
--- a/modules/core/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";
-  };
-}
diff --git a/modules/core/virtualisation/default.nix b/modules/core/virtualisation/default.nix
deleted file mode 100644
index 97aa4b9..0000000
--- a/modules/core/virtualisation/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./docker.nix
-    ./libvirtd.nix
-    ./qemu.nix
-  ];
-
-  programs.extra-container.enable = true;
-
-  virtualisation = {
-    kvmgt.enable = true;
-    spiceUSBRedirection.enable = true;
-  };
-}
diff --git a/modules/core/virtualisation/docker.nix b/modules/core/virtualisation/docker.nix
deleted file mode 100644
index c35beb6..0000000
--- a/modules/core/virtualisation/docker.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, ... }:
-{
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "overlay2";
-    enableOnBoot = false;
-    liveRestore = true;
-    enableNvidia = lib.mkForce true;
-
-    daemon.settings = {
-      default-runtime = "nvidia";
-      experimental = true;
-      iptables = false;
-    };
-
-    autoPrune = {
-      enable = true;
-      dates = "daily";
-    };
-
-    rootless = {
-      enable = false;
-      setSocketVariable = true;
-
-      daemon.settings = {
-        default-runtime = "nvidia";
-        experimental = true;
-        iptables = false;
-      };
-    };
-  };
-}
diff --git a/modules/core/virtualisation/libvirtd.nix b/modules/core/virtualisation/libvirtd.nix
deleted file mode 100644
index 556135b..0000000
--- a/modules/core/virtualisation/libvirtd.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  boot.extraModprobeConfig = "options kvm_intel nested=1";
-
-  environment.systemPackages = with pkgs; [
-    virt-manager
-    virt-viewer
-  ];
-
-  virtualisation.libvirtd = {
-    enable = true;
-    onBoot = "ignore";
-    onShutdown = "shutdown";
-  };
-}
diff --git a/modules/core/virtualisation/qemu.nix b/modules/core/virtualisation/qemu.nix
deleted file mode 100644
index 849ead1..0000000
--- a/modules/core/virtualisation/qemu.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    qemu_kvm
-    qemu
-  ];
-
-  hardware.pulseaudio.extraConfig = ''
-    load-module module-native-protocol-unix auth-group=qemu-libvirtd socket=/tmp/pulse-socket
-  '';
-
-  boot.kernelModules = [ "vfio-pci" ];
-
-  networking.firewall.trustedInterfaces = [
-    "virbr0"
-    "br0"
-  ];
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="vfio", OWNER="root", GROUP="kvm"
-  '';
-
-  virtualisation.libvirtd.qemu = {
-    package = pkgs.qemu_kvm;
-    runAsRoot = true;
-    swtpm.enable = true;
-
-    ovmf = {
-      enable = true;
-
-      packages = [
-        (pkgs.OVMFFull.override {
-          secureBoot = true;
-          tpmSupport = true;
-        }).fd
-      ];
-    };
-
-    verbatimConfig = ''
-      namespaces = []
-
-      dynamic_ownership = 0
-    '';
-  };
-}