diff --git a/apps/hyprland/hypr/general.nix b/apps/hyprland/hypr/general.nix index 1d296b1..5b2b960 100644 --- a/apps/hyprland/hypr/general.nix +++ b/apps/hyprland/hypr/general.nix @@ -1,8 +1,9 @@ -{ +{myConfig, ...}: { wayland.windowManager.hyprland.settings = { general = { gaps_in = 5; gaps_out = 15; }; + monitor = myConfig.hyprland.monitors; }; } diff --git a/apps/waybar/home.nix b/apps/waybar/home.nix index f3fff2d..611f54b 100644 --- a/apps/waybar/home.nix +++ b/apps/waybar/home.nix @@ -3,6 +3,9 @@ pkgs, ... }: { + imports = [ + ./style.nix + ]; programs.waybar = { enable = true; settings = { diff --git a/apps/waybar/style.nix b/apps/waybar/style.nix new file mode 100644 index 0000000..eadd79b --- /dev/null +++ b/apps/waybar/style.nix @@ -0,0 +1,89 @@ +{ + programs.waybar = { + style = '' + @import "../omarchy/current/theme/waybar.css"; + + * { + background-color: @background; + color: @foreground; + + border: none; + border-radius: 0; + min-height: 0; + font-family: 'JetBrainsMono Nerd Font'; + font-size: 12px; + } + + .modules-left { + margin-left: 8px; + } + + .modules-right { + margin-right: 8px; + } + + #workspaces button { + all: initial; + padding: 0 6px; + margin: 0 1.5px; + min-width: 9px; + } + + #workspaces button.empty { + opacity: 0.5; + } + + #cpu, + #battery, + #pulseaudio, + #custom-omarchy, + #custom-screenrecording-indicator, + #custom-update { + min-width: 12px; + margin: 0 7.5px; + } + + #tray { + margin-right: 16px; + } + + #bluetooth { + margin-right: 17px; + } + + #network { + margin-right: 13px; + } + + #custom-expand-icon { + margin-right: 18px; + } + + tooltip { + padding: 2px; + } + + #custom-update { + font-size: 10px; + } + + #clock { + margin-left: 8.75px; + } + + .hidden { + opacity: 0; + } + + #custom-screenrecording-indicator { + min-width: 12px; + margin-left: 8.75px; + font-size: 10px; + } + + #custom-screenrecording-indicator.active { + color: #a55555; + } + ''; + }; +} diff --git a/config.nix b/config.nix index 0b701b2..7776267 100644 --- a/config.nix +++ b/config.nix @@ -28,5 +28,8 @@ update = "sudo nixos-rebuild switch --flake ~/.config/nixos-new/#hakase"; }; }; + hyprland = { + monitors = ["HDMI-A-1, 1920x1080@120, auto, 1"]; + }; }; }