diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix index 4f09651..2652a51 100644 --- a/modules/home/hyprland/config.nix +++ b/modules/home/hyprland/config.nix @@ -36,12 +36,11 @@ "mpDris2 &" "foot --server &" "hyprfloat &" - "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &" ]; input = { kb_layout = "us,jp"; - kb_options = "caps:ctrl_modifier,compose:ralt"; + kb_options = "caps:ctrl_modifier"; numlock_by_default = true; follow_mouse = 1; sensitivity = 0; @@ -172,7 +171,6 @@ "$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" @@ -271,10 +269,6 @@ "$mainMod, XF86MonBrightnessDown, exec, brightnessctl set 100%-" ]; - bindl = [ - ",switch:[Lid Switch], exec, hyprlock" - ]; - # mouse binding bindm = [ "$mainMod, mouse:272, movewindow" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 5497e22..500dd39 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,11 +1,9 @@ -{ inputs, ... }: +{ inputs, ... }: { - imports = - [ (import ./hyprland.nix) ] + imports = [ (import ./hyprland.nix) ] ++ [ (import ./config.nix) ] ++ [ (import ./scripts.nix) ] ++ [ (import ./variables.nix) ] - ++ [ (import ./../hyprsunset.nix) ] - ++ [ (import ./../hyprlock.nix) ] + # ++ [ (import ./hyprlock.nix) ] ++ [ inputs.hyprland.homeManagerModules.default ]; } diff --git a/modules/home/hyprsunset.nix b/modules/home/hyprsunset.nix deleted file mode 100644 index d78d0ea..0000000 --- a/modules/home/hyprsunset.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - 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; - } - ''; -} diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix index 03727c2..157ec74 100644 --- a/modules/home/sway/default.nix +++ b/modules/home/sway/default.nix @@ -198,12 +198,11 @@ 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; # why would anyone do this??? + # systemd.enable = true; # ??? wrapperFeatures = { gtk = true; };