stuff for sure

This commit is contained in:
mjallen18
2024-08-20 11:32:56 -05:00
parent 1bf2b400c7
commit 0b408700c3
19 changed files with 337 additions and 151 deletions

View File

@@ -1,4 +1,21 @@
{ pkgs, ... }:
let
wallpaper = "/home/matt/.config/wallpapers/wall.png";
cursorTheme = "macOS-Monterey";
cursorThemePkg = pkgs.apple-cursor;
cursorSize = 24;
gtkThemeSize = "compact";
gtkThemeAccent = "blue";
gtkThemeVariant = "macchiato";
gtkTheme = "catppuccin-${gtkThemeVariant}-${gtkThemeAccent}-${gtkThemeSize}";
gtkThemePkg = pkgs.catppuccin-gtk.override {
size = gtkThemeSize;
accents = [ gtkThemeAccent ];
variant = gtkThemeVariant;
};
iconTheme = "Colloid-dark"; # Colloid, Colloid-light, Colloid-dark
iconThemePkg = pkgs.colloid-icon-theme;
in
{
imports = [
./config.nix
@@ -14,10 +31,10 @@
hyprpaper = {
enable = true;
settings = {
preload = [ "~/.config/wallpapers/wall.png" ];
preload = [ wallpaper ];
wallpaper = [
"DP-1, ~/.config/wallpapers/wall.png"
"DP-2, ~/.config/wallpapers/wall.png"
"DP-1, ${wallpaper}"
"DP-2, ${wallpaper}"
];
splash = false;
};
@@ -27,13 +44,29 @@
enable = true;
settings = {
general = {
after_sleep_cmd = "hyprctl dispatch dpms on";
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
ignore_dbus_inhibit = false;
lock_cmd = "hyprlock";
lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
};
listener = [
# {
# timeout = 300; # 5min
# on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
# on-resume = "brightnessctl -r"; # monitor backlight restore.
# }
{
timeout = 3600;
timeout = 900; # 15 min
on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = 930; # 15.5 min
on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
on-resume = "hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
}
{
timeout = 3600; # 1hr
on-timeout = "systemctl suspend"; # suspend pc
}
];
};
@@ -46,7 +79,7 @@
background = [
{
monitor = "";
path = "/home/matt/.config/wallpapers/wall.png"; # supports png, jpg, webp (no animations, though)
path = wallpaper; # supports png, jpg, webp (no animations, though)
color = "rgba(25, 20, 20, 1.0)";
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
@@ -63,12 +96,13 @@
{
size = "200, 50";
position = "0, -80";
monitor = "";
monitor = "DP-1";
dots_center = true;
fade_on_empty = false;
fade_on_empty = true;
font_color = "rgb(202, 211, 245)";
inner_color = "rgb(91, 96, 120)";
outer_color = "rgb(24, 25, 38)";
bothlock_color = -1;
outline_thickness = 5;
placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
shadow_passes = 2;
@@ -94,9 +128,9 @@
# WLR_NO_HARDWARE_CURSORS = "1";
CLUTTER_BACKEND = "wayland";
# WLR_RENDERER = "vulkan";
XCURSOR_THEME = "macOS-Monterey";
XCURSOR_SIZE = "24";
GTK_THEME="catppuccin-macchiato-blue-compact";
XCURSOR_THEME = cursorTheme;
XCURSOR_SIZE = cursorSize;
GTK_THEME = gtkTheme;
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
@@ -110,31 +144,27 @@
home.pointerCursor = {
gtk.enable = true;
package = pkgs.apple-cursor;
name = "macOS-Monterey";
size = 24;
package = cursorThemePkg;
name = cursorTheme;
size = cursorSize;
};
gtk = {
enable = true;
cursorTheme = {
name = "macOS-Monterey"; # macOS-[BigSur, Monterey]-[ , White, White-Windows, Windows]
package = pkgs.apple-cursor;
name = cursorTheme; # macOS-[BigSur, Monterey]-[ , White, White-Windows, Windows]
package = cursorThemePkg;
};
theme = {
name = "catppuccin-macchiato-blue-compact";
package = pkgs.catppuccin-gtk.override {
size = "compact";
accents = ["blue"];
variant = "macchiato";
};
name = gtkTheme;
package = gtkThemePkg;
};
iconTheme = {
name = "Colloid-dark"; # Colloid, Colloid-light, Colloid-dark
package = pkgs.colloid-icon-theme;
name = iconTheme;
package = iconThemePkg;
};
gtk3.extraConfig = {