diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 758068a..c7421fb 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -4,14 +4,6 @@ let inherit (config.var.theme) border-size gaps-in gaps-out active-opacity inactive-opacity rounding blur; 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 { imports = @@ -87,8 +79,6 @@ in { "QT_QPA_PLATFORM=wayland,xcb" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "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_VRR_ALLOWED,0" "DISABLE_QT5_COMPAT,0" @@ -100,7 +90,6 @@ in { "XDG_SESSION_TYPE,wayland" "SDL_VIDEODRIVER,wayland" "CLUTTER_BACKEND,wayland" - # "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU ]; cursor = { @@ -154,7 +143,6 @@ in { input = { kb_layout = keyboardLayout; - # kb_options = "caps:escape"; follow_mouse = 1; sensitivity = 0; repeat_delay = 300; diff --git a/home/system/hyprpanel/default.nix b/home/system/hyprpanel/default.nix index 53586ce..d570617 100644 --- a/home/system/hyprpanel/default.nix +++ b/home/system/hyprpanel/default.nix @@ -1,9 +1,7 @@ # Hyprpanel is the bar on top of the screen # Display informations like workspaces, battery, wifi, ... -{ pkgs, config, inputs, ... }: +{ config, inputs, ... }: let - transparentButtons = config.var.theme.bar.transparentButtons; - accent = "#${config.lib.stylix.colors.base0D}"; accent-alt = "#${config.lib.stylix.colors.base03}"; background = "#${config.lib.stylix.colors.base00}"; @@ -12,19 +10,10 @@ let font = "${config.stylix.fonts.serif.name}"; fontSize = "${toString config.stylix.fonts.sizes.desktop}px"; - rounding = config.var.theme.rounding; - border-size = config.var.theme.border-size; - - gaps-out = config.var.theme.gaps-out; - 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; + inherit (config.var.theme) rounding border-size gaps-in gaps-out; + inherit (config.var.theme.bar) + floating transparentButtons transparent position; + inherit (config.var) cpuTempSensor location username weatherapikey; in { imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; @@ -36,151 +25,151 @@ in { layout = { "bar.layouts" = { "0" = { - left = [ "dashboard" "workspaces" ]; + left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ]; middle = [ "media" ]; right = [ - "volume" - "network" - "bluetooth" - "battery" - "cputemp" "systray" + "volume" + "hyprsunset" + "battery" + "network" + "cputemp" "clock" "notifications" ]; }; "*" = { - left = [ "dashboard" "workspaces" ]; + left = [ "dashboard" "workspaces" "windowtitle" ]; middle = [ "clock" ]; right = [ "volume" "notifications" ]; }; }; }; + override = { - theme.bar.buttons.workspaces.hover = accent-alt; - theme.bar.buttons.workspaces.active = accent; - theme.bar.buttons.workspaces.available = accent-alt; - theme.bar.buttons.workspaces.occupied = accent; - theme.bar.menus.background = background; - theme.bar.menus.card = background-alt; - theme.bar.menus.label = foreground; - theme.bar.menus.text = foreground; - theme.bar.menus.popover.text = foreground; - theme.bar.menus.popover.background = background-alt; - theme.bar.menus.card_radius = "${toString rounding}px"; - theme.bar.menus.border.size = "${toString border-size}px"; - theme.bar.menus.border.color = "${accent}"; - theme.bar.menus.border.radius = "${toString rounding}px"; - theme.bar.menus.listitems.active = "${accent}"; - theme.bar.menus.icons.active = "${accent}"; - theme.bar.menus.switch.enabled = "${accent}"; - theme.bar.menus.check_radio_button.active = "${accent}"; - theme.bar.menus.buttons.default = "${accent}"; - theme.bar.menus.buttons.active = "${accent}"; - theme.bar.menus.iconbuttons.active = "${accent}"; - theme.bar.menus.progressbar.foreground = "${accent}"; - theme.bar.menus.slider.primary = "${accent}"; - theme.bar.menus.tooltip.background = "${background-alt}"; - theme.bar.menus.tooltip.text = "${foreground}"; - theme.bar.menus.dropdownmenu.background = "${background-alt}"; - theme.bar.menus.dropdownmenu.text = "${foreground}"; - theme.bar.margin_top = - "${if position == "top" then toString (gaps-in * 2) else "0"}px"; - 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.border_radius = "${toString rounding}px"; - theme.bar.menus.monochrome = true; - theme.bar.buttons.monochrome = true; - theme.bar.outer_spacing = if floating && transparent then "0" else "8"; - theme.bar.buttons.y_margins = - if floating && transparent then "0" else "8"; + bar.battery.hideLabelWhenFull = true; + bar.bluetooth.label = false; + bar.clock.format = "%a, %d %b %H:%M"; + bar.customModules.cpuTemp.sensor = cpuTempSensor; + bar.customModules.hypridle.label = false; + bar.customModules.hyprsunset.label = false; + bar.launcher.icon = ""; + bar.media.show_active_only = true; + bar.network.label = false; + bar.network.truncation_size = 12; + bar.volume.label = false; + bar.windowtitle.label = true; + bar.workspaces.hideUnoccupied = false; + bar.workspaces.monitorSpecific = true; + menus.clock.time.hideSeconds = true; + menus.clock.time.military = true; + menus.clock.weather.key = weatherapikey; + menus.clock.weather.location = location; + menus.clock.weather.unit = "metric"; + menus.dashboard.powermenu.avatar.image = + "/home/${username}/.profile_picture.png"; + menus.dashboard.powermenu.confirmation = false; + menus.dashboard.shortcuts.left.shortcut1.command = "firefox"; + menus.dashboard.shortcuts.left.shortcut1.icon = ""; + menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox"; + menus.dashboard.shortcuts.left.shortcut2.command = "caffeine"; + menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶"; + menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine"; + menus.dashboard.shortcuts.left.shortcut3.command = "night-shift"; + menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔"; + menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift"; + menus.dashboard.shortcuts.left.shortcut4.command = "menu"; + menus.dashboard.shortcuts.left.shortcut4.icon = ""; + menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps"; + menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a"; + menus.dashboard.shortcuts.right.shortcut1.icon = ""; + menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker"; + 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 = "${background + (if transparentButtons then "00" else "")}"; + theme.bar.border_radius = "${toString rounding}px"; theme.bar.buttons.background = "${(if transparent then background else background-alt) + (if transparentButtons then "00" else "")}"; - - theme.bar.buttons.icon = "${accent}"; - theme.bar.buttons.notifications.background = "${background-alt}"; + theme.bar.buttons.dashboard.spacing = "0.2em"; 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.total = "${accent}"; theme.bar.buttons.notifications.icon = "${accent}"; - theme.notification.background = "${background-alt}"; - 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.notifications.total = "${accent}"; theme.bar.buttons.padding_x = "0.6rem"; theme.bar.buttons.padding_y = "0.3rem"; theme.bar.buttons.spacing = "0.1em"; 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.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.font.name = font; theme.font.size = fontSize; - theme.bar.buttons.dashboard.spacing = "0.2em"; - }; - settings = { - bar.battery.hideLabelWhenFull = true; - bar.launcher.icon = ""; - bar.clock.format = "%a, %d %b %H:%M"; - menus.clock.time.military = true; - menus.clock.time.hideSeconds = true; - menus.clock.weather.unit = "metric"; - menus.clock.weather.key = weatherapikey; - menus.clock.weather.location = location; - theme.osd.orientation = "vertical"; + theme.notification.actions.background = "${accent}"; + theme.notification.actions.text = "${foreground}"; + theme.notification.background = "${background-alt}"; + theme.notification.border = "${background-alt}"; + theme.notification.label = "${accent}"; + theme.notification.labelicon = "${accent}"; + theme.notification.text = "${foreground}"; + theme.osd.bar_color = "${accent}"; + theme.osd.bar_container = "${background-alt}"; + theme.osd.bar_overflow_color = "${accent-alt}"; + theme.osd.icon = "${background}"; + theme.osd.icon_container = "${accent}"; + theme.osd.label = "${accent}"; theme.osd.location = "left"; - theme.osd.radius = "${toString rounding}px"; theme.osd.margins = "0px 0px 0px 10px"; theme.osd.muted_zero = true; + theme.osd.orientation = "vertical"; + theme.osd.radius = "${toString rounding}px"; 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"; }; }; } diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index 961dd5f..1222e5a 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -29,6 +29,8 @@ autoUpgrade = false; autoGarbageCollector = false; + cpuTempSensor = + "/sys/devices/platform/thinkpad_hwmon/hwmon/hwmon5/temp1_input"; theme = import ../../themes/var/nixy.nix; };