Compare commits
11 commits
b9f41f465b
...
a18adf012f
Author | SHA1 | Date | |
---|---|---|---|
Joseph DiGiovanni | a18adf012f | ||
Joseph DiGiovanni | 05be5eaf2e | ||
Joseph DiGiovanni | 74af24d08f | ||
Joseph DiGiovanni | 71ab0d9eb1 | ||
Joseph DiGiovanni | d51f4104c5 | ||
Joseph DiGiovanni | b2172c8113 | ||
Joseph DiGiovanni | d7e37366c2 | ||
Joseph DiGiovanni | 837f38c0e5 | ||
Joseph DiGiovanni | bd4f4267af | ||
Joseph DiGiovanni | 8fb9cc3efa | ||
Joseph DiGiovanni | 1a1e54062e |
|
@ -1,16 +1,16 @@
|
|||
{ inputs, pkgs, system, ... }:
|
||||
|
||||
let
|
||||
customPkgs = final: prev: {
|
||||
adwaita-for-steam = pkgs.callPackage ./adwaita-for-steam.nix { };
|
||||
customPkgs = final: prev: with pkgs;{
|
||||
adwaita-for-steam = callPackage ./adwaita-for-steam.nix { };
|
||||
|
||||
gnomeExtensions = prev.gnomeExtensions // {
|
||||
rounded-window-corners-reborn = pkgs.callPackage ./gnomeExtensions/rounded-window-corners-reborn.nix { };
|
||||
monitor-brightness-and-volume = callPackage ./gnomeExtensions/monitor-brightness-and-volume.nix { };
|
||||
rounded-window-corners-reborn = callPackage ./gnomeExtensions/rounded-window-corners-reborn.nix { };
|
||||
};
|
||||
|
||||
gpu-screen-recorder = final.unstable.gpu-screen-recorder;
|
||||
icoextract = final.unstable.icoextract; #TODO: remove in next release
|
||||
mkvextract-gtk = pkgs.callPackage ./mkvextract-gtk.nix { };
|
||||
mkvextract-gtk = callPackage ./mkvextract-gtk.nix { };
|
||||
};
|
||||
|
||||
unstableOverlay = final: prev: {
|
||||
|
@ -21,6 +21,10 @@ let
|
|||
hide-top-bar = final.unstable.gnomeExtensions.hide-top-bar; # TODO: Remove when version 117 is in stable
|
||||
};
|
||||
|
||||
godot_4 = final.unstable.godot_4;
|
||||
icoextract = final.unstable.icoextract; #TODO: remove in next release
|
||||
proton-ge-bin = final.unstable.proton-ge-bin;
|
||||
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
inherit (final) config system;
|
||||
};
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, stdenv, fetchurl, unzip, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-monitor-brightness-volume";
|
||||
version = "7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://extensions.gnome.org/extension-data/monitor-brightness-volumeailin.nemui.v${version}.shell-extension.zip";
|
||||
hash = "sha256-NrFZZdQTgnMyYk2Yp2l3RiXM2C+/NHhIPv/Fo/KrXt8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ unzip glib ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/gnome-shell/extensions/monitor-brightness-volume@ailin.nemui
|
||||
mv * $out/share/gnome-shell/extensions/monitor-brightness-volume@ailin.nemui
|
||||
glib-compile-schemas $out/share/gnome-shell/extensions/monitor-brightness-volume@ailin.nemui/schemas
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME Shell extension to control monitor brightness and volume.";
|
||||
homepage = "https://extensions.gnome.org/extension/1292/monitor-brightness-and-volume/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jdig78 ];
|
||||
};
|
||||
}
|
18
flake.lock
18
flake.lock
|
@ -232,11 +232,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721698116,
|
||||
"narHash": "sha256-JdgX4TIroHxE4lBzZSyxxSvWGi8zveV34KfHuS9by2w=",
|
||||
"lastModified": 1722907736,
|
||||
"narHash": "sha256-drU5kbx9EtTqg7rXc6ni0LZuZQy7l/wVgsQ8PSYl5Qw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "7beca30ffc495e5e3980495e1179939abf0ab8a6",
|
||||
"rev": "b3c49142939ba6072cb8bdd6109e36d1b70a055a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -279,11 +279,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"lastModified": 1722813957,
|
||||
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -311,11 +311,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1721548954,
|
||||
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
|
||||
"lastModified": 1722869614,
|
||||
"narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
|
||||
"rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -2,15 +2,14 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
./outline-theme
|
||||
./extensions
|
||||
./gnome-console.nix
|
||||
./firefox-gnome-theme.nix
|
||||
./outline-theme
|
||||
./steam-adwaita-theme.nix
|
||||
];
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/Console".theme = "auto";
|
||||
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-uri = "file:///home/${config.home.username}/Pictures/Wallpapers/Light.jpg";
|
||||
picture-uri-dark = "file:///home/${config.home.username}/Pictures/Wallpapers/Dark.jpg";
|
||||
|
|
38
home/common/gnome/gnome-console.nix
Normal file
38
home/common/gnome/gnome-console.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
dconf.settings = {
|
||||
"org/gnome/Console" =
|
||||
let
|
||||
fontSize = 12;
|
||||
fontWidth = 8;
|
||||
lineSpacing = 2 * 2; # Each line has a space above and below it
|
||||
|
||||
terminalMode = {
|
||||
# Based on VT100 video modes
|
||||
standard = [ 80 24 ];
|
||||
standardTall = [ 80 43 ];
|
||||
extendedWide = [ 132 24 ];
|
||||
extended = [ 132 43 ];
|
||||
};
|
||||
|
||||
terminalSize = terminalMode.extended;
|
||||
in
|
||||
{
|
||||
custom-font = "Unifont " + toString fontSize;
|
||||
|
||||
last-window-size = with builtins; lib.hm.gvariant.mkTuple [
|
||||
(ceil ((elemAt terminalSize 0 * fontWidth) + 12))
|
||||
(ceil (((elemAt terminalSize 1 + .5) * (fontSize + lineSpacing)) + 48))
|
||||
];
|
||||
|
||||
theme = "night";
|
||||
use-system-font = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,9 +15,11 @@
|
|||
openspades
|
||||
steam
|
||||
transmission-gtk
|
||||
ttyper
|
||||
github-desktop
|
||||
unstable.godot_4
|
||||
godot_4
|
||||
youtube-music
|
||||
via
|
||||
neovim
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,5 +3,6 @@
|
|||
{
|
||||
imports = [
|
||||
./custom-wallpaper
|
||||
./extensions
|
||||
];
|
||||
}
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./monitor-brightness-and-volume.nix
|
||||
];
|
||||
}
|
|
@ -0,0 +1,42 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
UUID = "monitor-brightness-volume@ailin.nemui";
|
||||
lightModeBrightness = 50;
|
||||
darkModeBrightness = 20;
|
||||
in
|
||||
{
|
||||
dconf.settings = {
|
||||
"org/gnome/shell".enabled-extensions = [ UUID ];
|
||||
|
||||
"org/gnome/shell/extensions/monitor-brightness-volume".show-volume = false;
|
||||
};
|
||||
|
||||
systemd.user.services.ddcutil-auto-brightness-gnome = {
|
||||
Install.WantedBy = [ "default.target" ];
|
||||
|
||||
Service = {
|
||||
ExecStart = pkgs.writeShellScript "ddcutil-auto-brightness-gnome" ''
|
||||
${pkgs.glib}/bin/gsettings monitor org.gnome.desktop.interface color-scheme | while read -r line; do
|
||||
${pkgs.gnome.gnome-shell}/bin/gnome-extensions disable ${UUID} # Reload the extension to detect the brightness change
|
||||
if [[ "$line" == *"prefer-dark"* ]]; then
|
||||
${pkgs.ddcutil}/bin/ddcutil setvcp 10 ${toString darkModeBrightness}
|
||||
else
|
||||
${pkgs.ddcutil}/bin/ddcutil setvcp 10 ${toString lightModeBrightness}
|
||||
fi
|
||||
# Reload the extension to apply the brightness change
|
||||
${pkgs.gnome.gnome-shell}/bin/gnome-extensions enable ${UUID}
|
||||
done
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = 10;
|
||||
};
|
||||
|
||||
Unit = {
|
||||
After = [ "graphical-session.target" ];
|
||||
Description = "ddcutil auto brightness service for GNOME";
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [ gnomeExtensions.monitor-brightness-and-volume ];
|
||||
}
|
|
@ -13,6 +13,7 @@
|
|||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 5;
|
||||
consoleMode = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -13,11 +13,26 @@ let
|
|||
fi
|
||||
'';
|
||||
|
||||
gsr-record = pkgs.writeShellScriptBin "gsr-start-recording" ''
|
||||
systemctl --user start gpu-screen-recorder.service
|
||||
'';
|
||||
|
||||
gsr-replay = pkgs.writeShellScriptBin "gsr-start-replay" ''
|
||||
systemctl --user start gsr-replay.service
|
||||
'';
|
||||
|
||||
gsr-stop = pkgs.writeShellScriptBin "gsr-stop-replay" ''
|
||||
systemctl --user stop gsr-replay.service
|
||||
'';
|
||||
|
||||
outputDir = "Videos/Replays";
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [
|
||||
gsr-save-replay
|
||||
gsr-replay
|
||||
gsr-record
|
||||
gsr-stop
|
||||
];
|
||||
|
||||
security.wrappers."gsr-kms-server" = {
|
||||
|
@ -43,46 +58,61 @@ in
|
|||
extraGSettingsOverridePackages = with pkgs; [ gnome.gnome-settings-daemon ];
|
||||
};
|
||||
|
||||
systemd.user.services."gsr-replay" = {
|
||||
after = [ "graphical-session.target" ];
|
||||
description = "GPU Screen Recorder replay service";
|
||||
serviceConfig = {
|
||||
Environment = [
|
||||
"AUDIO_CODEC=opus"
|
||||
"CODEC=auto"
|
||||
"CONTAINER=mkv"
|
||||
"FRAMERATE=60"
|
||||
"MAKEFOLDERS=no"
|
||||
"QUALITY=very_high"
|
||||
"REPLAYDURATION=300"
|
||||
"WINDOW=screen"
|
||||
];
|
||||
ExecStart = pkgs.writeShellScript "start-gpu-screen-recorder-replay" ''
|
||||
${pkgs.gpu-screen-recorder}/bin/gpu-screen-recorder -a "$(${pkgs.pulseaudio}/bin/pactl get-default-sink).monitor" -a "$(${pkgs.pulseaudio}/bin/pactl get-default-source)" -ac "$AUDIO_CODEC" -c "$CONTAINER" -f "$FRAMERATE" -k "$CODEC" -mf "$MAKEFOLDERS" -o "${outputDir}" -q "$QUALITY" -r "$REPLAYDURATION" -v no -w "$WINDOW" $ADDITIONAL_ARGS
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
Type = "simple";
|
||||
};
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
systemd.user.services = rec {
|
||||
"gpu-screen-recorder" = {
|
||||
after = [ "graphical-session.target" ];
|
||||
description = "GPU Screen Recorder service";
|
||||
serviceConfig = {
|
||||
Environment = [
|
||||
"AUDIO_CODEC=opus"
|
||||
"CODEC=auto"
|
||||
"CONTAINER=mkv"
|
||||
"FRAMERATE=60"
|
||||
"MAKEFOLDERS=no"
|
||||
"QUALITY=very_high"
|
||||
"WINDOW=screen"
|
||||
];
|
||||
ExecStart = pkgs.writeShellScript "start-gpu-screen-recorder-replay" ''
|
||||
#${pkgs.killall}/bin/killall gpu-screen-recorder
|
||||
|
||||
systemd.user.services."gsr-audio-device-changer" = {
|
||||
after = [ "gsr-replay.service" ];
|
||||
description = "Restart GPU Screen Recorder replay service on audio device change";
|
||||
requires = [ "gsr-replay.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = pkgs.writeShellScript "gsr-restart-on-audio-device-change" ''
|
||||
${pkgs.pulseaudio}/bin/pactl subscribe | while read -r event; do
|
||||
if [[ $event == *"Event 'change' on server"* ]]; then
|
||||
systemctl --user restart gsr-replay.service
|
||||
if [ -n "$REPLAYDURATION" ]; then
|
||||
REPLAYARG="-r $REPLAYDURATION"
|
||||
else
|
||||
REPLAYARG=""
|
||||
fi
|
||||
done
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = "5s";
|
||||
Type = "simple";
|
||||
|
||||
${pkgs.gpu-screen-recorder}/bin/gpu-screen-recorder $REPLAYARG -a "$(${pkgs.pulseaudio}/bin/pactl get-default-sink).monitor" -a "$(${pkgs.pulseaudio}/bin/pactl get-default-source)" -ac "$AUDIO_CODEC" -c "$CONTAINER" -f "$FRAMERATE" -k "$CODEC" -mf "$MAKEFOLDERS" -o "${outputDir}" -q "$QUALITY" -v no -w "$WINDOW" $ADDITIONAL_ARGS
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
Type = "simple";
|
||||
};
|
||||
};
|
||||
|
||||
"gsr-replay" = gpu-screen-recorder // {
|
||||
description = "GPU Screen Recorder replay service";
|
||||
serviceConfig = gpu-screen-recorder.serviceConfig // {
|
||||
Environment = gpu-screen-recorder.serviceConfig.Environment ++ [ "REPLAYDURATION=300" ];
|
||||
};
|
||||
};
|
||||
|
||||
"gsr-replay-change-audio" = {
|
||||
after = [ "gsr-replay.service" ];
|
||||
description = "Restart GPU Screen Recorder replay service on audio device change";
|
||||
requires = [ "gsr-replay.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = pkgs.writeShellScript "gsr-restart-on-audio-device-change" ''
|
||||
${pkgs.pulseaudio}/bin/pactl subscribe | while read -r event; do
|
||||
if [[ $event == *"Event 'change' on server"* ]]; then
|
||||
systemctl --user restart gsr-replay.service
|
||||
fi
|
||||
done
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
Type = "simple";
|
||||
};
|
||||
wantedBy = [ "gsr-replay.service" ];
|
||||
};
|
||||
wantedBy = [ "gsr-replay.service" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,11 +2,9 @@
|
|||
|
||||
{
|
||||
config = lib.mkIf config.hardware.monitor-control.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
ddcutil
|
||||
];
|
||||
|
||||
boot.kernelModules = [ "i2c-dev" ];
|
||||
environment.systemPackages = with pkgs; [ ddcutil ];
|
||||
hardware.i2c.enable = true;
|
||||
users.groups."i2c".members = builtins.attrNames config.users.users;
|
||||
};
|
||||
|
||||
options.hardware.monitor-control.enable = lib.mkEnableOption "enable support for controlling monitor settings.";
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
{ config, lib, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
config.programs.steam = lib.mkIf config.programs.steam.enable {
|
||||
dedicatedServer.openFirewall = lib.mkDefault true;
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
gamescopeSession.enable = lib.mkDefault true;
|
||||
localNetworkGameTransfers.openFirewall = lib.mkDefault true;
|
||||
remotePlay.openFirewall = lib.mkDefault true;
|
||||
|
|
Loading…
Reference in a new issue