chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/home/hyprland/config.nix

@@ -36,11 +36,12 @@
         "mpDris2 &"
         "foot --server &"
         "hyprfloat &"
+        "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &"
       ];
 
       input = {
         kb_layout = "us,jp";
-        kb_options = "caps:ctrl_modifier";
+        kb_options = "caps:ctrl_modifier,compose:ralt";
         numlock_by_default = true;
         follow_mouse = 1;
         sensitivity = 0;
@@ -171,6 +172,7 @@
         "$mainMod, Space, togglefloating,"
         "$mainMod, D, exec, bemenu-run -l 5 --ignorecase"
         "SUPER SHIFT, L, exec, swaylock --image /home/${username}/.local/share/bg.png"
+        "SUPER, L, exec, swaylock --image /home/${username}/.local/share/bg.png"
         "$mainMod, E, exec, thunar"
         "$mainMod SHIFT, B, exec, pkill -SIGUSR1 .waybar-wrapped"
         "$mainMod, C,exec, hyprpicker -a"
@@ -269,6 +271,10 @@
         "$mainMod, XF86MonBrightnessDown, exec, brightnessctl set 100%-"
       ];
 
+      bindl = [
+        ",switch:[Lid Switch], exec, hyprlock"
+      ];
+
       # mouse binding
       bindm = [
         "$mainMod, mouse:272, movewindow"

modules/home/hyprland/default.nix

@@ -1,9 +1,11 @@
-{ inputs, ... }: 
+{ inputs, ... }:
 {
-  imports = [ (import ./hyprland.nix) ]
+  imports =
+    [ (import ./hyprland.nix) ]
     ++ [ (import ./config.nix) ]
     ++ [ (import ./scripts.nix) ]
     ++ [ (import ./variables.nix) ]
-    # ++ [ (import ./hyprlock.nix) ]
+    ++ [ (import ./../hyprsunset.nix) ]
+    ++ [ (import ./../hyprlock.nix) ]
     ++ [ inputs.hyprland.homeManagerModules.default ];
 }

modules/home/hyprsunset.nix

@@ -0,0 +1,16 @@
+{
+  services.hyprsunset.enable = true;
+
+  home.file.".config/hypr/hyprsunset.conf".text = ''
+    max-gamma = 200;
+    profile {
+      time = 06:00;
+      identity = true;
+    }
+    profile {
+      time = 21:00;
+      temperature = 5500;
+      gamma = 0.8;
+    }
+  '';
+}

modules/home/sway/default.nix

@@ -198,11 +198,12 @@ in
         { command = "swaycons &"; }
         # { command = "wlsunset -S '06:30' -s '19:30' -d 1800 "; }
         { command = "foot --server &"; }
+        { command = "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"; }
         { command = "footclient"; }
       ];
       workspaceAutoBackAndForth = false;
     };
-    # systemd.enable = true; # ???
+    # systemd.enable = true; # why would anyone do this???
     wrapperFeatures = {
       gtk = true;
     };

modules/home/waybar/default.nix

@@ -295,7 +295,7 @@
           },
 
           "battery": {
-            "bat": "BAT0",
+            "bat": "BAT1",
             "interval": 20,
             "states": {
               "warning": 20,