From 80aa739ff58a795db966185a48ffac8f0087a78e Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 14 Oct 2024 22:36:21 +0200
Subject: [PATCH] some cleanup

---
 modules/apps/firefox.nix               |  3 +--
 modules/games/default.nix              |  6 +++---
 modules/niri/default.nix               | 10 +---------
 modules/niri/xwl-satellite.service.nix | 25 -------------------------
 modules/nix/default.nix                |  4 ++++
 5 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 modules/niri/xwl-satellite.service.nix

diff --git a/modules/apps/firefox.nix b/modules/apps/firefox.nix
index bd1a4cf..e5307f8 100644
--- a/modules/apps/firefox.nix
+++ b/modules/apps/firefox.nix
@@ -1,8 +1,7 @@
-{ inputs, lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: let
   inherit (lib) mkIf;
   inherit (config) conf;
 in mkIf conf.apps.enable {
-  nixpkgs.overlays = [ inputs.nur.overlay ];
   home-manager.users.${conf.username} = {
     programs.firefox = {
       enable = true;
diff --git a/modules/games/default.nix b/modules/games/default.nix
index c2f37e8..e81bae2 100644
--- a/modules/games/default.nix
+++ b/modules/games/default.nix
@@ -21,7 +21,7 @@
     name = "Steam Wrapped";
   };
 in mkIf conf.games.enable {
-  # programs.steam.enable = true;
+  programs.steam.enable = true;
   programs.gamescope.enable = true;
   programs.gamemode.enable = true;
 
@@ -33,8 +33,8 @@ in mkIf conf.games.enable {
   home-manager.users.${conf.username} = {
     home.packages = [
       pkgs.prismlauncher
-      # holo
-      # steam-wrapped
+      holo
+      steam-wrapped
     ];
 
     programs.mangohud = {
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index d015312..38c41f7 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,18 +1,10 @@
-{ inputs, lib, config, pkgs, ... }: let
+{ lib, config, pkgs, ... }: let
   inherit (lib) mkIf;
   inherit (config) conf;
   swayosd-style = pkgs.writeText "swayosd.css" 
     (import ./swayosd.css.nix { config = config; }).style;
 in {
-  imports = [
-    ./xwl-satellite.service.nix
-  ];
-
   config = mkIf conf.niri.enable {
-    nixpkgs.overlays = [
-      inputs.niri.overlays.niri
-    ];
-
     environment.sessionVariables = {
       NIXOS_OZONE_WL = "1";
     };
diff --git a/modules/niri/xwl-satellite.service.nix b/modules/niri/xwl-satellite.service.nix
deleted file mode 100644
index 01ccc64..0000000
--- a/modules/niri/xwl-satellite.service.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, config, pkgs, ... }: let
-  inherit (lib) mkIf;
-  inherit (config) conf;
-in mkIf conf.niri.enable {
-  environment.systemPackages = with pkgs; [ xwayland-satellite-unstable xwayland ];
-  systemd.user.services.xwayland-satellite = {
-    description = "Xwayland outside your Wayland";
-
-    wantedBy = [ "graphical-session.target" ];
-    bindsTo = [ "graphical-session.target" ];
-    partOf = [ "graphical-session.target" ];
-    after = [ "graphical-session.target" ];
-    requisite = [ "graphical-session.target" ];
-
-    serviceConfig = {
-      Type = "notify";
-      NotifyAccess = "all";
-      ExecStart = "/${pkgs.xwayland-satellite}/bin/xwayland-satellite";
-      StandardOutput = "journal";
-
-      Restart = "on-failure";
-      RestartSec = "1s";
-    };
-  };
-}
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 934a6be..08ad521 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -13,6 +13,10 @@
   };
 
   nixpkgs = {
+    overlays = [
+      inputs.nur.overlay
+      inputs.niri.overlays.niri
+    ];
     config = {
       allowUnfree = true;
     };