From a2c8c6e4d630d9a7e4a56ab1edd9c877cb20cdda Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 9 Jun 2024 23:39:09 +0200 Subject: [PATCH] obs+gpg fix --- .sops.yaml | 3 ++- flake.lock | 8 +++---- home-modules/gpg.nix | 3 ++- home-modules/obs.nix | 15 ++++++++++++ home.nix | 4 ++-- sops-secrets.yaml | 53 ++++++++++++++++++++++++----------------- system-modules/boot.nix | 13 ++++++---- system-modules/gpg.nix | 1 + 8 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 home-modules/obs.nix diff --git a/.sops.yaml b/.sops.yaml index 0dd93f8..d12525f 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,6 @@ keys: - &users: - # - &nx2 age1sgzc2jh8af30a3cp6g7l4hyzusqrn3x3xw7frghc4akvjaplwa3stfemxc + - &nx2backup age1sgzc2jh8af30a3cp6g7l4hyzusqrn3x3xw7frghc4akvjaplwa3stfemxc - &nx2 22FB2CC03DC5292AB81CF67D0AF27B383170E634 - &hosts: - &north age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e @@ -13,5 +13,6 @@ creation_rules: - *north - *xps - *ace + - *nx2backup pgp: - *nx2 diff --git a/flake.lock b/flake.lock index 1b0ab8e..0c76f4d 100755 --- a/flake.lock +++ b/flake.lock @@ -208,11 +208,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717946608, - "narHash": "sha256-YtqFGpsbPXBp8hvuzYYTrxVrBuxb+MNcPVsOeebLvxY=", + "lastModified": 1717960589, + "narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=", "ref": "refs/heads/main", - "rev": "4168b8c17b12b90873fab1ca73c2981b53f48bf5", - "revCount": 4786, + "rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c", + "revCount": 4788, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" diff --git a/home-modules/gpg.nix b/home-modules/gpg.nix index c773470..fb5e2e8 100644 --- a/home-modules/gpg.nix +++ b/home-modules/gpg.nix @@ -8,6 +8,7 @@ pinentry-all ]); + # services.pcscd.enable = true; services.gpg-agent = { enable = true; verbose = true; @@ -16,7 +17,7 @@ ]; enableSshSupport = true; enableFishIntegration = true; - pinentryPackage = pkgs.pinentry-curses; + # pinentryPackage = pkgs.pinentry-gtk2; }; home.file.".gnupg/gpg.conf".text = '' diff --git a/home-modules/obs.nix b/home-modules/obs.nix new file mode 100644 index 0000000..73fea59 --- /dev/null +++ b/home-modules/obs.nix @@ -0,0 +1,15 @@ +{ pkgs, lib, host, ... }: +lib.mkIf (host != "NxACE") +{ + # home.packages = with pkgs; [ + # obs-studio + # ]; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + obs-move-transition + obs-composite-blur + obs-backgroundremoval + ]; + }; +} diff --git a/home.nix b/home.nix index 94224fb..ca66919 100755 --- a/home.nix +++ b/home.nix @@ -7,8 +7,9 @@ ./home-modules/chatterino.nix ./home-modules/email.nix ./home-modules/bitwarden.nix - ./home-modules/office.nix ./home-modules/virt-manager.nix + ./home-modules/office.nix + ./home-modules/obs.nix ./home-modules/gestures.nix @@ -67,7 +68,6 @@ spotify spicetify-cli - obs-studio swww playerctl diff --git a/sops-secrets.yaml b/sops-secrets.yaml index e6cf28d..b72fc02 100644 --- a/sops-secrets.yaml +++ b/sops-secrets.yaml @@ -26,43 +26,52 @@ sops: - recipient: age1vkqn2nars5qmpr35tac0x9vshphrq6nnzjfyxwusgn27kt3zualssv0u8e enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKM0tBcGRsbmNRUmpUdUJP - bGdQS3RaRENLTEVlZlZOMU5GeU9WTlBJSW00CjUwY010aTNVMW56SEZaTFZEd2E0 - TXh5TmtnMlU0Sm5uMk96cTJuSll2WU0KLS0tIExKY0hPNnZmeHV4czV1Qng5SkUr - VWl1U2dYT2VRVWRjaTFUNS9wVDdEMnMKNkkFBhfS0XH0Ekqoe/RYBuVzTSGKnvQe - LSchPODzUEBhmPOAE7rdIBfYu+Dx7MSyAuZBqHSkyj6wSjktjFmeVg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdWFGWTZ4WktJNy85aUlz + R1ZPR2xSajUxSGU5NlVDTGhpUGJ1S0RMVkc4CmhZR080ZVdHUHZnSmk1ekIyM0xm + ZDN6dXJ6aXYyYkg4WVdiMlgwbmNBUzAKLS0tIE9qUmFpN3Nrek9JTGlaN3RjcDA1 + bUZxZ0FuOXcxSVQraUgveEh3dm5XK0kKToAW0mEq3G/wWRnvfJWasW7eO8BeFlej + OkXvP5R4+bddAsGPK83UxOUOFbZAzaYulFSaAFOssCOTui335nj+/w== -----END AGE ENCRYPTED FILE----- - recipient: age1jvf2lyrt2dw9jfnwgvnhmj9fmvyq8vvtepqjpkyycc5dqkkd4edqhxsgv6 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUGN2aVZOSWVwaFZFYVk4 - V3JyaFlIYXFabzN4cjRRb3d0MEJkSGZUL0hJClRUWXE1YURZTnZ5djM4QmlPSmd4 - TmZURE5EZFplZFhZZVo5Y1NMMGU4bncKLS0tIDVOTmpoanVHK1BtR3JGTlNyeUNw - Y3FtQzhjMG82dlBmakxoeWcvWHB0Sk0K1970jOatgLAC/eIgia7+NXnE8X7WzML+ - iYOdpBOD6vV1bxpKUHe434YmnNCEGH6btpssfmF+ge6RaS6rynPKmQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvNzRERlBkMFVwbk5ka3Rz + WHN5VE1XVFN6OWlMSFl1MnQyTEc4RHZVa0ZZCkZuY3doMTNUclMvWTJmQzFkbHlh + Z3ZXSUZuRzBoN2NtU2dWUzFXMjc1MDQKLS0tIGNvN1JsdGF2ZFU2Vkl4UGtzdDFJ + aE9uY1NQSkFoWmg4WGlvV2JDbkcyeXMKh1yVwrTV+4XhEiiiMhA7rW7z11N+EsXU + FBHP2nk2UXWPQGioMiCinead8tjX2jfeQcmTwdk4aYMtnvpqWS5RVQ== -----END AGE ENCRYPTED FILE----- - recipient: age1jj7kfjw3e7rf9kwg5f87zf4ns6yr5465wcasanr9gcgwrq7c6dmq6gprgk enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFQkJyUHI3d053TWtjRFlR - TUlWVm9iK0IweGpZQXZUWUlHSmYrWkpEZ3lFCkN4bkQxTjhQdk00K1VMWWtMenFv - bVZXNGJheTFVR1V4cHdSWHA4aVNHTzQKLS0tIHJXUUJOWXM2NHRPVlQwb0FTeC9V - WlgwZFFRbE5PdnJVSGlOOW9zeEhTajQKB+x9mdS+VAJagsdr8DJiQM6WMoYmvzhp - KUa8HEtkMUKLtwm4tMjKcBEqZFv/sKXOMqDO5o35z1jKeErCnnxzIA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBva2JleWhLeERPbklkems1 + YjJXUzlSZmhla0JFU2dtWFZzNWt4MTk4aEhFCnNvVmZmNm9Uc1pMWWNBRFpYRUJ1 + R20vOEpsTGZFZ1p4V1JzSnVlSGJNY00KLS0tIDMreVdDSHdGVnhvVi9ENXFJY045 + ZGdKSmZmRFMveld2UmlPNmtNWTdIbWsKJkmAaS91KR1Lvx2tCuu7sfUUYq4eeLsa + woel57Bqqpo8f0UMb8T6s8grdKMspZCkIu5ooR/U4xWhwOJQwd2gbw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1sgzc2jh8af30a3cp6g7l4hyzusqrn3x3xw7frghc4akvjaplwa3stfemxc + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMVUJaM3MweHBMNjlxdHRD + blNZWHM3ZlZrUkVrQ3NhNnFkc1VIMytkMVhFCndTczlsVFc3bGRhRkZmRm5sMXp0 + dnZrOEVoS3F6L0hSSTUrYllnNldYTnMKLS0tIFNjVzEzTC9LZldGMmlZS3VYRThW + SHJLR3lvdlFiRmJuU25RUHFFTmpjamMKbzycdDvQBAuOiRROTZEQSnaXoPapz73L + yVS9EUP25FSx/sGqRqaCefbeaybuM1aso6LDnlomv4Bib7zjugWKSw== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-06-03T19:04:51Z" mac: ENC[AES256_GCM,data:4oE9N4llvpXW15FhQLJ4vl+9FQQoNF1BK/DrX9jymrUxc5QVqASLLWRMZqwfoYofn2JqXIuNpFgW+NpoRQjqzTaFNt2OSGWYMmT10t2yteM40fhfZrRAU+hwOm8QhnbJrVgUunO2S6USGqkyr+nhafQkGPmqIiqPeW8bQROSSwc=,iv:NWEuLtamkQIS84mEZNByYA6vBLVkfCsuNtkT1OmtqFE=,tag:O06xDZT+Tqd66H4s+JMf+w==,type:str] pgp: - - created_at: "2024-06-03T19:30:15Z" + - created_at: "2024-06-09T19:44:41Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4DCvJ7ODFw5jQSAQdA6eOMCqmAKRaVZbBBWpyERU/SXe0aCWxTx+CL1GSkuUsw - Vj9R3IvD+yQUwbaBntD0Orf7aLUnDHr0jGxDrFcMbGkqBsqS2ewCtUavqSUw6A1u - 1GgBCQIQNcQCGpxX1Gzum/7HVsJE4JCaE4Dr2yQtdmUQhzxS3zTdc6xwUWSPPOZi - 5hXw4GZKN/MtiFyxAVRBaxsoPHhH3VaxJaXQ365E4TP+q8Urbk7V6aUFNKQs1+Xr - I/3GfobQh/FfZQ== - =ru2B + hF4DCvJ7ODFw5jQSAQdAUcAbKZ7q2ZNLG55YA8gSUc7Lyqn2G/7srJa17lezUlgw + MIhuvf6H1TfUkabE8it12NZzhSibmC+7T6FqB9tTY8UXvMn8KzVbIX5Opu/J9NNp + 1GgBCQIQUai/KFbpw4kaUthOe2ftUuN7fYLL0Nl4ZqrGNJMFYTjwOFyb6yWE7i7C + fEjGjALJU2ZZIL3mZ4FYkqU1eoidKLSnDtsGArxz0ACEo8UWuR7t1QFD3oYUFu0D + i5Hfz3tyzMfPsA== + =7FCO -----END PGP MESSAGE----- fp: 22FB2CC03DC5292AB81CF67D0AF27B383170E634 unencrypted_suffix: _unencrypted diff --git a/system-modules/boot.nix b/system-modules/boot.nix index e8e1ac2..e5dac11 100755 --- a/system-modules/boot.nix +++ b/system-modules/boot.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, host, inputs, ... }: +{ config, pkgs, host, inputs, ... }: let grub-theme-ascii-diana = (pkgs.fetchFromGitea { domain = "git.nx2.site"; @@ -23,9 +23,12 @@ in }; loader.systemd-boot.enable = false; # let lanzaboote install systemd-boot - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + kernelModules = [ "v4l2loopback" ]; + extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1''; }; + security.polkit.enable = true; } else if host == "NxXPS" then { boot.loader.grub = { enable = true; @@ -38,8 +41,6 @@ in fontSize = 50; # splashImage = null; - kernelPackages = pkgs.linuxPackages_latest; - extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; efi.canTouchEfiVariables = true; extraEntries = '' @@ -50,6 +51,10 @@ in chainloader /EFI/Microsoft/Boot/bootmgfw.efi } ''; + + extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + kernelModules = [ "v4l2loopback" ]; + extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1''; }; } else { # NxACE kernelPackages = pkgs.linuxPackages_latest; diff --git a/system-modules/gpg.nix b/system-modules/gpg.nix index e9102da..2b0b108 100644 --- a/system-modules/gpg.nix +++ b/system-modules/gpg.nix @@ -10,6 +10,7 @@ enableSSHSupport = true; enableExtraSocket = true; enableBrowserSocket = true; + # pinentryPackage = pkgs.pinentry-gtk2; }; }; }