diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index a3c800a..32cf357 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -12,7 +12,8 @@ ]; # KERNEL - boot.kernelPackages = pkgs.linuxPackages_latest; + # HACK to get nvidia driver to build + # boot.kernelPackages = pkgs.linuxPackages_latest; # BOOT boot = { diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 7e08788..3334689 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -101,7 +101,10 @@ with lib; { }; }; - programs.xss-lock.enable = true; + programs.xss-lock = { + enable = true; + lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5"; + }; environment.systemPackages = with pkgs; [ # nix @@ -123,6 +126,7 @@ with lib; { tlaplusToolbox vlc thunderbird + plantuml ]; home-manager.users.moritz = { diff --git a/modules/services/openconnect.nix b/modules/services/openconnect.nix index ad38514..6a9433a 100644 --- a/modules/services/openconnect.nix +++ b/modules/services/openconnect.nix @@ -29,7 +29,6 @@ in }; age.secrets.uniVPN = { file = ../../secrets/uni-vpn.age; - owner = "1000"; }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index d29fe96..5f8d1a9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,6 @@ { inputs }: final: prev: { inherit (inputs.comma.packages."${prev.system}") comma; nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; - openssl = final.master.openssl_3; # HACK to fix openssl CVE-2022-3786 and CVE-2022-3602 agenix = inputs.agenix.defaultPackage."${prev.system}"; master = import inputs.master { inherit (prev) system; diff --git a/secrets/uni-vpn.age b/secrets/uni-vpn.age index 0caaad8..2c7daaa 100644 --- a/secrets/uni-vpn.age +++ b/secrets/uni-vpn.age @@ -1,17 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 CjuqfA RCNX2PCn0Nw3onGVpZKa2rwiX0OzHmwAyT5AYIPf3g4 -02E2bsAAS3FYna5dM+ReGTudrQVxC8T1hoFN7x10IMk --> ssh-ed25519 QRYDmg GSOSIihN5uQaRSTIHaHChqPnCePdtdQtMnD+YVOqSi8 -w8gMVpQh/GPuOeh8Kqlq5hUTwpGNGb+46TN5r7yPvG8 --> ssh-ed25519 wG6LYg g9yPEjf86J1JFigQ4wbcncQwB8vudbchp63648qchBY -jjAhYIacIbMWa+CX4ZIsnFXAS4DPIreCK8QeTgsVZsw --> ssh-ed25519 ZYd7Zg 8WQ39l77S3Hk5h9t0drUo8r1CFCDFNoAsBc8vIEIiT8 -nHvduRxFp+d7bu6n9mLTRTSnv+XfvD1c3xydkspcMZk --> ssh-ed25519 as9VYQ tDd4uU7mzJLeLbVupNeJQGTjY2lrtQA0Q7UREaCfCA8 -2zZslafI8HgoSXm1+tk/OP4jWMsVt7RxVBMS0pwNZf0 --> Uf`/-grease = r3?M -PM4EdUqyhLGuVj+AdzDNJrT70t6iyYGfXizxRCJdZ5gWG3BIPU3e1nVQhe599PYi -3VKQjDSbMvt/Hskxue8u5Q ---- spycnP0LXUKbLdOHOfmdtXoIKb8EL7yBY/zry/5LQ/I -"c'٤l$f!M}r*oaI6c!ModYw)u -M tͺ-_ \ No newline at end of file +-> ssh-ed25519 CjuqfA wsRuh5f7FBwEuH60mY/n5B2rfMXmN9loDRI5sgLAmQY +QRNPLd433Ax/F/NMCGdUUl1dXKvpaqErPYlDRPASkLA +-> ssh-ed25519 QRYDmg 1TN+ZhZMn3a5Ny/rrWZedHIwf69NCNj82RGfDt4VI1s +I+VsfBTJZ7gIIGROjU5hkvRZ/+OkxxPda9qYn28O5dg +-> ssh-ed25519 wG6LYg WhRpXAXmZPYLSmNcqvuLQIkwbOnyP/Fqmt5ZhvNqQx8 +lKyFPSmEgY/BuLKxTOQMrOVf7ScL50WwvghgDQT6gsY +-> ssh-ed25519 ZYd7Zg E4VAC6uIuBdXZ0jciRW/835qIaDWixDig6oGi8KqFlw +15J0vEUwCFiViXP7UlKmAmKfm+d6UgjcA3gHvDzSQwg +-> ssh-ed25519 as9VYQ +sGqCqiBOgMcF90Rt6xKRHm0fqZMXflg6OBRwAhVU2k +rgzztigEJ1WCdI9AuXcjP2VZrPQxiecYRPfg4RdOyFM +-> xA'C-grease s-9 ?tXT 38r l[ +lAYTp6Ot +--- RvWgnW1+4pux4UMOamln/5/xVLsyIgxAZwYOYZJGQo4 +H +I!4HQ uR7~Չ!3\B6 yGN7|v>n+2z'>D \ No newline at end of file