gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 = { env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1"; FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ 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-base
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -128,7 +128,7 @@ in
systemd.services."kattv@" = { systemd.services."kattv@" = {
environment = env; 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" ]; after = [ "nginx.service" ];
description = "RTMP stream of kat cam"; description = "RTMP stream of kat cam";
serviceConfig = { serviceConfig = {

4
config/services/kattv.nix
View file

@ -4,7 +4,7 @@ let
env = { env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1"; FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ 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-base
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -58,7 +58,7 @@ in
description = "RTMP stream of kat cam"; description = "RTMP stream of kat cam";
bindsTo = [ "dev-videomew.device" ]; bindsTo = [ "dev-videomew.device" ];
environment = env; 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 = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "10s"; RestartSec = "10s";

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

@ -6,7 +6,7 @@ let
env = { env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1"; FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ 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-base
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -114,7 +114,7 @@ in
systemd.services."kattv2@" = { systemd.services."kattv2@" = {
environment = env; 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" ]; after = [ "nginx.service" ];
description = "RTMP stream of kat cam"; description = "RTMP stream of kat cam";
serviceConfig = { serviceConfig = {

4
config/services/kattv2.nix
View file

@ -4,7 +4,7 @@ let
env = { env = {
FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1"; FREI0R_PATH = "${pkgs.frei0r}/lib/frei0r-1";
GST_PLUGIN_SYSTEM_PATH_1_0 = with pkgs.gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ 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-base
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -59,7 +59,7 @@ in
description = "RTMP stream of kat cam"; description = "RTMP stream of kat cam";
bindsTo = [ "dev-videomew.device" ]; bindsTo = [ "dev-videomew.device" ];
environment = env; 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 = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "10s"; 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 exiftool
thunderbird thunderbird
mumble-develop mumble-develop
dino-omemo dino
tdesktop tdesktop
headsetcontrol headsetcontrol
transmission-remote-gtk transmission-remote-gtk

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

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

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

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

36
flake.lock generated
View file

@ -20,11 +20,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1644261878, "lastModified": 1645982274,
"narHash": "sha256-V0Dn63YTjvWdPvdmtMsYZWPkxmkRK8C1xGCQV4Sf3qw=", "narHash": "sha256-8sesqtcaGhZB2HXITTBNf+g1YzMYJry3fLzhGGxHQqo=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "a8ad4007716a9b1bd796394c7f3e92faf6f4c75c", "rev": "f90f7c0a758f2142a448b9e59cc5d6f768b9275b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +86,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1644345394, "lastModified": 1646731473,
"narHash": "sha256-5Fq+YnFueSoIXpWZnGD0XVLdufp3KbIiIff5827ap+w=", "narHash": "sha256-FHZTySgUkI4lseaiJfeht/sX4FHQHeysxTrhyQlmmf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "206e22c6ba3f8cd28649d5360e2838f3bb90aa55", "rev": "3dde0cf09244b994609c9eae5e43eb287cfa4616",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +264,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644346464, "lastModified": 1646559628,
"narHash": "sha256-hS8hwbr/PflMIfTWTmB7Xo5jIrsWhSAqtz5XXxPa0zQ=", "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e2aa1f598674aa9c06f28f5db60b89f37f1e961b", "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1644014516, "lastModified": 1646131459,
"narHash": "sha256-PkD35S6lduaU6mLcraFY0vj608RPv1kQp5uaFd/s26o=", "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "ff540dbe20556f6119d80f5c79796a0698a4ee38", "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -391,11 +391,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1644278373, "lastModified": 1646497237,
"narHash": "sha256-9riYZyVing7OQUUWELSojlbt9u0xDh0Xm5Eg8FQn0fc=", "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "60c52a73f1d5858020ac4f161cd5bf1c9650f8b8", "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +423,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1644361709, "lastModified": 1646756936,
"narHash": "sha256-Tp0EWOnQ7oNAjUBlZtL7+QiSdSIwRTTkNg/k3zXRZ6A=", "narHash": "sha256-OTlr3W3MzR7KetZnwlMRCnpCGDz7v8JEMkAGvcew+hE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "f7d931586b4c0210636320d90e55a44d5289b665", "rev": "0d073ca832cb3ef4e8e4527b4d2d9d6ae7d7be4d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
overlays/default.nix
View file

@ -6,7 +6,6 @@ let
overlays = [ overlays = [
(import ./nur { inherit inputs; }) (import ./nur { inherit inputs; })
(import inputs.emacs-overlay) (import inputs.emacs-overlay)
(import ./rustfmt)
(import ./dns { inherit inputs; }) (import ./dns { inherit inputs; })
(import ./local) (import ./local)
] ++ (map (path: import "${path}/overlay.nix") [ ] ++ (map (path: import "${path}/overlay.nix") [

4
overlays/local/kat-hugosite.nix
View file

@ -3,8 +3,8 @@
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kittywitch"; owner = "kittywitch";
repo = "hugosite"; repo = "hugosite";
rev = "ee2bdd87dd5f6a59234f7102dea8189d22048a4c"; rev = "2dc44e1668d38bb706b2290387a936c26d0dd50b";
sha256 = "sha256-j/fRTm5GIXmtmsdOBF2ILyYFCN+j39Ul5/kB2OoDQt4="; sha256 = "sha256-HuC8NebVfp7aXciFhaFbUin5g/ChH3g+zpRNJ/6qq7g=";
}; };
buildPhase = '' buildPhase = ''
${hugo}/bin/hugo ${hugo}/bin/hugo