From 53cea2381401ddaa18bf7682739f0adc8d73baf9 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sun, 12 Nov 2023 22:30:26 +0900
Subject: [PATCH] Update Tailscale and fix function keys

---
 .../desktops/hyprland/default.nix             | 34 ++++++++++---------
 nixos/hosts/nixos-framework/default.nix       | 13 +++++++
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix b/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix
index 46ef19e3..8577a99b 100644
--- a/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix
+++ b/home-manager/hosts/nixos-framework/desktops/hyprland/default.nix
@@ -22,34 +22,36 @@
       # binde = , XF86AudioRaiseVolume, exec, amixer set Master 3%+
       binde = , XF86AudioRaiseVolume, exec, swayosd --output-volume=raise
       
-      # F4 - Mute Microphone
+      # F4 - Previous Track
       # bind = , XF86AudioMicMute, exec, amixer set Capture toggle
-      bind = , XF86AudioMicMute, exec, swayosd --input-volume=mute-toggle
+      bind = , XF86AudioPrev, exec, playerctl previous
       
-      # F5 - Brightness Down
+      # F5 - Play/Pause
       # binde = , XF86MonBrightnessDown, exec, light -U 5
-      binde = , XF86MonBrightnessDown, exec, swayosd --brightness=lower
+      binde = , XF86AudioPlay, exec, playerctl play-pause
       
-      # F6 - Brightness Up
+      # F6 - Next Track
       # binde = , XF86MonBrightnessUp, exec, light -A 5
-      binde = , XF86MonBrightnessUp, exec, swayosd --brightness=raise
+      binde = , XF86AudioNext, exec, playerctl next
+
+      # F7 - Brightness Down
+      # bind = , XF86
+      binde = , XF86MonBrightnessDown, exec, light -U 5
       
-      # F7 - External Displays
+      # F8 - Brightness Up
+      # bind = , XF86
+      binde = , XF86MonBrightnessUp, exec, light -A 5
+
+      # F9 - External Displays
       # bind = , XF86
       
-      # F8 - Airplane Mode
+      # F10 - Airplane Mode
       # bind = , XF86
       
-      # F9 - Notifications?
+      # F11 - PRT SCR
       # bind = , XF86
       
-      # F10 - Call Answer?
-      # bind = , XF86
-      
-      # F11 - Call Hang Up?
-      # bind = , XF86
-      
-      # F12 - Favorites?
+      # F12 - "Framework Button"
       # bind = , XF86
       
       # Use rofi as an alt-tab switcher
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 72467e87..869be72a 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -43,4 +43,17 @@
     winetricks
     wineWowPackages.waylandFull
   ];
+
+  # Generic Tailscale configs are in /nixos/common/services/tailscale.nix
+  # Set up the secrets file:
+  sops.secrets."tailscale_keys/nixos-framework" = {
+    owner = "root";
+    sopsFile = ../../../secrets/tailscale.yaml;
+    restartUnits = [
+      "tailscaled.service"
+      "tailscaled-autoconnect.service"
+    ];
+  };
+  services.tailscale.authKeyFile = "/run/secrets/tailscale_keys/nixos-framework";
+  # networking.firewall.allowedTCPPorts = [ 22 ];
 }