diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index a84ced2..d8ec2fd 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -4,18 +4,24 @@ monitor=,preferred,auto,auto # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox -exec-once = waybar & dunst exec-once = lxqt-policykit-agent +exec-once = nm-applet --indicator & +exec-once = waybar +exec-once = dunst # Window rules windowrulev2 = float,class:(lxqt-policykit-agent) +windowrulev2 = float,class:(nm-connection-editor) +windowrulev2 = float,class:(pavucontrol) +windowrulev2 = size 40%,40%,class:(pavucontrol) +windowrulev2 = center,class:(pavucontrol) windowrulev2 = fullscreen,class:(Code) -windowrulev2 = fullscreen,class:(firefox) +windowrulev2 = fakefullscreen,class:(firefox) windowrulev2 = fakefullscreen, class:^(code-url-handler)$ # Some default env vars. env = XCURSOR_SIZE,24 -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ + input { kb_layout = us follow_mouse = 1 @@ -28,19 +34,16 @@ input { general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more gaps_in = 5 gaps_out = 20 border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.inactive_border = rgba(595959aa) layout = dwindle - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on allow_tearing = false } decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 5 blur { enabled = true @@ -65,46 +68,39 @@ animations { } dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = yes # you probably want this } master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = true } gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = on workspace_swipe_fingers = 4 workspace_swipe_create_new = true } misc { - # See https://wiki.hyprland.org/Configuring/Variables/ for more force_default_wallpaper = 0 + disable_splash_rendering = false } xwayland { force_zero_scaling = true } -# device:epic-mouse-v1 { -# sensitivity = -0.5 -# } $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, F, exec, firefox bind = $mainMod, T, exec, kitty -bind = $mainMod, C, killactive, +bind = $mainMod, F4, killactive, bind = $mainMod, E, exec, nautilus + bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, wofi --show drun -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, space, exec, rofi -show drun # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l @@ -150,5 +146,6 @@ bind = $mainMod, mouse_up, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, Control_L, movewindow bindm = $mainMod, mouse:273, resizewindow - +bindm = $mainMod, ALT_L, resizewindow diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index cd84837..d59aaef 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -1,177 +1,95 @@ -// -*- mode: jsonc -*- { - "layer": "top", - "position": "top", - "spacing": 8, // Gaps between modules (4px) - "reload_style_on_change": true, - "modules-left": [ - "hyprland/workspaces" - // "hyprland/submap" - ], - "modules-center": [ - "clock" - // "power-profiles-daemon" - ], - "modules-right": [ - "group/indicators" -// "mpd", - // "idle_inhibitor", - // "backlight", - // "tray" - ], - "group/indicators": { - "orientation": "orthogonal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": true - }, - "modules": [ - "battery", - "network", - "cpu", - "memory", - "temperature", - "keyboard-state", - "pulseaudio" - ] - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 5, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "timezone": "America/Toronto", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}%", - "tooltip": false - }, - "memory": { - "format": "{}%" - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-full": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", - "tooltip": true, - "format-icons": { - "default": "", - "performance": "", - "balanced": "", - "power-saver": "" - } - }, - "network": { - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": " {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + "layer": "top", + "modules-left": [ + "hyprland/workspaces" + ], + "modules-center": [ + "clock" + ], + "modules-right": [ + "backlight", + "pulseaudio", + "bluetooth", + "network", + "battery" + ], + "hyprland/workspaces": { + "format": "{icon}", + "tooltip": false, + "all-outputs": true, + "format-icons": { + "active": "", + "default": "" } -} + }, + "clock": { + "format": "{:%H:%M}", + }, + "backlight": { + "device": "intel_backlight", + "format": "{icon} {percent}%", + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": "", + "tooltip": false, + "format-icons": { + "headphone": "", + "default": [ + "", + "", + "󰕾", + "󰕾", + "󰕾", + "", + "", + "" + ] + }, + "scroll-step": 1, + "on-click": "pavucontrol" + }, + "bluetooth": { + "format": " {status}", + "format-disabled": "", // an empty format will hide the module + "format-connected": " {num_connections}", + "tooltip-format": "{device_enumerate}", + "tooltip-format-enumerate-connected": "{device_alias} {device_address}" + }, + "network": { + "format": "{ifname}", + "format-wifi": "{essid}", + "format-ethernet": "{ipaddr}/{cidr} ", + "format-disconnected": "󰖪 No Network", + "tooltip": false, + "on-click": "nm-connection-editor" + }, + "battery": { + "format": "{icon} {capacity}%", + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "format-charging": " {capacity}%", + "tooltip": false, + }, +} \ No newline at end of file diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 92df1f4..d874697 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,16 +1,60 @@ -@import "mocha.css"; - * { - color: @text; - font-family: "Arimo Nerd Font", "Font Awesome 6 Free"; border: none; - border-radius: 0; - font-size: 13px; - min-height: 0; + font-family: 'Fira Code', 'Symbols Nerd Font Mono'; + font-size: 16px; + font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; + min-height: 45px; } window#waybar { - background-color: shade(@base, 0.9); - border: 2px solid alpha(@crust, 0.3); + background: transparent; } +#custom-arch, #workspaces { + border-radius: 10px; + background-color: #11111b; + color: #b4befe; + margin-top: 15px; + margin-right: 15px; + padding-top: 1px; + padding-left: 10px; + padding-right: 10px; +} + +#custom-arch { + font-size: 20px; + margin-left: 15px; + color: #b4befe; +} + +#workspaces button { + background: #11111b; + color: #b4befe; +} + +#clock, #backlight, #pulseaudio, #bluetooth, #network, #battery{ + border-radius: 10px; + background-color: #11111b; + color: #cdd6f4; + margin-top: 15px; + padding-left: 10px; + padding-right: 10px; + margin-right: 15px; +} + +#backlight, #bluetooth { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + padding-right: 5px; + margin-right: 0 +} + +#pulseaudio, #network { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + padding-left: 5px; +} + +#clock { + margin-right: 0; +} \ No newline at end of file diff --git a/modules/optional/hyprland.nix b/modules/optional/hyprland.nix index 9afda20..6d82f52 100644 --- a/modules/optional/hyprland.nix +++ b/modules/optional/hyprland.nix @@ -1,35 +1,45 @@ { user }: { pkgs, ... }: { - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + }; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; programs.waybar.enable = true; environment.systemPackages = with pkgs; [ + # common utilities + busybox + scdoc + mpv + gcc + # apps kitty - xdg-desktop-portal-hyprland - dunst + # sound pavucontrol + # notification daemon + dunst + libnotify + # hypland lxqt.lxqt-policykit + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + # networking + networkmanagerapplet + # waybar + meson + wayland-protocols + wayland-utils + wl-clipboard + wlroots + # app launchers + rofi-wayland + wofi ]; services.mpd.enable = true; - services.pipewire.enable = true; services.pipewire.wireplumber.enable = true; - # security.polkit.enable = true; users.users.${user.name}.extraGroups = [ "input" ]; - # systemd = { - # user.services.polkit-gnome-authentication-agent-1 = { - # description = "polkit-gnome-authentication-agent-1"; - # wantedBy = [ "graphical-session.target" ]; - # wants = [ "graphical-session.target" ]; - # after = [ "graphical-session.target" ]; - # serviceConfig = { - # Type = "simple"; - # ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - # Restart = "on-failure"; - # RestartSec = 1; - # TimeoutStopSec = 10; - # }; - # }; - # }; }