From ff1d56277ff396cede805479937f1a8782aaae93 Mon Sep 17 00:00:00 2001 From: kat witch Date: Tue, 8 Mar 2022 17:20:28 +0000 Subject: [PATCH] Various updates, flake update --- config/services/kattv-ingest.nix | 4 ++-- config/services/kattv.nix | 4 ++-- config/services/kattv2-ingest.nix | 4 ++-- config/services/kattv2.nix | 4 ++-- config/tf | 2 +- config/users/kat/gui/packages.nix | 2 +- config/users/kat/i3/i3.nix | 12 +++++----- config/users/kat/media/packages.nix | 2 +- flake.lock | 36 ++++++++++++++--------------- overlays/default.nix | 1 - overlays/local/kat-hugosite.nix | 4 ++-- 11 files changed, 37 insertions(+), 38 deletions(-) diff --git a/config/services/kattv-ingest.nix b/config/services/kattv-ingest.nix index d7c4da9e..87ffcc5a 100644 --- a/config/services/kattv-ingest.nix +++ b/config/services/kattv-ingest.nix @@ -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 = { diff --git a/config/services/kattv.nix b/config/services/kattv.nix index 71dc597a..372ca9b6 100644 --- a/config/services/kattv.nix +++ b/config/services/kattv.nix @@ -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"; diff --git a/config/services/kattv2-ingest.nix b/config/services/kattv2-ingest.nix index 9c92c0dc..fd3eceab 100644 --- a/config/services/kattv2-ingest.nix +++ b/config/services/kattv2-ingest.nix @@ -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 = { diff --git a/config/services/kattv2.nix b/config/services/kattv2.nix index ef964871..6c793f32 100644 --- a/config/services/kattv2.nix +++ b/config/services/kattv2.nix @@ -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"; diff --git a/config/tf b/config/tf index 323f3360..1b7ca814 160000 --- a/config/tf +++ b/config/tf @@ -1 +1 @@ -Subproject commit 323f3360be9b09dd2359fd423f235edfafebc9d0 +Subproject commit 1b7ca814a7cb07f6bbf168f6ec234c4421adcfe3 diff --git a/config/users/kat/gui/packages.nix b/config/users/kat/gui/packages.nix index 0fce1b06..e669f8f2 100644 --- a/config/users/kat/gui/packages.nix +++ b/config/users/kat/gui/packages.nix @@ -9,7 +9,7 @@ exiftool thunderbird mumble-develop - dino-omemo + dino tdesktop headsetcontrol transmission-remote-gtk diff --git a/config/users/kat/i3/i3.nix b/config/users/kat/i3/i3.nix index edbd4c67..a981265f 100644 --- a/config/users/kat/i3/i3.nix +++ b/config/users/kat/i3/i3.nix @@ -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"; diff --git a/config/users/kat/media/packages.nix b/config/users/kat/media/packages.nix index d5f0222d..bcd15d91 100644 --- a/config/users/kat/media/packages.nix +++ b/config/users/kat/media/packages.nix @@ -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 diff --git a/flake.lock b/flake.lock index b24e3401..80e00364 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1644261878, - "narHash": "sha256-V0Dn63YTjvWdPvdmtMsYZWPkxmkRK8C1xGCQV4Sf3qw=", + "lastModified": 1645982274, + "narHash": "sha256-8sesqtcaGhZB2HXITTBNf+g1YzMYJry3fLzhGGxHQqo=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "a8ad4007716a9b1bd796394c7f3e92faf6f4c75c", + "rev": "f90f7c0a758f2142a448b9e59cc5d6f768b9275b", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1644345394, - "narHash": "sha256-5Fq+YnFueSoIXpWZnGD0XVLdufp3KbIiIff5827ap+w=", + "lastModified": 1646731473, + "narHash": "sha256-FHZTySgUkI4lseaiJfeht/sX4FHQHeysxTrhyQlmmf0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "206e22c6ba3f8cd28649d5360e2838f3bb90aa55", + "rev": "3dde0cf09244b994609c9eae5e43eb287cfa4616", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1644346464, - "narHash": "sha256-hS8hwbr/PflMIfTWTmB7Xo5jIrsWhSAqtz5XXxPa0zQ=", + "lastModified": 1646559628, + "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e2aa1f598674aa9c06f28f5db60b89f37f1e961b", + "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "impermanence": { "locked": { - "lastModified": 1644014516, - "narHash": "sha256-PkD35S6lduaU6mLcraFY0vj608RPv1kQp5uaFd/s26o=", + "lastModified": 1646131459, + "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "ff540dbe20556f6119d80f5c79796a0698a4ee38", + "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1644278373, - "narHash": "sha256-9riYZyVing7OQUUWELSojlbt9u0xDh0Xm5Eg8FQn0fc=", + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60c52a73f1d5858020ac4f161cd5bf1c9650f8b8", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "type": "github" }, "original": { @@ -423,11 +423,11 @@ }, "nur": { "locked": { - "lastModified": 1644361709, - "narHash": "sha256-Tp0EWOnQ7oNAjUBlZtL7+QiSdSIwRTTkNg/k3zXRZ6A=", + "lastModified": 1646756936, + "narHash": "sha256-OTlr3W3MzR7KetZnwlMRCnpCGDz7v8JEMkAGvcew+hE=", "owner": "nix-community", "repo": "nur", - "rev": "f7d931586b4c0210636320d90e55a44d5289b665", + "rev": "0d073ca832cb3ef4e8e4527b4d2d9d6ae7d7be4d", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 826fbad7..cb0bd072 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,7 +6,6 @@ let overlays = [ (import ./nur { inherit inputs; }) (import inputs.emacs-overlay) - (import ./rustfmt) (import ./dns { inherit inputs; }) (import ./local) ] ++ (map (path: import "${path}/overlay.nix") [ diff --git a/overlays/local/kat-hugosite.nix b/overlays/local/kat-hugosite.nix index 1e5eb8ce..59175f5e 100644 --- a/overlays/local/kat-hugosite.nix +++ b/overlays/local/kat-hugosite.nix @@ -3,8 +3,8 @@ src = fetchFromGitHub { owner = "kittywitch"; repo = "hugosite"; - rev = "ee2bdd87dd5f6a59234f7102dea8189d22048a4c"; - sha256 = "sha256-j/fRTm5GIXmtmsdOBF2ILyYFCN+j39Ul5/kB2OoDQt4="; + rev = "2dc44e1668d38bb706b2290387a936c26d0dd50b"; + sha256 = "sha256-HuC8NebVfp7aXciFhaFbUin5g/ChH3g+zpRNJ/6qq7g="; }; buildPhase = '' ${hugo}/bin/hugo