some cleanup
This commit is contained in:
parent
e9e0917f95
commit
80aa739ff5
5 changed files with 9 additions and 39 deletions
|
@ -1,8 +1,7 @@
|
||||||
{ inputs, lib, config, pkgs, ... }: let
|
{ lib, config, pkgs, ... }: let
|
||||||
inherit (lib) mkIf;
|
inherit (lib) mkIf;
|
||||||
inherit (config) conf;
|
inherit (config) conf;
|
||||||
in mkIf conf.apps.enable {
|
in mkIf conf.apps.enable {
|
||||||
nixpkgs.overlays = [ inputs.nur.overlay ];
|
|
||||||
home-manager.users.${conf.username} = {
|
home-manager.users.${conf.username} = {
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
name = "Steam Wrapped";
|
name = "Steam Wrapped";
|
||||||
};
|
};
|
||||||
in mkIf conf.games.enable {
|
in mkIf conf.games.enable {
|
||||||
# programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.gamescope.enable = true;
|
programs.gamescope.enable = true;
|
||||||
programs.gamemode.enable = true;
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
|
@ -33,8 +33,8 @@ in mkIf conf.games.enable {
|
||||||
home-manager.users.${conf.username} = {
|
home-manager.users.${conf.username} = {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.prismlauncher
|
pkgs.prismlauncher
|
||||||
# holo
|
holo
|
||||||
# steam-wrapped
|
steam-wrapped
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.mangohud = {
|
programs.mangohud = {
|
||||||
|
|
|
@ -1,18 +1,10 @@
|
||||||
{ inputs, lib, config, pkgs, ... }: let
|
{ lib, config, pkgs, ... }: let
|
||||||
inherit (lib) mkIf;
|
inherit (lib) mkIf;
|
||||||
inherit (config) conf;
|
inherit (config) conf;
|
||||||
swayosd-style = pkgs.writeText "swayosd.css"
|
swayosd-style = pkgs.writeText "swayosd.css"
|
||||||
(import ./swayosd.css.nix { config = config; }).style;
|
(import ./swayosd.css.nix { config = config; }).style;
|
||||||
in {
|
in {
|
||||||
imports = [
|
|
||||||
./xwl-satellite.service.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = mkIf conf.niri.enable {
|
config = mkIf conf.niri.enable {
|
||||||
nixpkgs.overlays = [
|
|
||||||
inputs.niri.overlays.niri
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
};
|
};
|
||||||
|
|
|
@ -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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -13,6 +13,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
overlays = [
|
||||||
|
inputs.nur.overlay
|
||||||
|
inputs.niri.overlays.niri
|
||||||
|
];
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue