Merge branch 'main' of git.firelilith.org:lilith/nixos
This commit is contained in:
commit
b6f7d20631
5 changed files with 52 additions and 17 deletions
|
|
@ -25,15 +25,22 @@
|
|||
|
||||
monitor = [ ",preferred,1" ];
|
||||
|
||||
ecosystem = {
|
||||
"no_update_news" = true;
|
||||
"no_donation_nag" = true;
|
||||
};
|
||||
|
||||
exec-once = [
|
||||
"hyprlock"
|
||||
"ags"
|
||||
"[workspace special:keepass silent] keepassxc"
|
||||
];
|
||||
|
||||
exec = [ "[workspace special:keepass silent] keepassxc" ];
|
||||
|
||||
windowrule = [
|
||||
"workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$"
|
||||
"workspace unset,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC"
|
||||
"noanim, class:^ueberzugpp_(.*)$"
|
||||
];
|
||||
|
||||
workspace = [
|
||||
|
|
@ -99,6 +106,7 @@
|
|||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
smart_split = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
|
|
@ -111,14 +119,14 @@
|
|||
|
||||
bind = [
|
||||
"$mainMod, Q, exec, $terminal"
|
||||
"$mainMod, W, exec, $terminal -e yazi"
|
||||
"$mainMod, C, killactive,"
|
||||
"$mainMod, backspace, exec, hyprlock"
|
||||
"$mainMod, E, exec, $fileManager"
|
||||
"$mainMod, A, togglefloating,"
|
||||
"$mainMod, R, exec, rofi -show drun"
|
||||
|
||||
"$mainMod, D, pseudo,"
|
||||
"$mainMod, A, togglefloating,"
|
||||
"$mainMod, S, togglesplit,"
|
||||
"$mainMod, D, pseudo,"
|
||||
"$mainMod, F, fullscreen,"
|
||||
|
||||
"$mainMod, P, togglespecialworkspace, keepass"
|
||||
|
|
|
|||
|
|
@ -35,5 +35,9 @@
|
|||
prismlauncher
|
||||
lutris
|
||||
# steamtinkerlaunch
|
||||
|
||||
unzip
|
||||
ueberzugpp
|
||||
yazi
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,25 @@
|
|||
{...}:{
|
||||
{ ... }:
|
||||
{
|
||||
services.ssh-agent.enable = true;
|
||||
}
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
|
||||
matchBlocks = {
|
||||
"hpc" = {
|
||||
user = "benstem";
|
||||
hostname = "login1.hpc.uni-potsdam.de";
|
||||
};
|
||||
|
||||
"lilith-lab" = {
|
||||
user = "lilith";
|
||||
hostname = "nixserver";
|
||||
};
|
||||
|
||||
"lilith-server" = {
|
||||
user = "lilith";
|
||||
hostname = "2a01:4f9:4a:1ecb::2:";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,32 +4,36 @@
|
|||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
gaming-host = lib.mkIf (!config.gaming.client-only);
|
||||
in
|
||||
{
|
||||
|
||||
options.gaming.enable = lib.mkEnableOption "Enable steam and related software";
|
||||
options.gaming.client-only = lib.mkEnableOption "Only enable steam, to stream via SteamLink";
|
||||
|
||||
config = lib.mkIf config.gaming.enable {
|
||||
programs = {
|
||||
gamescope = {
|
||||
gamescope = gaming-host {
|
||||
enable = true;
|
||||
capSysNice = true;
|
||||
};
|
||||
|
||||
steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
gamescopeSession.enable = gaming-host true;
|
||||
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
remotePlay.openFirewall = gaming-host true;
|
||||
dedicatedServer.openFirewall = gaming-host true;
|
||||
localNetworkGameTransfers.openFirewall = gaming-host true;
|
||||
};
|
||||
|
||||
gamemode.enable = true;
|
||||
gamemode.enable = gaming-host true;
|
||||
};
|
||||
|
||||
hardware.steam-hardware.enable = true;
|
||||
hardware.steam-hardware.enable = gaming-host true;
|
||||
|
||||
environment = {
|
||||
environment = gaming-host {
|
||||
systemPackages = with pkgs; [
|
||||
mangohud
|
||||
protonup
|
||||
|
|
@ -38,7 +42,7 @@
|
|||
};
|
||||
|
||||
# SteamVR kernel patch for AMDGPU
|
||||
boot.kernelPatches = [
|
||||
boot.kernelPatches = gaming-host [
|
||||
{
|
||||
name = "amdgpu-ignore-ctx-privileges";
|
||||
patch = pkgs.fetchpatch {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,5 @@
|
|||
allowed = [
|
||||
"steam"
|
||||
"steam-unwrapped"
|
||||
|
||||
# "rocm-runtime-ext"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue