From 0a8475b4078dd0a0fa8cc79bd2db97dda39477c7 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 21 Nov 2024 20:12:04 +0100 Subject: [PATCH] fixup! Fix Sif drivers + hyprland --- modules/hm/hyprland.nix | 5 +++-- modules/hm/waybar.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index d6d71be..dd2ccb2 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -2,6 +2,7 @@ with nixosConfig.nix-rice.lib; let strPalette = palette.toRgbaShortHex nixosConfig.nix-rice.rice.colorPalette; + inherit (config.networking) hostName; in { imports = [ @@ -52,7 +53,7 @@ in enable = true; settings = { input = { - kb_layout = if (nixosConfig.networking.hostName == "thor") or (nixosConfig.networking.hostName == "sif") then "us,it,us" else "it,us,us"; + kb_layout = if ((hostName == "thor") or (hostName == "sif")) then "us,it,us" else "it,us,us"; kb_options = "grp:menu_toggle,compose:rctrl"; kb_variant = ",,colemak"; kb_model = ""; @@ -62,7 +63,7 @@ in touchpad.natural_scroll = true; }; - exec = (lib.lists.optionals (nixosConfig.networking.hostName == "thor") [ + exec = (lib.lists.optionals (hostName == "thor") [ "xrandr --output DP-3 --primary" ]) ++ [ "noti -t 'Hyprland' -m 'New config loaded\!'" diff --git a/modules/hm/waybar.nix b/modules/hm/waybar.nix index a1d735a..ac969d7 100644 --- a/modules/hm/waybar.nix +++ b/modules/hm/waybar.nix @@ -89,7 +89,7 @@ in tray.spacing = 10; clock = { "interval" = 1; - "format" = "{:%T}"; + "format" = "{:%H:%M}"; "tooltip" = true; "tooltip-format" = "{:%a %d/%m/%y}"; # on-click = "mode";