diff --git a/configs/hypr/hypridle.conf b/configs/hypr/hypridle.conf new file mode 100644 index 0000000..acff703 --- /dev/null +++ b/configs/hypr/hypridle.conf @@ -0,0 +1,53 @@ +# general { +# lock_cmd = notify-send "hyprctl notify 0 5000 'rgb(ff0000)' 'Locking...'" # dbus/sysd lock command (loginctl lock-session) +# # unlock_cmd = notify-send "unlock!" # same as above, but unlock +# before_sleep_cmd = notify-send "hyprctl notify 0 5000 'rgb(ff0000)' 'Going to sleep...'" # command ran before sleep +# # after_sleep_cmd = notify-send "Awake!" # command ran after sleep +# ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) +# } + +# listener { +# timeout = 300 # in seconds +# on-timeout = notify-send "You are idle!" # command to run when timeout has passed +# } + +# listener { +# timeout = 305 # in seconds +# on-timeout = notify-send "Going!" # command to run when timeout has passed +# on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired. +# } + +general { + # lock_cmd = pidof hyprlock || hyprlock # avoid starting multiple hyprlock instances. + before_sleep_cmd = loginctl lock-session # lock before suspend. + after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. +} + +listener { + timeout = 15 # 2.5min. + on-timeout = brightnessctl -s set 10 # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = brightnessctl -r # monitor backlight restor. +} + +# turn off keyboard backlight, uncomment this section if have keyboard backlight. +listener { + timeout = 15 # 2.5min. + on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight. + on-resume = brightnessctl -rd rgb:kbd_backlight # turn on keyboard backlight. +} + +listener { + timeout = 30 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 38 # 5.5min + on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed + on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. +} + +listener { + timeout = 180 # 30min + on-timeout = systemctl suspend # suspend pc +} \ No newline at end of file diff --git a/configs/hypr/hyprland.d/bg-proc.conf b/configs/hypr/hyprland.d/bg-proc.conf index fa75915..9993371 100644 --- a/configs/hypr/hyprland.d/bg-proc.conf +++ b/configs/hypr/hyprland.d/bg-proc.conf @@ -2,4 +2,5 @@ exec-once = lxqt-policykit-agent exec-once = dunst --startup_notification exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = swww-daemon -exec-once = hypridle \ No newline at end of file +exec-once = hypridle +exec-once = waybar diff --git a/configs/hypr/hyprland.d/keybindings.conf b/configs/hypr/hyprland.d/keybindings.conf index 76adb27..ce04d42 100644 --- a/configs/hypr/hyprland.d/keybindings.conf +++ b/configs/hypr/hyprland.d/keybindings.conf @@ -10,14 +10,15 @@ bind = $mainMod, R, exec, $cmdlauncher # My Binds bind = $mainMod, T, exec, $term -bind = $mainMod, Q, killactive, +bind = $mainMod, Q, killactive, bind = ALT, F4, killactive, -bind = $mainMod, V, togglefloating, +bind = $mainMod, V, togglefloating, bind = $mainMod SHIFT, F, fullscreen +bind = $mainMod, P, exec, rofimoji # Screen shot bind = $mainMod, s, exec, hyprshot -m region -r | swappy -f - -# bind = $mainMod, , exec wl-screenrec --audio -g "$(slurp)" +# bind = $mainMod, , exec wl-screenrec --audio -g "$(slurp)" # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l @@ -26,7 +27,7 @@ bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d -# Switch workspaces with mainMod +# Switch workspaces with mainMod bind = $mainMod, right, workspace, +1 bind = $mainMod, left, workspace, -1 diff --git a/configs/hypr/hyprland.d/special-window-rules.conf b/configs/hypr/hyprland.d/special-window-rules.conf index 31d423f..35d06ce 100644 --- a/configs/hypr/hyprland.d/special-window-rules.conf +++ b/configs/hypr/hyprland.d/special-window-rules.conf @@ -11,6 +11,11 @@ windowrulev2 = fakefullscreen, class:^(code-url-handler)$ # VLC windowrulev2 = fullscreen,class:(vlc.*) +# Rofi Randomness (mostly for rofimoji) +windowrulev2 = float,class:(Rofi) +windowrulev2 = size 30% 90%,class:(Rofi) +windowrulev2 = move 5% 5%,class:(Rofi) + $centerable = (Slack|nm-connection-editor|pavucontrol|system-config-printer|lxqt-policykit-agent|amdgpu_top|.*blueman.*|thunar) # Centerable & Floatable diff --git a/configs/nwg-bar/bar.json b/configs/nwg-bar/bar.json new file mode 100644 index 0000000..baadef0 --- /dev/null +++ b/configs/nwg-bar/bar.json @@ -0,0 +1,22 @@ +[ + { + "label": "Lock", + "exec": "swaylock -f -c 000000", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-lock-screen.svg" + }, + { + "label": "Logout", + "exec": "swaymsg exit", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-log-out.svg" + }, + { + "label": "Reboot", + "exec": "systemctl reboot", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-reboot.svg" + }, + { + "label": "Shutdown", + "exec": "systemctl -i poweroff", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-shutdown.svg" + } +] \ No newline at end of file diff --git a/configs/nwg-bar/style.css b/configs/nwg-bar/style.css new file mode 100644 index 0000000..50e547d --- /dev/null +++ b/configs/nwg-bar/style.css @@ -0,0 +1,35 @@ +window { + background-color: rgba (0, 0, 0, 1.0) +} + +/* Outer bar container, takes all the window width/height */ +#outer-box { + margin: 0px +} + +/* Inner bar container, surrounds buttons */ +#inner-box { + background-color: rgba (0, 0, 0, 0.85); + border-radius: 10px; + border-style: none; + border-width: 1px; + border-color: rgba (156, 142, 122, 0.7); + padding: 5px; + margin: 5px +} + +button, image { + background: none; + border: none; + box-shadow: none +} + +button { + padding-left: 10px; + padding-right: 10px; + margin: 5px +} + +button:hover { + background-color: rgba (255, 255, 255, 0.1) +} diff --git a/configs/waybar/config b/configs/waybar/config new file mode 100644 index 0000000..663727f --- /dev/null +++ b/configs/waybar/config @@ -0,0 +1,129 @@ +{ + "layer": "bottom", + "position": "bottom", + "mod": "dock", + "exclusive": true, + "gtk-layer-shell": true, + "margin-bottom": -1, + "passthrough": false, + "height": 41, + "modules-left": [ + "custom/os_button", + "hyprland/workspaces", + "wlr/taskbar" + ], + "modules-center": [], + "modules-right": [ + "cpu", + // "temperature", + "memory", + // "disk", + // "tray", + "pulseaudio", + "network", + "battery", + "clock" + ], + "hyprland/workspaces": { + "icon-size": 32, + "spacing": 16, + "on-scroll-up": "hyprctl dispatch workspace r+1", + "on-scroll-down": "hyprctl dispatch workspace r-1" + }, + "custom/os_button": { + "format": "🦀", + "on-click": "nwg-bar", + "tooltip": false + }, + "cpu": { + "interval": 5, + "format": "💻 {usage}%", + "max-length": 10 + }, + "temperature": { + "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon", + "input-filename": "temp2_input", + "critical-threshold": 75, + "tooltip": false, + "format-critical": "({temperatureC}°C)", + "format": "({temperatureC}°C)" + }, + "disk": { + "interval": 30, + "format": "💾 {percentage_used}%", + "path": "/", + "tooltip": true, + "unit": "GB", + "tooltip-format": "Available {free} of {total}" + }, + "memory": { + "interval": 10, + "format": "🐏 {percentage}%", + "max-length": 10, + "tooltip": true, + "tooltip-format": "RAM - {used:0.1f}GiB used" + }, + "wlr/taskbar": { + "format": "{icon} {title:.17}", + "icon-size": 28, + "spacing": 3, + "on-click-middle": "close", + "tooltip-format": "{title}", + "ignore-list": [], + "on-click": "activate" + }, + "tray": { + "icon-size": 18, + "spacing": 3 + }, + "clock": { + "format": " {:%R\n %d.%m.%Y}", + "actions": { + "on-click-right": "mode", + "on-click-forward": "tz_up", + "on-click-backward": "tz_down", + "on-scroll-up": "shift_up", + "on-scroll-down": "shift_down" + } + }, + "network": { + "format-wifi": " {icon}", + "format-ethernet": " 🔌 ", + "format-disconnected": " 🟥" + }, + "battery": { + "states": { + "good": 95, + "warning": 30, + "critical": 20 + }, + "format": "{icon} {capacity}%", + "format-charging": "🔋 {capacity}%", + "format-plugged": "🔌 {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": [ + "🔋" + ] + }, + "pulseaudio": { + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon}", + "format-icons": { + "alsa_output.pci-0000_00_1f.3.analog-stereo": "", + "alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "", + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "phone-muted": "", + "portable": "", + "car": "", + "default": [ + "", + "" + ] + }, + "scroll-step": 1, + "on-click": "pavucontrol" + } +} diff --git a/configs/waybar/style.css b/configs/waybar/style.css new file mode 100644 index 0000000..f038def --- /dev/null +++ b/configs/waybar/style.css @@ -0,0 +1,181 @@ + +/*base background color*/ +@define-color bg_main rgba(25, 25, 25, 0.65); +@define-color bg_main_tooltip rgba(0, 0, 0, 0.7); + + +/*base background color of selections */ +@define-color bg_hover rgba(200, 200, 200, 0.3); +/*base background color of active elements */ +@define-color bg_active rgba(100, 100, 100, 0.5); + +/*base border color*/ +@define-color border_main rgba(255, 255, 255, 0.2); + +/*text color for entries, views and content in general */ +@define-color content_main white; +/*text color for entries that are unselected */ +@define-color content_inactive rgba(255, 255, 255, 0.25); + +* { + text-shadow: none; + box-shadow: none; + border: none; + border-radius: 0; + font-family: "Fira Code", "Ubuntu"; + font-weight: 600; + font-size: 12.7px; +} + +window#waybar { + background: @bg_main; + border-top: 1px solid @border_main; + color: @content_main; +} + +tooltip { + background: @bg_main_tooltip; + border-radius: 5px; + border-width: 1px; + border-style: solid; + border-color: @border_main; +} +tooltip label{ + color: @content_main; +} + +#custom-os_button { + font-family: "JetBrainsMono Nerd Font"; + font-size: 24px; + padding-left: 12px; + padding-right: 20px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#custom-os_button:hover { + background: @bg_hover; + color: @content_main; +} + +#workspaces { + color: transparent; + margin-right: 1.5px; + margin-left: 1.5px; +} +#workspaces button { + padding: 3px; + color: @content_inactive; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#workspaces button.active { + color: @content_main; + border-bottom: 3px solid white; +} +#workspaces button.focused { + color: @bg_active; +} +#workspaces button.urgent { + background: rgba(255, 200, 0, 0.35); + border-bottom: 3px dashed @warning_color; + color: @warning_color; +} +#workspaces button:hover { + background: @bg_hover; + color: @content_main; +} + +#taskbar { +} + +#taskbar button { + min-width: 130px; + border-bottom: 3px solid rgba(255, 255, 255, 0.3); + margin-left: 2px; + margin-right: 2px; + padding-left: 8px; + padding-right: 8px; + color: white; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} + +#taskbar button.active { + border-bottom: 3px solid white; + background: @bg_active; +} + +#taskbar button:hover { + border-bottom: 3px solid white; + background: @bg_hover; + color: @content_main; +} + +#cpu, #disk, #memory { + padding:3px; +} + +#temperature { + color: transparent; + font-size: 0px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#temperature.critical { + padding-right: 3px; + color: @warning_color; + font-size: initial; + border-bottom: 3px dashed @warning_color; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} + +#window { + border-radius: 10px; + margin-left: 20px; + margin-right: 20px; +} + +#tray{ + margin-left: 5px; + margin-right: 5px; +} +#tray > .passive { + border-bottom: none; +} +#tray > .active { + border-bottom: 3px solid white; +} +#tray > .needs-attention { + border-bottom: 3px solid @warning_color; +} +#tray > widget { + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#tray > widget:hover { + background: @bg_hover; +} + +#pulseaudio { + font-family: "JetBrainsMono Nerd Font"; + padding-left: 3px; + padding-right: 3px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#pulseaudio:hover { + background: @bg_hover; +} + +#network { + padding-left: 3px; + padding-right: 3px; +} + +#language { + padding-left: 5px; + padding-right: 5px; +} + +#clock { + padding-right: 5px; + padding-left: 5px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); +} +#clock:hover { + background: @bg_hover; +} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 2d8e6ea..4440a4e 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -20,7 +20,9 @@ in }; }; config = mkIf cfg.desktop.enabled { - services.displayManager.sddm.enable = true; - services.displayManager.sddm.wayland.enable = true; + services.displayManager.sddm.enable = false; + services.displayManager.sddm.wayland.enable = false; + services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = true; }; } diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 1c2b085..32d7cc4 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -50,6 +50,7 @@ in waypaper # wallpaper manager swww # wallpaper service waybar # top bar + nwg-bar # logout window hypridle # idle watch brightnessctl # brightness ctl diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 9852604..b726ecd 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -12,6 +12,7 @@ in # General utils busybox gcc + rofimoji # emoji picker # copy to clipboard wl-clipboard-x11