kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-10 04:49:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

Various updates, flake update

Browse source
This commit is contained in:
kat witch 2022-03-08 17:20:28 +00:00 • committed by kat
parent e9e4a844f5
commit ff1d56277f
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
11 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/services/kattv-ingest.nix
View file

@ -6,7 +6,7 @@ let
env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [
gstreamer
gstreamer.out
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@ -128,7 +128,7 @@ in
systemd.services."kattv@" = {
environment = env;
script = "exec ${pkgs.gst_all_1.gstreamer.dev}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
script = "exec ${pkgs.gst_all_1.gstreamer}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
after = [ "nginx.service" ];
description = "RTMP stream of kat cam";
serviceConfig = {

4
config/services/kattv.nix
View file

@ -4,7 +4,7 @@ let
env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [
gstreamer
gstreamer.out
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@ -58,7 +58,7 @@ in
description = "RTMP stream of kat cam";
bindsTo = [ "dev-videomew.device" ];
environment = env;
script = "exec ${pkgs.gst_all_1.gstreamer.dev}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
script = "exec ${pkgs.gst_all_1.gstreamer}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
serviceConfig = {
Restart = "on-failure";
RestartSec = "10s";

4
config/services/kattv2-ingest.nix
View file

@ -6,7 +6,7 @@ let
env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [
gstreamer
gstreamer.out
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@ -114,7 +114,7 @@ in
systemd.services."kattv2@" = {
environment = env;
script = "exec ${pkgs.gst_all_1.gstreamer.dev}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
script = "exec ${pkgs.gst_all_1.gstreamer}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
after = [ "nginx.service" ];
description = "RTMP stream of kat cam";
serviceConfig = {

4
config/services/kattv2.nix
View file

@ -4,7 +4,7 @@ let
env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [
gstreamer
gstreamer.out
gst-plugins-base
gst-plugins-good
gst-plugins-bad
@ -59,7 +59,7 @@ in
description = "RTMP stream of kat cam";
bindsTo = [ "dev-videomew.device" ];
environment = env;
script = "exec ${pkgs.gst_all_1.gstreamer.dev}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
script = "exec ${pkgs.gst_all_1.gstreamer}/bin/gst-launch-1.0 -e --no-position ${pkgs.lib.gst.pipelineShellString pipeline}";
serviceConfig = {
Restart = "on-failure";
RestartSec = "10s";

2
config/tf

@ -1 +1 @@
Subproject commit 323f3360be9b09dd2359fd423f235edfafebc9d0
Subproject commit 1b7ca814a7cb07f6bbf168f6ec234c4421adcfe3

2
config/users/kat/gui/packages.nix
View file

@ -9,7 +9,7 @@
exiftool
thunderbird
mumble-develop
dino-omemo
dino
tdesktop
headsetcontrol
transmission-remote-gtk

12
config/users/kat/i3/i3.nix
View file

@ -1,6 +1,7 @@
{ config, base16, pkgs, lib, ... }: with lib;
{
let
lockCmd = "${pkgs.i3lock}/bin/i3lock -nc 000000";
in {
programs.zsh.loginExtra = ''
if [[ -z "''${TMUX-}" && -z "''${DISPLAY-}" && "''${XDG_VTNR-}" = 1 && $(${pkgs.coreutils}/bin/id -u) != 0 ]]; then
${pkgs.xorg.xinit}/bin/startx
@ -11,7 +12,7 @@
i3gopher.enable = true;
screen-locker = {
enable = true;
lockCmd = "${pkgs.i3lock-fancy}/bin/i3lock-fancy -n";
inherit lockCmd;
xautolock.enable = true;
};
};
@ -58,7 +59,6 @@
];
workspaceBindings' = map (lib.mapAttrsToList bindsym) workspaceBindings;
workspaceBindingsStr = lib.concatStringsSep "\n" (lib.flatten workspaceBindings');
lockCommand = "${pkgs.i3lock-blur}/bin/i3lock-color -n";
in
{
enable = true;
@ -74,7 +74,7 @@
modes = {
"System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
{
"l" = "exec ${lockCommand}, mode default";
"l" = "exec ${lockCmd}, mode default";
"e" = "exit, mode default";
"s" = "exec systemctl suspend, mode default";
"h" = "exec systemctl hibernate, mode default";
@ -141,7 +141,7 @@
keybindings = {
"${cfg.modifier}+Return" = "exec ${cfg.terminal}";
"${cfg.modifier}+x" = "exec ${lockCommand}";
"${cfg.modifier}+x" = "exec ${lockCmd}";
# focus windows - regular
"${cfg.modifier}+Left" = "focus left";

2
config/users/kat/media/packages.nix
View file

@ -2,8 +2,8 @@
{
home.packages = with pkgs; [
gst_all_1.gstreamer.dev
gst_all_1.gstreamer
gst_all_1.gstreamer.out
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad