chore: merge branch 'master' of https://github.com/ahwxorg/nixos-config

modules/home/hyprland/config.nix

@@ -57,7 +57,7 @@
         kb_options = "caps:ctrl_modifier,compose:ralt";
         numlock_by_default = true;
         follow_mouse = 1;
-        sensitivity = 0;
+        sensitivity = 0.01;
         touchpad = {
           natural_scroll = true;
           tap-to-click = false;
@@ -124,7 +124,8 @@
       decoration = {
         rounding = 0;
         active_opacity = 1.00;
-        inactive_opacity = 0.75;
+        inactive_opacity = 1.00;
+        # inactive_opacity = 0.75;
         # fullscreen_opacity = 1.0;
 
         shadow = {
@@ -218,7 +219,7 @@
         # clipboard manager
         "ALT SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
 
-        "ALT SHIFT, F, exec, librewolf"
+        "ALT SHIFT, F, exec, firefox"
         "ALT SHIFT, C, exec, chromium"
         "ALT SHIFT, Q, exec, qutebrowser"
         "ALT SHIFT, W, exec, wdisplays"

modules/home/sway/default.nix

@@ -159,7 +159,7 @@ in
           "${altmod}+Shift+l" = "exec ${pkgs.swaylock-fancy}/bin/swaylock-fancy";
           "${mod}+Shift+b" = "exec pkill -SIGUSR1 .waybar-wrapped";
           "${mod}+Shift+v" = "exec cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy";
-          "${mod}+Shift+f" = "exec --no-startup-id ${pkgs.librewolf}/bin/librewolf";
+          "${mod}+Shift+f" = "exec --no-startup-id ${pkgs.firefox}/bin/firefox";
           "${mod}+Shift+c" = "exec --no-startup-id ${pkgs.ungoogled-chromium}/bin/chromium";
           "${mod}+Shift+q" = "exec --no-startup-id ${pkgs.qutebrowser}/bin/qutebrowser";
           "${mod}+Shift+w" = "exec --no-startup-id ${pkgs.wdisplays}/bin/wdisplays";

modules/home/waybar/default.nix

@@ -28,6 +28,7 @@
             "sway/workspaces",
             "hyprland/workspaces",
             "sway/mode",
+            "custom/weather",
             "tray",
           ],
 
@@ -60,6 +61,13 @@
             "separate-outputs": true
           },
 
+          "custom/weather": {
+            "format": "{text}",
+            "return-type": "text",
+            "exec": "~/.local/bin/waybar-weather",
+            "interval": 1800
+          },
+
           "sway/workspaces": {
             "all-outputs": true,
             "disable-scroll": true,
@@ -263,11 +271,9 @@
           },
 
           "wireplumber": {
-            "format": "{icon}  {node_name}/{volume}",
-            "format-muted": "",
+            "format": "<span color='#aaaaaa'>VOL:</span> {node_name}/{volume}",
             "on-click": "pavucontrol-qt",
             "on-click-right": "helvum",
-            "format-icons": ["", "", ""]
           },
 
           "custom/audio-internal": {
@@ -365,10 +371,6 @@
           "clock#time": {
             "interval": 60,
             "format": "<span color='#aaaaaa'>CEST:</span> {:%I:%M %p}",
-            "actions":  {
-              "on-scroll-up": "tz_up",
-              "on-scroll-down": "tz_down"
-            }
           },
 
           "custom/clock#minutes": {

modules/home/waybar/scripts.nix

@@ -218,18 +218,7 @@
       text = ''
         #!/usr/bin/env zsh
 
-        if [[ -f /sys/class/power_supply/BAT1/status && "$(cat /sys/class/power_supply/BAT1/status)" == "Discharging" ]]; then; cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'; fi
-      '';
-    };
-    "/home/${username}/.local/bin/waybar-vpn" = {
-      # unused nowadays
-      executable = true;
-      text = ''
-        #!/usr/bin/env bash
-
-        ip route | grep -q '10.7.0.0' \
-        && echo '{"text":"Connected","class":"connected","percentage":100}' \
-        || echo '{"text":"Disconnected","class":"disconnected","percentage":0}'
+        cat /sys/class/power_supply/*/current_now /sys/class/power_supply/*/voltage_now | xargs | awk '{print $1*$2/1e12 " W"}'
       '';
     };
     "/home/${username}/.local/bin/waybar-mullvad" = {
@@ -249,6 +238,14 @@
         echo "$TEXT"
       '';
     };
+    "/home/${username}/.local/bin/waybar-weather" = {
+      executable = true;
+      text = ''
+        #!/usr/bin/env sh
+
+        mullvad-exclude curl 'wttr.is?format=%c+(%p)+%t+(%f)+%w+(%S,+%s)\n'
+      '';
+    };
   };
   home.packages = with pkgs; [
     wf-recorder

modules/home/zsh.nix

@@ -285,6 +285,7 @@
         tailscale = "sudo tailscale";
         finder = "open -a Finder";
         fucking = "systemctl --user restart";
+        reboot-to-macos = "sudo asahi-bless --set-boot 1";
 
         # NixOS
         ns = "nix-shell --run zsh";
@@ -293,6 +294,8 @@
         nix-switch-upgrade = "sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#${host}";
         nix-flake-update = "sudo nix flake update ~/nixos-config#";
         nix-clean = "sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/* && nix-collect-garbage && nix-collect-garbage -d";
+        keydon = "sudo systemctl start keyd";
+        keydoff = "sudo systemctl stop keyd";
       };
 
       plugins = with pkgs; [

modules/services/keyd.nix

@@ -0,0 +1,18 @@
+{
+  services.keyd = {
+    enable = true;
+    keyboards.default.settings = {
+      main.capslock = "overload(control, esc)";
+      control = {
+        h = "left";
+        j = "down";
+        k = "up";
+        l = "right";
+      };
+      meta = {
+        k = "C-k";
+        l = "C-l";
+      };
+    };
+  };
+}