way too many changes to describe

8 files changed, 19 insertions, 24 deletions

diff --git a/os/core/bootloader.nix b/os/core/bootloader.nix
index da43050..8ba9406 100644
--- a/os/core/bootloader.nix
+++ b/os/core/bootloader.nix
@@ -13,6 +13,9 @@ in
       boot.loader.efi.canTouchEfiVariables = true;
       boot.supportedFilesystems = [ "ntfs" ];
       boot.kernelParams = [ "quiet" "splash" ];
+      systemd.settings.Manager = {
+        DefaultTimeoutStopSec = "5s";
+      };
     }
 
     (lib.mkIf (cfg == "systemd-boot") {
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 8c22940..3bb2291 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -34,18 +34,10 @@ in
         initrd.enable = true;
         overdrive.enable = true;
       };
-      boot.kernelParams = [ "amdgpu.gpu_recovery=1" ];
+      # boot.kernelParams = [ "amdgpu.gpu_recovery=1" ];
     })
 
     (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") {
-      boot.kernelPackages = pkgs.linuxPackages_latest;
-      chaotic.mesa-git = {
-        enable = true;
-        fallbackSpecialisation = false;
-        extraPackages = with pkgs; [
-          rocmPackages.clr.icd
-        ];
-      };
     })
 
     (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") {
diff --git a/os/srv/files.nix b/os/srv/files.nix
index 049ec48..2e8faff 100644
--- a/os/srv/files.nix
+++ b/os/srv/files.nix
@@ -18,8 +18,6 @@ in
         plugins = with pkgs; [
           thunar-volman
           thunar-archive-plugin
-          thunar-vcs-plugin
-          thunar-media-tags-plugin
         ];
       };
       services = {
@@ -33,13 +31,8 @@ in
       services.gvfs.enable = true;
 
       environment.systemPackages = with pkgs; [
-        nautilus
         trashy
         gdu
-
-        unzip
-        p7zip
-        unrar
         pxz
         pigz
       ];
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index ffa80fd..16ef9f1 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -18,6 +18,7 @@ in
       };
 
       environment.systemPackages = with pkgs; [
+        openmw
         protonup-rs
         heroic
         clinfo
@@ -42,7 +43,7 @@ in
         protontricks.enable = true;
 
         extraCompatPackages = with pkgs; [
-          proton-ge-custom
+          proton-ge-bin
         ];
       };
     })
diff --git a/os/srv/kvm.nix b/os/srv/kvm.nix
index 47a4265..93a1eed 100644
--- a/os/srv/kvm.nix
+++ b/os/srv/kvm.nix
@@ -11,6 +11,8 @@ in
       qemu.swtpm.enable = true;
     };
 
+    systemd.services.libvirt-guests.enable = false;
+
     programs.virt-manager.enable = true;
 
     boot.initrd.kernelModules = lib.optional (config.os.core.drivers.amd.enable or false) "kvm-amd";
diff --git a/os/srv/nix-helper.nix b/os/srv/nix-helper.nix
index 4999908..63b3182 100644
--- a/os/srv/nix-helper.nix
+++ b/os/srv/nix-helper.nix
@@ -15,6 +15,10 @@ in
       flake = "/etc/nixos";
     };
 
+    environment.sessionVariables = {
+      NH_OS_FLAKE = "/etc/nixos";
+    };
+
     environment.systemPackages = with pkgs; [
       nix-output-monitor
       nvd
diff --git a/os/wm/niri.nix b/os/wm/niri.nix
index c876dd1..248ab9e 100644
--- a/os/wm/niri.nix
+++ b/os/wm/niri.nix
@@ -1,4 +1,4 @@
-{ inputs, config, lib, pkgs, username, ... }:
+{ inputs, config, lib, username, ... }:
 let
   cfg = config.os.wm.niri;
 in
@@ -8,17 +8,13 @@ in
   options.os.wm.niri.enable = lib.mkEnableOption "Niri";
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+    # nixpkgs.overlays = [ inputs.niri.overlays.niri ];
 
     programs.niri = {
       enable = true;
-      package = pkgs.niri-unstable;
+      # package = pkgs.niri-unstable;
     };
 
-    environment.systemPackages = with pkgs; [
-      wl-restart
-    ];
-
     os.srv.compat.enable = true;
     home-manager.users.${username}.hm.env.niri.enable = true;
   };
diff --git a/os/wm/wm.nix b/os/wm/wm.nix
index 8254722..3d72103 100644
--- a/os/wm/wm.nix
+++ b/os/wm/wm.nix
@@ -15,6 +15,10 @@ in
       enable = true;
       xdgOpenUsePortal = true;
       extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      config.common = {
+        "org.freedesktop.impl.portal.ScreenCast" = "gnome";
+        "default" = [ "gtk" ];
+      };
     };
   };
 }