home/modules/hyprland/default.nix

@@ -19,7 +19,7 @@ in
     ./wlogout.nix
     # ./swappy.nix
     ./alacritty.nix
-    ./audio.nix
+    ./swayosd.nix
     ./sway-notification-center.nix
     ./ntfy-sh.nix
   ];

home/modules/hyprland/hyprland.nix

@@ -91,6 +91,7 @@ in
           ''$mod, RETURN, exec, footclient''
           "$mod, E, exec, thunar"
           "$mod, B, exec, microsoft-edge"
+          "$mod, D, exec, rofi -show drun -replace -i"
           "$mod, BackSpace, exec, wlogout"
           ''$mod, F, exec, ${select-window.path}''
           "$mod, W, exec, pypr wall next"
@@ -150,11 +151,24 @@ in
           "$mod, mouse:272, movewindow"
           "$mod, mouse:273, resizewindow"
         ];
+        # e -> repeat, will repeat when held.
+        # l -> even when locked
+        bindel = [
+          # Media
+          ", XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise --max-volume 150"
+          ", XF86AudioLowerVolume, exec, swayosd-client --output-volume lower --max-volume 150"
+
+          # Light
+          ", XF86MonBrightnessUp, exec, swayosd-client --brightness +10"
+          ", XF86MonBrightnessDown, exec, swayosd-client --brightness -10"
+        ];
         bindl = [
+          ", XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
           ", XF86AudioPlay, exec, playerctl play-pause"
           ", XF86AudioPause, exec, playerctl pause"
           ", XF86AudioNext, exec, playerctl next"
           ", XF86AudioPrev, exec, playerctl previous"
+          ", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
           ", XF86Calculator, exec, qalculate-gtk"
         ];
 

home/modules/hyprland/rofi.nix

@@ -12,9 +12,5 @@ in
       source = ./rofi;
       recursive = true;
     };
-
-    wayland.windowManager.hyprland.settings.bind = [
-      "$mod, D, exec, rofi -show drun -replace -i"
-    ];
   };
 }

home/modules/hyprland/swayosd.nix

@@ -12,26 +12,9 @@ in
       swayosd
     ];
 
-    wayland.windowManager.hyprland.settings = {
-      exec-once = [
+    wayland.windowManager.hyprland.settings.exec-once = [
       "swayosd-libinput-backend"
       "swayosd-server"
     ];
-      bindl = [
-        ", XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
-        ", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
-      ];
-      # e -> repeat, will repeat when held.
-      # l -> even when locked
-      bindel = [
-        # Media
-        ", XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise --max-volume 150"
-        ", XF86AudioLowerVolume, exec, swayosd-client --output-volume lower --max-volume 150"
-
-        # Light
-        ", XF86MonBrightnessUp, exec, swayosd-client --brightness +10"
-        ", XF86MonBrightnessDown, exec, swayosd-client --brightness -10"
-      ];
-    };
   };
 }

system/services/couchdb.nix

@@ -39,17 +39,6 @@ in
     };
 
     services.caddy.virtualHosts."couchdb.tigor.web.id".extraConfig = ''
-      @obsidian header Origin "app://obsidian.md"
-      header @obsidian {
-        Access-Control-Allow-Origin "app://obsidian.md"
-        Access-Control-Allow-Methods "OPTIONS,HEAD,GET,POST,PUT,PATCH,DELETE"
-        Access-Control-Allow-Credentials "true"
-        Access-Control-Allow-Headers "Authorization,Content-Type"
-        defer
-      }
-      @options method OPTIONS
-      respond @options 204
-
       reverse_proxy localhost:5984
     '';