feat: added steam data sink
feat: removed autorandr fix: added streamdeck config location
This commit is contained in:
parent
052f438b23
commit
3263277616
|
@ -34,8 +34,4 @@
|
||||||
applications = 10;
|
applications = 10;
|
||||||
desktop = 10;
|
desktop = 10;
|
||||||
};
|
};
|
||||||
services.xserver = {
|
|
||||||
layout = "de";
|
|
||||||
xkbVariant = "bone";
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,8 +32,18 @@
|
||||||
};
|
};
|
||||||
zpool = with lib.disko.zfs; {
|
zpool = with lib.disko.zfs; {
|
||||||
rpool = defaultZpoolOptions // {datasets = defaultZfsDatasets;};
|
rpool = defaultZpoolOptions // {datasets = defaultZfsDatasets;};
|
||||||
panzer = defaultZpoolOptions // {datasets = {};};
|
panzer =
|
||||||
|
defaultZpoolOptions
|
||||||
|
// {
|
||||||
|
datasets = {
|
||||||
|
"local" = unmountable;
|
||||||
|
"local/state" = filesystem "/panzer/state";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
fileSystems."/state".neededForBoot = true;
|
||||||
|
fileSystems."/panzer/state".neededForBoot = true;
|
||||||
boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
|
boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
|
||||||
|
boot.initrd.luks.devices.enc-panzer.allowDiscards = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
imports = [./users.nix];
|
imports = [./users.nix];
|
||||||
# to allow all users to access hm managed persistent folders
|
# to allow all users to access hm managed persistent folders
|
||||||
programs.fuse.userAllowOther = true;
|
programs.fuse.userAllowOther = true;
|
||||||
fileSystems."/state".neededForBoot = true;
|
|
||||||
environment.persistence."/state" = {
|
environment.persistence."/state" = {
|
||||||
hideMounts = true;
|
hideMounts = true;
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,22 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = mkIf config.programs.streamdeck-ui.enable {
|
config = mkIf config.programs.streamdeck-ui.enable {
|
||||||
home.packages = [pkgs.streamdeck-ui];
|
systemd.user = {
|
||||||
home.sessionVariables.STREAMDECK_UI_CONFIG = "${config.xdg.configHome}/streamdeck-ui/config.json";
|
services = {
|
||||||
|
streamdeck = {
|
||||||
|
Unit = {
|
||||||
|
Description = "start streamdeck-ui";
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
Type = "exec";
|
||||||
|
ExecStart = "${pkgs.streamdeck-ui}/bin/streamdeck-ui --no-ui";
|
||||||
|
Environment = "STREAMDECK_UI_CONFIG=${config.xdg.configHome}/streamdeck-ui/config.json";
|
||||||
|
};
|
||||||
|
Install.WantedBy = ["graphical-session.target"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
xdg.configFile.streamdeck-ui = {
|
xdg.configFile.streamdeck-ui = {
|
||||||
target = "streamdeck-ui/config.json";
|
target = "streamdeck-ui/config.json";
|
||||||
source = settingsFormat.generate "config.json" {
|
source = settingsFormat.generate "config.json" {
|
||||||
|
|
|
@ -27,7 +27,6 @@ lib.optionalAttrs (!minimal) {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.autorandr.enable = true;
|
|
||||||
services.udev.extraRules = let
|
services.udev.extraRules = let
|
||||||
exe =
|
exe =
|
||||||
pkgs.writeShellScript "set-key-repeat"
|
pkgs.writeShellScript "set-key-repeat"
|
||||||
|
@ -40,7 +39,6 @@ lib.optionalAttrs (!minimal) {
|
||||||
# sleep to give X time to access the keyboard
|
# sleep to give X time to access the keyboard
|
||||||
(sleep 0.2; ${pkgs.util-linux}/bin/runuser -u "$user" -- ${pkgs.xorg.xset}/bin/xset r rate \
|
(sleep 0.2; ${pkgs.util-linux}/bin/runuser -u "$user" -- ${pkgs.xorg.xset}/bin/xset r rate \
|
||||||
${toString config.services.xserver.autoRepeatDelay} ${toString config.services.xserver.autoRepeatInterval})&
|
${toString config.services.xserver.autoRepeatDelay} ${toString config.services.xserver.autoRepeatInterval})&
|
||||||
echo "lol" > /tmp/lel
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{pkgs, ...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
programs.autorandr = let
|
programs.autorandr = let
|
||||||
dpi_hd = 96;
|
dpi_hd = 96;
|
||||||
dpi_uhd = 216;
|
dpi_uhd = 216;
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
./rofi.nix
|
./rofi.nix
|
||||||
./autorandr.nix
|
|
||||||
./i3.nix
|
./i3.nix
|
||||||
./wallpapers.nix
|
./wallpapers.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -9,6 +9,10 @@
|
||||||
xsession.windowManager.i3 = {
|
xsession.windowManager.i3 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
|
startup = [
|
||||||
|
{command = "xrandr --output DVI-D-0 --mode 1920x1080 --pos 0x0 --rate 60.00 --output DP-4 --mode 2560x1440 --pos 1920x720 --primary --rate 144 --output HDMI-0 --pos 0x1080 --rate 60.00";}
|
||||||
|
{command = "systemctl --user start set-wallpaper.timer streamdeck.service";}
|
||||||
|
];
|
||||||
menu = "rofi -show drun";
|
menu = "rofi -show drun";
|
||||||
keybindings = let
|
keybindings = let
|
||||||
cfg = config.xsession.windowManager.i3.config;
|
cfg = config.xsession.windowManager.i3.config;
|
||||||
|
|
|
@ -17,7 +17,7 @@ in {
|
||||||
Description = "Set a random wallpaper every 3 minutes";
|
Description = "Set a random wallpaper every 3 minutes";
|
||||||
};
|
};
|
||||||
Timer = {
|
Timer = {
|
||||||
OnActiveSec = "5 sec";
|
OnActiveSec = "10 sec";
|
||||||
OnUnitActiveSec = "3 min";
|
OnUnitActiveSec = "3 min";
|
||||||
};
|
};
|
||||||
Install.WantedBy = [
|
Install.WantedBy = [
|
||||||
|
|
|
@ -15,9 +15,7 @@ if command -v dbus-update-activation-environment >/dev/null 2>&1; then
|
||||||
dbus-update-activation-environment DISPLAY XAUTHORITY
|
dbus-update-activation-environment DISPLAY XAUTHORITY
|
||||||
fi
|
fi
|
||||||
|
|
||||||
autorandr -c
|
|
||||||
# I3 does no start graphical session.target because ????
|
# I3 does no start graphical session.target because ????
|
||||||
# so we need to manually start all service we want
|
# so we need to manually start all service we want
|
||||||
systemctl --user start set-wallpaper.timer streamdeck.service
|
|
||||||
xset r rate 235 60
|
xset r rate 235 60
|
||||||
exec i3
|
exec i3
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
{
|
{
|
||||||
home.persistence."/state" = {
|
nixosConfig,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
home.persistence =
|
||||||
|
{
|
||||||
|
"/state" = {
|
||||||
directories = [
|
directories = [
|
||||||
"repos"
|
"repos"
|
||||||
"Downloads"
|
"Downloads"
|
||||||
|
@ -28,3 +34,9 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
// lib.mkIf (nixosConfig.disko.devices.zpool ? "panzer") {
|
||||||
|
"/panzer/state".directories = [
|
||||||
|
".local/share/SteamPanzer"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue