update hyprpanel and hyprland config

This commit is contained in:
dim 2025-01-05 12:13:18 +07:00
parent aca84cd7cf
commit 0907481b8f
3 changed files with 118 additions and 139 deletions

View File

@ -4,14 +4,6 @@ let
inherit (config.var.theme) inherit (config.var.theme)
border-size gaps-in gaps-out active-opacity inactive-opacity rounding blur; border-size gaps-in gaps-out active-opacity inactive-opacity rounding blur;
inherit (config.var) keyboardLayout; inherit (config.var) keyboardLayout;
# border-size = config.var.theme.border-size;
# gaps-in = config.var.theme.gaps-in;
# gaps-out = config.var.theme.gaps-out;
# active-opacity = config.var.theme.active-opacity;
# inactive-opacity = config.var.theme.inactive-opacity;
# rounding = config.var.theme.rounding;
# blur = config.var.theme.blur;
# keyboardLayout = config.var.keyboardLayout;
in { in {
imports = imports =
@ -87,8 +79,6 @@ in {
"QT_QPA_PLATFORM=wayland,xcb" "QT_QPA_PLATFORM=wayland,xcb"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
"ELECTRON_OZONE_PLATFORM_HINT,auto" "ELECTRON_OZONE_PLATFORM_HINT,auto"
# "GTK_THEME,FlatColor:dark"
# "GTK2_RC_FILES,/home/dim/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
"__GL_GSYNC_ALLOWED,0" "__GL_GSYNC_ALLOWED,0"
"__GL_VRR_ALLOWED,0" "__GL_VRR_ALLOWED,0"
"DISABLE_QT5_COMPAT,0" "DISABLE_QT5_COMPAT,0"
@ -100,7 +90,6 @@ in {
"XDG_SESSION_TYPE,wayland" "XDG_SESSION_TYPE,wayland"
"SDL_VIDEODRIVER,wayland" "SDL_VIDEODRIVER,wayland"
"CLUTTER_BACKEND,wayland" "CLUTTER_BACKEND,wayland"
# "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
]; ];
cursor = { cursor = {
@ -154,7 +143,6 @@ in {
input = { input = {
kb_layout = keyboardLayout; kb_layout = keyboardLayout;
# kb_options = "caps:escape";
follow_mouse = 1; follow_mouse = 1;
sensitivity = 0; sensitivity = 0;
repeat_delay = 300; repeat_delay = 300;

View File

@ -1,9 +1,7 @@
# Hyprpanel is the bar on top of the screen # Hyprpanel is the bar on top of the screen
# Display informations like workspaces, battery, wifi, ... # Display informations like workspaces, battery, wifi, ...
{ pkgs, config, inputs, ... }: { config, inputs, ... }:
let let
transparentButtons = config.var.theme.bar.transparentButtons;
accent = "#${config.lib.stylix.colors.base0D}"; accent = "#${config.lib.stylix.colors.base0D}";
accent-alt = "#${config.lib.stylix.colors.base03}"; accent-alt = "#${config.lib.stylix.colors.base03}";
background = "#${config.lib.stylix.colors.base00}"; background = "#${config.lib.stylix.colors.base00}";
@ -12,19 +10,10 @@ let
font = "${config.stylix.fonts.serif.name}"; font = "${config.stylix.fonts.serif.name}";
fontSize = "${toString config.stylix.fonts.sizes.desktop}px"; fontSize = "${toString config.stylix.fonts.sizes.desktop}px";
rounding = config.var.theme.rounding; inherit (config.var.theme) rounding border-size gaps-in gaps-out;
border-size = config.var.theme.border-size; inherit (config.var.theme.bar)
floating transparentButtons transparent position;
gaps-out = config.var.theme.gaps-out; inherit (config.var) cpuTempSensor location username weatherapikey;
gaps-in = config.var.theme.gaps-in;
floating = config.var.theme.bar.floating;
transparent = config.var.theme.bar.transparent;
position = config.var.theme.bar.position;
location = config.var.location;
username = config.var.username;
weatherapikey = config.var.weatherapikey;
in { in {
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
@ -36,151 +25,151 @@ in {
layout = { layout = {
"bar.layouts" = { "bar.layouts" = {
"0" = { "0" = {
left = [ "dashboard" "workspaces" ]; left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ];
middle = [ "media" ]; middle = [ "media" ];
right = [ right = [
"volume"
"network"
"bluetooth"
"battery"
"cputemp"
"systray" "systray"
"volume"
"hyprsunset"
"battery"
"network"
"cputemp"
"clock" "clock"
"notifications" "notifications"
]; ];
}; };
"*" = { "*" = {
left = [ "dashboard" "workspaces" ]; left = [ "dashboard" "workspaces" "windowtitle" ];
middle = [ "clock" ]; middle = [ "clock" ];
right = [ "volume" "notifications" ]; right = [ "volume" "notifications" ];
}; };
}; };
}; };
override = { override = {
theme.bar.buttons.workspaces.hover = accent-alt; bar.battery.hideLabelWhenFull = true;
theme.bar.buttons.workspaces.active = accent; bar.bluetooth.label = false;
theme.bar.buttons.workspaces.available = accent-alt; bar.clock.format = "%a, %d %b %H:%M";
theme.bar.buttons.workspaces.occupied = accent; bar.customModules.cpuTemp.sensor = cpuTempSensor;
theme.bar.menus.background = background; bar.customModules.hypridle.label = false;
theme.bar.menus.card = background-alt; bar.customModules.hyprsunset.label = false;
theme.bar.menus.label = foreground; bar.launcher.icon = "";
theme.bar.menus.text = foreground; bar.media.show_active_only = true;
theme.bar.menus.popover.text = foreground; bar.network.label = false;
theme.bar.menus.popover.background = background-alt; bar.network.truncation_size = 12;
theme.bar.menus.card_radius = "${toString rounding}px"; bar.volume.label = false;
theme.bar.menus.border.size = "${toString border-size}px"; bar.windowtitle.label = true;
theme.bar.menus.border.color = "${accent}"; bar.workspaces.hideUnoccupied = false;
theme.bar.menus.border.radius = "${toString rounding}px"; bar.workspaces.monitorSpecific = true;
theme.bar.menus.listitems.active = "${accent}"; menus.clock.time.hideSeconds = true;
theme.bar.menus.icons.active = "${accent}"; menus.clock.time.military = true;
theme.bar.menus.switch.enabled = "${accent}"; menus.clock.weather.key = weatherapikey;
theme.bar.menus.check_radio_button.active = "${accent}"; menus.clock.weather.location = location;
theme.bar.menus.buttons.default = "${accent}"; menus.clock.weather.unit = "metric";
theme.bar.menus.buttons.active = "${accent}"; menus.dashboard.powermenu.avatar.image =
theme.bar.menus.iconbuttons.active = "${accent}"; "/home/${username}/.profile_picture.png";
theme.bar.menus.progressbar.foreground = "${accent}"; menus.dashboard.powermenu.confirmation = false;
theme.bar.menus.slider.primary = "${accent}"; menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
theme.bar.menus.tooltip.background = "${background-alt}"; menus.dashboard.shortcuts.left.shortcut1.icon = "";
theme.bar.menus.tooltip.text = "${foreground}"; menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
theme.bar.menus.dropdownmenu.background = "${background-alt}"; menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
theme.bar.menus.dropdownmenu.text = "${foreground}"; menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
theme.bar.margin_top = menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
"${if position == "top" then toString (gaps-in * 2) else "0"}px"; menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
theme.bar.margin_bottom = menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
"${if position == "top" then "0" else toString (gaps-in * 2)}px"; menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
theme.bar.margin_sides = "${toString gaps-out}px"; menus.dashboard.shortcuts.left.shortcut4.command = "menu";
theme.bar.border_radius = "${toString rounding}px"; menus.dashboard.shortcuts.left.shortcut4.icon = "";
theme.bar.menus.monochrome = true; menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
theme.bar.buttons.monochrome = true; menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
theme.bar.outer_spacing = if floating && transparent then "0" else "8"; menus.dashboard.shortcuts.right.shortcut1.icon = "";
theme.bar.buttons.y_margins = menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
if floating && transparent then "0" else "8"; menus.dashboard.shortcuts.right.shortcut3.command =
"screenshot region swappy";
menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
menus.dashboard.stats.enabled = false;
theme.bar.background = theme.bar.background =
"${background + (if transparentButtons then "00" else "")}"; "${background + (if transparentButtons then "00" else "")}";
theme.bar.border_radius = "${toString rounding}px";
theme.bar.buttons.background = theme.bar.buttons.background =
"${(if transparent then background else background-alt) "${(if transparent then background else background-alt)
+ (if transparentButtons then "00" else "")}"; + (if transparentButtons then "00" else "")}";
theme.bar.buttons.dashboard.spacing = "0.2em";
theme.bar.buttons.icon = "${accent}";
theme.bar.buttons.notifications.background = "${background-alt}";
theme.bar.buttons.hover = "${background}"; theme.bar.buttons.hover = "${background}";
theme.bar.buttons.icon = "${accent}";
theme.bar.buttons.monochrome = true;
theme.bar.buttons.notifications.background = "${background-alt}";
theme.bar.buttons.notifications.hover = "${background}"; theme.bar.buttons.notifications.hover = "${background}";
theme.bar.buttons.notifications.total = "${accent}";
theme.bar.buttons.notifications.icon = "${accent}"; theme.bar.buttons.notifications.icon = "${accent}";
theme.notification.background = "${background-alt}"; theme.bar.buttons.notifications.total = "${accent}";
theme.notification.actions.background = "${accent}";
theme.notification.actions.text = "${foreground}";
theme.notification.label = "${accent}";
theme.notification.border = "${background-alt}";
theme.notification.text = "${foreground}";
theme.notification.labelicon = "${accent}";
theme.osd.bar_color = "${accent}";
theme.osd.bar_overflow_color = "${accent-alt}";
theme.osd.icon = "${background}";
theme.osd.icon_container = "${accent}";
theme.osd.label = "${accent}";
theme.osd.bar_container = "${background-alt}";
theme.bar.menus.menu.media.background.color = "${background-alt}";
theme.bar.menus.menu.media.card.color = "${background-alt}";
theme.bar.menus.menu.media.card.tint = 90;
theme.bar.floating = if floating then "true" else "false";
theme.bar.buttons.padding_x = "0.6rem"; theme.bar.buttons.padding_x = "0.6rem";
theme.bar.buttons.padding_y = "0.3rem"; theme.bar.buttons.padding_y = "0.3rem";
theme.bar.buttons.spacing = "0.1em"; theme.bar.buttons.spacing = "0.1em";
theme.bar.buttons.text = foreground; theme.bar.buttons.text = foreground;
theme.bar.buttons.workspaces.active = accent;
theme.bar.buttons.workspaces.available = accent-alt;
theme.bar.buttons.workspaces.hover = accent-alt;
theme.bar.buttons.workspaces.occupied = accent;
theme.bar.buttons.y_margins =
if floating && transparent then "0" else "8";
theme.bar.floating = if floating then "true" else "false";
theme.bar.location = position; theme.bar.location = position;
theme.bar.margin_bottom =
"${if position == "top" then "0" else toString (gaps-in * 2)}px";
theme.bar.margin_sides = "${toString gaps-out}px";
theme.bar.margin_top =
"${if position == "top" then toString (gaps-in * 2) else "0"}px";
theme.bar.menus.background = background;
theme.bar.menus.border.color = "${accent}";
theme.bar.menus.border.radius = "${toString rounding}px";
theme.bar.menus.border.size = "${toString border-size}px";
theme.bar.menus.buttons.active = "${accent}";
theme.bar.menus.buttons.default = "${accent}";
theme.bar.menus.card = background-alt;
theme.bar.menus.card_radius = "${toString rounding}px";
theme.bar.menus.check_radio_button.active = "${accent}";
theme.bar.menus.dropdownmenu.background = "${background-alt}";
theme.bar.menus.dropdownmenu.text = "${foreground}";
theme.bar.menus.iconbuttons.active = "${accent}";
theme.bar.menus.icons.active = "${accent}";
theme.bar.menus.label = foreground;
theme.bar.menus.listitems.active = "${accent}";
theme.bar.menus.menu.media.background.color = "${background-alt}";
theme.bar.menus.menu.media.card.color = "${background-alt}";
theme.bar.menus.menu.media.card.tint = 90;
theme.bar.menus.monochrome = true;
theme.bar.menus.popover.background = background-alt;
theme.bar.menus.popover.text = foreground;
theme.bar.menus.progressbar.foreground = "${accent}";
theme.bar.menus.slider.primary = "${accent}";
theme.bar.menus.switch.enabled = "${accent}";
theme.bar.menus.text = foreground;
theme.bar.menus.tooltip.background = "${background-alt}";
theme.bar.menus.tooltip.text = "${foreground}";
theme.bar.outer_spacing = if floating && transparent then "0" else "8";
theme.bar.transparent = transparent; theme.bar.transparent = transparent;
theme.font.name = font; theme.font.name = font;
theme.font.size = fontSize; theme.font.size = fontSize;
theme.bar.buttons.dashboard.spacing = "0.2em"; theme.notification.actions.background = "${accent}";
}; theme.notification.actions.text = "${foreground}";
settings = { theme.notification.background = "${background-alt}";
bar.battery.hideLabelWhenFull = true; theme.notification.border = "${background-alt}";
bar.launcher.icon = ""; theme.notification.label = "${accent}";
bar.clock.format = "%a, %d %b %H:%M"; theme.notification.labelicon = "${accent}";
menus.clock.time.military = true; theme.notification.text = "${foreground}";
menus.clock.time.hideSeconds = true; theme.osd.bar_color = "${accent}";
menus.clock.weather.unit = "metric"; theme.osd.bar_container = "${background-alt}";
menus.clock.weather.key = weatherapikey; theme.osd.bar_overflow_color = "${accent-alt}";
menus.clock.weather.location = location; theme.osd.icon = "${background}";
theme.osd.orientation = "vertical"; theme.osd.icon_container = "${accent}";
theme.osd.label = "${accent}";
theme.osd.location = "left"; theme.osd.location = "left";
theme.osd.radius = "${toString rounding}px";
theme.osd.margins = "0px 0px 0px 10px"; theme.osd.margins = "0px 0px 0px 10px";
theme.osd.muted_zero = true; theme.osd.muted_zero = true;
theme.osd.orientation = "vertical";
theme.osd.radius = "${toString rounding}px";
wallpaper.enable = false; wallpaper.enable = false;
bar.media.show_active_only = true;
bar.workspaces.monitorSpecific = true;
bar.workspaces.hideUnoccupied = false;
bar.windowtitle.label = true;
bar.volume.label = false;
bar.network.truncation_size = 12;
bar.bluetooth.label = false;
menus.dashboard.powermenu.avatar.image =
"/home/${username}/.profile_picture.png";
menus.dashboard.powermenu.confirmation = false;
menus.dashboard.shortcuts.left.shortcut1.icon = "";
menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
menus.dashboard.shortcuts.left.shortcut4.icon = "";
menus.dashboard.shortcuts.left.shortcut4.command = "menu";
menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
menus.dashboard.shortcuts.right.shortcut1.icon = "";
menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
menus.dashboard.shortcuts.right.shortcut3.command =
"screenshot region swappy";
menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
menus.dashboard.stats.enabled = false;
bar.customModules.cpuTemp.sensor =
"/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input";
}; };
}; };
} }

View File

@ -29,6 +29,8 @@
autoUpgrade = false; autoUpgrade = false;
autoGarbageCollector = false; autoGarbageCollector = false;
cpuTempSensor =
"/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input";
theme = import ../../themes/var/nixy.nix; theme = import ../../themes/var/nixy.nix;
}; };