Add keys & all

keys.nix

@@ -39,6 +39,7 @@ rec {
     # Profpatsch
     [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8e/+nzKt5Zyy3dAuGB3t2SjKo/Tp6T1Ye+x5b3HXPb" ] ++
     # Flokli
-    [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILU0dvOBPN75tzvTv83Jq5r4+a/iXq+EUaFIsD9+ak7P"];
-
+    [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILU0dvOBPN75tzvTv83Jq5r4+a/iXq+EUaFIsD9+ak7P"] ++
+    # Simon
+    [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPu2pGUqoYUrm7QdOcjfJjVU6dyW5AeVTuTcuZFH14C4" ];
 }

machines/framework.nix

@@ -59,6 +59,7 @@ in {
         publicKey           = "ZdeqXN3Q8ZBPCWVW6pFzIBF3iS8zlVMGAj8bcePj3zk=";
         allowedIPs          = [
           "192.168.166.1/32"
+          "192.168.1.0/24"
           "192.168.20.0/24"
           "192.168.21.0/24"
           "10.25.0.0/16"
@@ -190,7 +191,7 @@ in {
       pkgs.gnomeExtensions.pop-shell
 
       # Bluetooth
-      pkgs.bluezFull
+      pkgs.bluez
       pkgs.bluedevil
       pkgs.libsForQt5.bluez-qt.dev
       pkgs.blueman
@@ -201,6 +202,8 @@ in {
       pkgs.gcc
       pkgs.rust-analyzer
       pkgs.ninjatrappeur-pkgs.picobak
+
+      pkgs.carla
     ];
 
   services.avahi.enable = true;

machines/thinkpad.nix

@@ -203,6 +203,7 @@ in {
       pkgs.evince
       pkgs.languagetool
       pkgs.remmina
+      pkgs.carla
       (pkgs.hunspellWithDicts [
         pkgs.hunspellDicts.en-gb-ise
         pkgs.hunspellDicts.en-gb-ize

modules/dundies/nftables.nix

@@ -65,6 +65,8 @@
 
               ip saddr 192.168.1.0/24 udp dport ${nfListFormat localUdpList} accept
               ip saddr 192.168.1.0/24 tcp dport ${nfListFormat localTcpList} accept
+              ip saddr 192.168.166.0/24 udp dport ${nfListFormat localUdpList} accept
+              ip saddr 192.168.166.0/24 tcp dport ${nfListFormat localTcpList} accept
               tcp dport ${nfListFormat globalTcpList} accept
               udp dport ${nfListFormat globalUdpList} accept
           }