update flake.lock and some conf

This commit is contained in:
unexplrd
2025-02-14 22:47:26 +02:00
parent 2798bc65f0
commit 920b4de9da
7 changed files with 203 additions and 178 deletions

View File

@ -7,6 +7,10 @@
}: let
cfg = config.desktop.hyprland;
hostname = osConfig.networking.hostName;
keyboard =
if hostname == "eldrid"
then "chromeos"
else "platform";
xdgPictures =
config.xdg.userDirs.pictures;
in {
@ -133,25 +137,14 @@ in {
"col.active.text" = "0xff${config.lib.stylix.colors.base0D}";
"col.inactive.text" = "0xff${config.lib.stylix.colors.base05}";
"col.urgent.text" = "0xff${config.lib.stylix.colors.base09}";
"col.active.border" = "0xff${config.lib.stylix.colors.base0D}";
"col.inactive.border" = "0xff${config.lib.stylix.colors.base05}";
"col.urgent.border" = "0xff${config.lib.stylix.colors.base09}";
};
};
}
{
# hyprsplit = {
# num_workspaces = 9;
# };
}
#{
# dynamic-cursors = {
# enable = true;
# mode = "rotate";
# threshold = 2;
# shake = {
# enable = true;
# };
# };
#}
];
dwindle = {
force_split = 2;
default_split_ratio = 1.4;
@ -159,6 +152,7 @@ in {
master = {
mfact = 0.6;
};
"$mod" = "SUPER";
"$modShift" = "$mod SHIFT";
"$modCtrl" = "$mod CTRL";
@ -182,6 +176,7 @@ in {
allow_tearing = true;
layout = "hy3";
};
# group = {
# groupbar = lib.mkDefault {
# height = 24;
@ -196,18 +191,6 @@ in {
# # "col.text.urgent" = "0xff${config.lib.stylix.colors.base09}";
# };
# };
workspace = [
"1, defaultName:general"
"2, defaultName:browse"
"3, defaultName:chat"
"4, defaultName:code"
"5, defaultName:uni"
"6, defaultName:games"
"7, defaultName:sysadmin"
"8, defaultName:media"
"9, defaultName:bg"
# "10, defaultName:"
];
bindn = [", mouse:272, hy3:focustab, mouse"];
bind = [
@ -335,8 +318,8 @@ in {
", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, preferred, 1920x0, 1.2'"
", XF86MonBrightnessUp, exec, brightnessctl s 5%+"
", XF86MonBrightnessDown, exec, brightnessctl s 5%-"
"ALT, XF86MonBrightnessUp, exec, brightnessctl s 5%+ -d platform::kbd_backlight"
"ALT, XF86MonBrightnessDown, exec, brightnessctl s 5%- -d platform::kbd_backlight"
"ALT, XF86MonBrightnessUp, exec, brightnessctl s 5%+ -d ${keyboard}::kbd_backlight"
"ALT, XF86MonBrightnessDown, exec, brightnessctl s 5%- -d ${keyboard}::kbd_backlight"
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@ -356,8 +339,22 @@ in {
workspace_swipe_fingers = 3;
workspace_swipe_distance = 300;
};
workspace = [
"1, defaultName:general"
"2, defaultName:browse"
"3, defaultName:chat"
"4, defaultName:code"
"5, defaultName:uni"
"6, defaultName:games"
"7, defaultName:sysadmin"
"8, defaultName:media"
"9, defaultName:bg"
# "10, defaultName:"
];
windowrulev2 = [
# tray/misc utilities
"float, initialTitle:MainPicker" # why is it not floating by default
"float, class:(com.saivert.pwvucontrol)"
"float, class:(re.sonny.Junction)"
"float, class:(com.github.hluk.copyq)"
@ -378,19 +375,26 @@ in {
# cs2
"immediate, class:(cs2)"
# deadlock
"float, class:(steam_app_1422450)"
# "float, class:(steam_app_1422450)"
"fullscreen, class:(steam_app_1422450)"
"immediate, class:(steam_app_1422450)"
"immediate, initialTitle:(Ghostrunner)"
# dead by daylight
"immediate, class:deadbydaylight-egs-shipping.exe"
## workspace assignments
"workspace name:chat, class:org.telegram.desktop"
"workspace name:chat, class:org.signal.Signal"
"workspace name:chat, class:im.riot.Riot"
"workspace name:chat, class:WebCord"
"workspace name:games, class:com.heroicgameslauncher.hgl"
"workspace name:games, class:net.lutris.Lutris"
"workspace name:games, class:steam"
# "workspace name:game, class:"
];
};
extraConfig = ''
bind = $modShift, S, submap, resize
bind = $modShift, R, submap, resize
submap = resize
binde = , right, resizeactive, 10 0
binde = , left, resizeactive, -10 0
@ -443,7 +447,7 @@ in {
gtk = {
enable = true;
iconTheme = {
name = "Papirus-Light";
name = "Papirus";
package = pkgs.papirus-icon-theme;
};
};
@ -1775,7 +1779,6 @@ in {
wdisplays
pwvucontrol
wl-clipboard-rs
polkit_gnome
libqalculate
#papirus-icon-theme
];
@ -1814,78 +1817,90 @@ in {
Description = "Home Manager System Tray";
};
};
systemd.user.services = {
udiskie = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
systemd.user = {
services = {
udiskie = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
};
Install = {
WantedBy = ["hyprland-session.target"];
waybar = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
};
};
waybar = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
copyq = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
Service = {
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
Install = {
WantedBy = ["hyprland-session.target"];
network-manager-applet = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
};
};
copyq = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
# gnome-polkit-agent = {
# Unit = {
# PartOf = ["graphical-session.target"];
# After = ["graphical-session.target"];
# Requisite = ["graphical-session.target"];
# };
# Install = {
# WantedBy = ["hyprland-session.target"];
# };
# Service = {
# Type = "simple";
# ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
# Restart = "on-failure";
# RestartSec = 1;
# TimeoutStopSec = 10;
# };
# };
hyprpolkitagent = {
Install.WantedBy = ["hyprland-session.target"];
Service = {
Type = "simple";
ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
Install = {
WantedBy = ["hyprland-session.target"];
};
Service = {
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
network-manager-applet = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
};
gnome-polkit-agent = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
Service = {
Type = "simple";
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
Restart = "on-failure";
RestartSec = 1;
TimeoutStopSec = 10;
};
};
wlsunset = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
wlsunset = {
Unit = {
PartOf = ["graphical-session.target"];
After = ["graphical-session.target"];
Requisite = ["graphical-session.target"];
};
Install = {
WantedBy = ["hyprland-session.target"];
};
};
};
};