restructure + add vr

hosts/desktop/boot.nix

@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+let
+  cpuid-fault-emulation = pkgs.callPackage ../../pkgs/cpuid-fault-emulation {
+    kernel = config.boot.kernelPackages.kernel;
+  };
+in
+{
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.efiSupport = true;
+  boot.extraModulePackages = [ cpuid-fault-emulation ];
+
+  boot.kernelParams = [
+    "iomem=relaxed"
+    "iommu=pt"
+    "amd_iommu=on"
+    "kvm.ignore_msrs=1"
+    "mitigations=off"
+    "amdgpu.ppfeaturemask=0xffffffff"
+    "clearcpuid=umip"
+  ];
+}

hosts/desktop/configuration.nix

@@ -2,21 +2,17 @@
   pkgs,
   sls-steam,
   options,
-  config,
   ...
 }:
-let
-  cpuid-fault-emulation = pkgs.callPackage ../../pkgs/cpuid-fault-emulation {
-    kernel = config.boot.kernelPackages.kernel;
-  };
-in
-
 {
   imports = [
-    ./hardware-configuration.nix
+    ./boot.nix
-    ./packages.nix
     ./drives.nix
+    ./packages.nix
+    ./hardware-configuration.nix
+    ../../modules/git.nix
     ../../modules/scripts.nix
+    ../../modules/desktop/vr.nix
     ../../modules/programs/nixvim/neovim.nix
   ];
 
@@ -31,16 +27,6 @@ in
     "flakes"
   ];
 
-  boot.kernelParams = [
-    "iomem=relaxed"
-    "iommu=pt"
-    "amd_iommu=on"
-    "kvm.ignore_msrs=1"
-    "mitigations=off"
-    "amdgpu.ppfeaturemask=0xffffffff"
-    "clearcpuid=umip"
-  ];
-
   xdg = {
     mime.defaultApplications = {
       "inode/directory" = [ "nemo.desktop" ];
@@ -57,12 +43,6 @@ in
     powerOnBoot = false;
   };
 
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "nodev";
-  boot.loader.grub.efiSupport = true;
-  boot.extraModulePackages = [ cpuid-fault-emulation ];
-
   environment.systemPackages = [
     (pkgs.writeShellScriptBin "enable-hypervisor" ''
       sudo modprobe -r kvm_amd kvm
@@ -144,31 +124,6 @@ in
   programs.kdeconnect.enable = true;
   services.rsync.enable = true;
   programs.neovim.enable = true;
-  programs.git = {
-    enable = true;
-    config = {
-      signing = {
-        key = "51AE8C6E80E6AF3BDFBE2BF804B31D181764898D";
-        signByDefault = true;
-      };
-      user = {
-        name = "KeksNino";
-        email = "KeksNino@proton.me";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
-      commit = {
-        gpgsign = true;
-      };
-      tag = {
-        gpgsign = true;
-      };
-    };
-  };
 
   programs.gnupg.agent = {
     enable = true;

hosts/desktop/home-manager/home.nix

@@ -6,11 +6,11 @@
 }:
 {
   imports = [
-    ./mpd.nix
     ./programs.nix
     ../../../modules/shell.nix
-    ../../../modules/programs/hyprland
+    ../../../modules/home/mpd.nix
-    ../../../modules/programs/kitty.nix
+    ../../../modules/home/hyprland
+    ../../../modules/home/kitty.nix
     ../../../modules/programs/qutebrowser.nix
     zen-browser.homeModules.beta
   ];

hosts/desktop/packages.nix

@@ -71,6 +71,7 @@
     proton-vpn
     unrar
     croc
+    hyprlandPlugins.csgo-vulkan-fix
   ];
 
   fonts.packages = with pkgs; [

hosts/music-server/configuration.nix

@@ -8,6 +8,7 @@
     ./hardware-configuration.nix
     ./packages.nix
     ../../modules/server
+    ../../modules/git.nix
   ];
 
   nix.settings.experimental-features = [
@@ -61,21 +62,6 @@
   services.tailscale.enable = true;
   services.rsync.enable = true;
   programs.neovim.enable = true;
-  programs.git = {
-    enable = true;
-    config = {
-      user = {
-        name = "KeksNino";
-        email = "KeksNino@proton.me";
-      };
-      init = {
-        defaultBranch = "main";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
-    };
-  };
 
   services.openssh = {
     enable = true;

hosts/music-server/home-manager/home.nix

@@ -1,7 +1,7 @@
 {
   imports = [
-    ./beets.nix
     ../../../modules/shell.nix
+    ../../../modules/home/beets.nix
   ];
 
   home.username = "user";

modules/desktop/vr.nix

@@ -0,0 +1,13 @@
+{
+  services.monado = {
+    enable = true;
+    defaultRuntime = true;
+  };
+
+  systemd.user.services.monado.environment = {
+    STEAMVR_LH_ENABLE = "1";
+    XRT_COMPOSITOR_COMPUTE = "1";
+  };
+
+  services.wivrn.enable = true;
+}

modules/git.nix

@@ -0,0 +1,27 @@
+{
+  programs.git = {
+    enable = true;
+    config = {
+      signing = {
+        key = "51AE8C6E80E6AF3BDFBE2BF804B31D181764898D";
+        signByDefault = true;
+      };
+      user = {
+        name = "KeksNino";
+        email = "KeksNino@proton.me";
+      };
+      init = {
+        defaultBranch = "main";
+      };
+      push = {
+        autoSetupRemote = true;
+      };
+      commit = {
+        gpgsign = true;
+      };
+      tag = {
+        gpgsign = true;
+      };
+    };
+  };
+}

temp.nix

@@ -0,0 +1,22 @@
+{
+  programs.nixvim.lsp = {
+    servers = {
+      lua_ls.enable = true;
+      nixd = {
+        enable = true;
+        config = {
+          formatting.command = [ "nixfmt" ];
+          nixpkgs.expr = "import <nixpkgs> { }";
+          options =
+            let
+              flake = "(builtins.getFlake \"/home/user/nix-config/\")";
+            in
+            {
+              nixos.expr = "${flake}.nixosConfigurations.desktop.options";
+              home_manager.expr = "${flake}.nixosConfigurations.desktop.options.home-manager.users.type.getSubOptions []";
+            };
+        };
+      };
+    };
+  };
+}