resurrected

Enzime · Dec 5, 2023 · 8c56e4b · 8c56e4b
1 parent b257766
commit 8c56e4b
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- Use `enzime` key instead of `enzime_*`
+- Readded `agenix` `zsh` function
+- Added `captive-browser` on laptops
 - Use `idle_inhibitor` `waybar` module
 - Fixed `VSCode` always crashing under Wayland
 - Added `scanners` module

diff --git a/files/zshrc b/files/zshrc
@@ -1,3 +1,7 @@
+function agenix {
+  $(which -p agenix) $@ -i =(op read "op://trimcmujfu5fjcx5u4u752yk2i/6gedf3cheamokyw47sq4wbxlsy/private key?ssh-format=openssh")
+}
+
 function ga {
   if [[ -z $1 ]]; then
     git add -p

diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix
@@ -39,6 +39,8 @@
 
   networking.networkmanager.wifi.backend = "iwd";
 
+  programs.captive-browser.interface = "wlan0";
+
   # Check that this can be bumped before changing it
   system.stateVersion = "23.11";
 }
diff --git a/hosts/sigma/configuration.nix b/hosts/sigma/configuration.nix
@@ -32,6 +32,8 @@
 
   services.fprintd.enable = true;
 
+  programs.captive-browser.interface = "wlp170s0";
+
   # Check that this can be bumped before changing it
   system.stateVersion = "22.05";
 }
diff --git a/keys.nix b/keys.nix
@@ -2,10 +2,6 @@
   users = {
     enzime =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINKZfejb9htpSB5K9p0RuEowErkba2BMKaze93ZVkQIE";
-    enzime_phi =
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILzD/3cOhlqe8NVEruSUnPSnG1GbmX8SgTbVGLFHMa7g";
-    enzime_sigma =
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwM0sVLdolDXb7LyKMT6Jfym0dP1NSgJClHcIOga+fa";
   };
 
   hosts = {

diff --git a/modules/laptop.nix b/modules/laptop.nix
@@ -25,6 +25,8 @@
 
     programs.light.enable = true;
     users.users.${user}.extraGroups = [ "video" ];
+
+    programs.captive-browser.enable = true;
   };
 
   darwinModule = { pkgs, lib, ... }: {

diff --git a/secrets/acme_zoneee.age b/secrets/acme_zoneee.age
diff --git a/secrets/duckdns.age b/secrets/duckdns.age
@@ -1,12 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 3W+2yw 2Vx2FmQtXaCGxiQk/VKepSmO93cIsqvYLiLwfv4ThkQ
-HObPjO1ggSDsqUgBqccct+jGL+4FrvUbOP4mRKaJe+A
--> ssh-ed25519 ZKW6vw Byp7+FcALaDd0bwFPJCmf/sPyh8Pjyldy/KWJuyRcRQ
-Ykxx1T0tH9vXZ1CKDvBfNasmuN3hAlwnYYev+kFtTrc
--> 7/a7o-grease UAr rw 1U
-RE4XuTuEGYc9ulLPQu2iNY7ydOQtJB55/DNKvTlAWgHC7065G0XFeuHGFaF038u2
-e24iNIf+XsUYKWwYapBmsH9Z00R7AcSfYfwa11EkOYpkTKFnXJZeVnRq9y6PQe+k
-j2er
---- aPG+DF33POMwFM69Q8ejT1oXxuPGrDAHm0z2LgtTwoQ
-�/�@�%f��r̴E���$v�}.��AN����V{�]��%�klI@x	S 
-���wA�U9�N8�և�9�:^��bsF�a����B����
+-> ssh-ed25519 cs2YLw TcKFRy1gHWUz+SrDBNeoU+qBCkkzaoQ2pOpqDHNUXxI
+YFxsCRHlYe4QYsh+OCVg4oE5cn3JUqTTOWX+ikQOUTw
+-> ssh-ed25519 ZKW6vw JeFV1kwXBAUARNJMBnTBZ0RyeAbESpO9ePQWF4vZJ2I
++vgbBkuuJz9EjXxYdx/AqHTjLARRuIdngGut0VZGqBg
+-> o.6M-grease
+WYSi276R20y7AjpDhQXlEg
+--- j+P7w7V6yshsNSaDUNZ4uiDbBzX5qwEt5Qv1cA+UjCI
+��s���M�h:���М�6Jܬx���ϟ�B�Bs]�7��tx��/����`�{��kǌfφ��&�$��O���L�1iI����9=ئ
diff --git a/secrets/nextcloud.age b/secrets/nextcloud.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 3W+2yw 25xo1q0UG6Q83GTrD5mzvMr8kp5ZUHR92jwUi40XpxU
-R1bj+HsUEoEGiPVZhtwPJ4zXdC0aVe2Xi3gbOUQyh60
--> ssh-ed25519 ZKW6vw be5JJKY3qtGcRl2gslG1cCowy6d6ub8p3eozrBva8kA
-ebet/DtNXLDQfN7WOEDy+p3y9Xc6RS7qOd06XDpc9Ng
--> b-grease J %t;OG HmatTz@ }C>e@G
-UduC4sig+njARZW4VmA5d8OE506l0JVFqE8uk+gSO/WHliX3aqPDpdlP0kpcGYXe
-KzAUdSPS6Rc
---- X97sSFGIzhlQnuIoKOPauhE3hAe5wgrh1xS4tpVAocs
-P{�$fH��3��(H���iP�<Em�]�y�7��џ�;ђ��كfl�Pz��D^��Q
+-> ssh-ed25519 cs2YLw cIGBRJ41qEkz/QuKHBw2oTe7Ewg7ldmIaqjHJqHhzEY
+PSFDP3XU66vQ6lVP9jLAga4pt9McyoZvv4IGhzMJYGg
+-> ssh-ed25519 ZKW6vw sg/+xJEylvLZFXKaQfLNRnzo01ipTV/APTEy/tJmwBA
+5JCzc20+yIhMWLX+DqKZZHwEUVNAAIn1DVGRaluiT4w
+-> E&9i-grease
+VyKyuVzBEANwJeQHGUeFDvCH3esLAJHoFo7I46xr9AEmu1O9D/NksZOLfYXn1zpz
+t/Q/CCKhThseZP14oG5tTWg2Dc91+HCeQkqGjGcKAQ
+--- jv8j/xsjLVU54ntSJ4HHeroeC/Mw5xocq6zhfYJDwvQ
+d����qa����n�E��|xXb�M_�n}��XT��`�%0��`~�*XpW)[�r7�8g�d��
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -1,17 +1,17 @@
 let inherit (import ../keys.nix) users hosts;
 in {
   "acme_zoneee.age".publicKeys = builtins.attrValues {
-    inherit (users) enzime_phi;
+    inherit (users) enzime;
     inherit (hosts) phi;
   };
 
   "duckdns.age".publicKeys = builtins.attrValues {
-    inherit (users) enzime_phi;
+    inherit (users) enzime;
     inherit (hosts) phi;
   };
 
   "nextcloud.age".publicKeys = builtins.attrValues {
-    inherit (users) enzime_phi;
+    inherit (users) enzime;
     inherit (hosts) phi;
   };
 
@@ -21,12 +21,12 @@ in {
   };
 
   "x11vnc_phi.age".publicKeys = builtins.attrValues {
-    inherit (users) enzime_phi;
+    inherit (users) enzime;
     inherit (hosts) phi;
   };
 
   "zshrc_phi.age".publicKeys = builtins.attrValues {
-    inherit (users) enzime_phi;
+    inherit (users) enzime;
     inherit (hosts) phi;
   };
 }
diff --git a/secrets/x11vnc_phi.age b/secrets/x11vnc_phi.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 3W+2yw CcPWYr9ufY7m1hrX6p1Wrb9QaSj85VGCnLPL4U5S810
-0ivfHrCcn9s5zLTdtD8WERgSn0x5z/Zg+jtUUJ9LfRg
--> ssh-ed25519 ZKW6vw 5h2giA33s4oBSW6ovdU53Uxa8509JrJwjZd2jkn0Xio
-+JpcCdUpw/wLDSLc4IK1M/JDv74TJ7eqqcRKxK2zlM0
--> <-:::t#.-grease
-kS45LF/Tcf2b4w705+dSChiLbDkfIUdotiNG9Jav3vJoBrr9A9Eof6h4pLtOwGYX
-JyZl0+bIDehv3+5nsEl3wtXVsZSdRr7zi/2TtqBz89bvVwQ
---- EoHJNHLP8WWxCPG8hptTs9DhXYdp/9DISJU303y9iF8
-��?Au���QU#8���/�W�P]��H���Y�q���կ
+-> ssh-ed25519 cs2YLw B6jbcV/wk2d7QnZbruA2wMbkSST7is/G62iYz5izBg4
+J8vnjsnBtTTH4FjE7sbr7zMhTq7JQvUtNMMhNKLmnN8
+-> ssh-ed25519 ZKW6vw jiaq+q1bIP4T3uQvosRevEYodGeFHuH5Yb5YDmIQ3CE
+jOX7FD/r9gQ+gPsVGJZUwHtRkYEqS6+HOe9V7lrFvh8
+-> ~_'5Sfx-grease c>dZ|q]D o9 ;ohfZl3$
+H2JZebv5s8UZBzNPv1XnXJ88mfabZgZJniDgfMQVJLihHu0xQ+M1VyS5PC1m9qEc
+E3+yHw+IkJDivflfMC6Xp6yeNrUm8w
+--- DnWhBUZKi5w4l5XiGkbA34fT6NIZmdO3aBPRC08z47g
+ˉ4�qW*W�U�%��Exf3��WN��#��HK("��P
diff --git a/secrets/zshrc_phi.age b/secrets/zshrc_phi.age