Compare commits
4 commits
214b76bcca
...
fae3d16162
Author | SHA1 | Date | |
---|---|---|---|
fae3d16162 | |||
d51abe2b37 | |||
b775657b1e | |||
c51078e515 |
7 changed files with 33 additions and 10 deletions
|
@ -20,7 +20,6 @@ each host should have these files:
|
||||||
- multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?)
|
- multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?)
|
||||||
- bitwarden
|
- bitwarden
|
||||||
- divide steam and gamemode?
|
- divide steam and gamemode?
|
||||||
- laptop specific configuration (power profiles daemon, battery, etc)
|
- cursor size theme option
|
||||||
- sddm cursors no work :(
|
|
||||||
- sddm x11 support, too. or maybe just remove x11
|
- sddm x11 support, too. or maybe just remove x11
|
||||||
- gnome keyring / gcr for saving passwords
|
- gnome keyring / gcr for saving passwords
|
|
@ -103,6 +103,10 @@ window#waybar.floating #window {
|
||||||
color: @sapphire;
|
color: @sapphire;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#backlight {
|
||||||
|
color: @yellow;
|
||||||
|
}
|
||||||
|
|
||||||
#pulseaudio {
|
#pulseaudio {
|
||||||
color: @pink;
|
color: @pink;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
# none yet
|
# none yet
|
||||||
]) ++ (with pkgs.gnome; [
|
]) ++ (with pkgs.gnome; [
|
||||||
# yay gnomeware!!!!!!!!!!!!!! yum
|
# yay gnomeware!!!!!!!!!!!!!! yum
|
||||||
nautilus gnome-disk-utility pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe
|
nautilus gnome-disk-utility ghex pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe
|
||||||
]);
|
]);
|
||||||
|
|
||||||
modules = {
|
modules = {
|
||||||
|
|
|
@ -14,18 +14,24 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
hm.services.hypridle = {
|
hm.services.hypridle = let
|
||||||
|
hyprctl = "${config.modules.desktop.hyprland.package}/bin/hyprctl";
|
||||||
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = cfg.package;
|
package = cfg.package;
|
||||||
|
|
||||||
lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
|
lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
|
||||||
unlockCmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
|
unlockCmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock";
|
||||||
|
|
||||||
beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
|
beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock the screen before sleeping
|
||||||
|
afterSleepCmd = "${hyprctl} dispatch dpms on"; # turn on the screen to avoid moving mouse/pressing key
|
||||||
|
|
||||||
listeners = let
|
listeners = [
|
||||||
hyprctl = "${config.modules.desktop.hyprland.package}/bin/hyprctl";
|
{
|
||||||
in [
|
timeout = 60 * 1;
|
||||||
|
onTimeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state
|
||||||
|
onResume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state
|
||||||
|
}
|
||||||
{
|
{
|
||||||
timeout = 90; # 1.5 min
|
timeout = 90; # 1.5 min
|
||||||
onTimeout = "${hyprctl} dispatch dpms off"; # turn off screen
|
onTimeout = "${hyprctl} dispatch dpms off"; # turn off screen
|
||||||
|
@ -36,7 +42,7 @@ in {
|
||||||
onTimeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer
|
onTimeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 60 * 30; # 30 min
|
timeout = 60 * 15; # 15 min
|
||||||
onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend
|
onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -49,6 +49,9 @@ in {
|
||||||
bindel = [ # "bind held & locked"
|
bindel = [ # "bind held & locked"
|
||||||
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+"
|
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+"
|
||||||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
||||||
|
|
||||||
|
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%"
|
||||||
|
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-"
|
||||||
];
|
];
|
||||||
bindl = [ # "bind locked"
|
bindl = [ # "bind locked"
|
||||||
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
|
@ -147,8 +150,11 @@ in {
|
||||||
"center, initialTitle:^Open Files$"
|
"center, initialTitle:^Open Files$"
|
||||||
"size 1100 730, initialTitle:^Open Files$"
|
"size 1100 730, initialTitle:^Open Files$"
|
||||||
"float, initialTitle:^Save As$"
|
"float, initialTitle:^Save As$"
|
||||||
"center, initialTitle:^Save As%"
|
"center, initialTitle:^Save As$"
|
||||||
"size 1100 730, initialTitle:^Save As$"
|
"size 1100 730, initialTitle:^Save As$"
|
||||||
|
"float, initialTitle:^Select a file to open$"
|
||||||
|
"center, initialTitle:^Select a file to open$"
|
||||||
|
"size 1100 730, initialTitle:^Select a file to open$"
|
||||||
|
|
||||||
"float, class:\.exe$"
|
"float, class:\.exe$"
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,10 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
# unsure if it's correct to put this in `environment.systemPackages`
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
config.modules.desktop.themes.sddmTheme.package
|
config.modules.desktop.themes.sddmTheme.package
|
||||||
|
config.modules.desktop.themes.cursorTheme.package
|
||||||
libsForQt5.qt5.qtsvg
|
libsForQt5.qt5.qtsvg
|
||||||
libsForQt5.qt5.qtgraphicaleffects
|
libsForQt5.qt5.qtgraphicaleffects
|
||||||
libsForQt5.qt5.qtquickcontrols2
|
libsForQt5.qt5.qtquickcontrols2
|
||||||
|
|
|
@ -49,6 +49,7 @@ in {
|
||||||
orientation = "inherit";
|
orientation = "inherit";
|
||||||
modules = [
|
modules = [
|
||||||
"pulseaudio"
|
"pulseaudio"
|
||||||
|
"backlight"
|
||||||
#"network"
|
#"network"
|
||||||
"cpu"
|
"cpu"
|
||||||
"memory"
|
"memory"
|
||||||
|
@ -169,6 +170,11 @@ in {
|
||||||
on-click = "${lib.getExe pkgs.pavucontrol}";
|
on-click = "${lib.getExe pkgs.pavucontrol}";
|
||||||
ignored-sinks = ["Easy Effects Sink"];
|
ignored-sinks = ["Easy Effects Sink"];
|
||||||
};
|
};
|
||||||
|
backlight = {
|
||||||
|
format = "{icon} {percent}%";
|
||||||
|
format-icons = ["" ""];
|
||||||
|
scroll-step = 1;
|
||||||
|
};
|
||||||
cpu = {
|
cpu = {
|
||||||
interval = 4;
|
interval = 4;
|
||||||
format = " {usage}% {avg_frequency}GHz";
|
format = " {usage}% {avg_frequency}GHz";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue