From bc5adf74ff7b6098869635015c6515a6f5975562 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 30 Aug 2024 22:34:54 -0400 Subject: [PATCH] Cleaned up sumo + splitting hyprland configs --- configs/hyprland/mine/hypr/hypridle.conf | 40 ++++ configs/hyprland/mine/hypr/hyprland.conf | 2 + .../mine/hypr/hyprland.d/bg-proc.conf | 6 + .../hyprland/mine/hypr/hyprland.d/consts.conf | 6 + .../mine/hypr/hyprland.d/keybindings.conf | 60 ++++++ .../mine/hypr/hyprland.d/monitors.conf | 5 + .../mine/hypr/hyprland.d/slack-ws.conf | 1 + .../hypr/hyprland.d/special-window-rules.conf | 24 +++ .../mine/hypr/hyprland.d/visuals.conf | 79 ++++++++ configs/hyprland/mine/hypr/hyprlock.conf | 140 ++++++++++++++ configs/hyprland/mine/nwg-bar/bar.json | 27 +++ configs/hyprland/mine/nwg-bar/style.css | 35 ++++ configs/hyprland/mine/waybar/config | 129 +++++++++++++ configs/hyprland/mine/waybar/style.css | 181 ++++++++++++++++++ configs/sumo/functions.sh | 55 ------ configs/sumo/scripts/airflow | 4 - configs/sumo/scripts/airflow-v2 | 4 - configs/sumo/scripts/airflow-v2-list-tasks | 4 - .../airflow-v2-restart-web-and-scheduler | 7 - configs/sumo/scripts/analytics | 4 - configs/sumo/scripts/csi | 4 - configs/sumo/scripts/docker-login-sumo-ecr | 10 - configs/sumo/scripts/eks | 6 - configs/sumo/scripts/eks-namespace | 6 - configs/sumo/scripts/get-memory-dump | 25 --- configs/sumo/scripts/helm-out | 25 --- configs/sumo/scripts/identify-perm | 9 - configs/sumo/scripts/mount-dev | 6 - configs/sumo/scripts/open-aws | 5 - configs/sumo/scripts/regex | 3 - configs/sumo/scripts/sagemaker | 3 - configs/sumo/scripts/update-aws-cred | 32 ---- configs/sumo/scripts/update-dsh-knobs | 8 - hosts/asosnovsky-mac.nix | 71 ------- hosts/fwbook.nix | 5 +- modules/nixos/desktop/default.nix | 2 +- modules/nixos/desktop/hyprland.nix | 68 ------- modules/nixos/desktop/hyprland/common.nix | 40 ++++ modules/nixos/desktop/hyprland/default.nix | 16 ++ modules/nixos/desktop/hyprland/mine.nix | 39 ++++ 40 files changed, 835 insertions(+), 361 deletions(-) create mode 100644 configs/hyprland/mine/hypr/hypridle.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/consts.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/keybindings.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/monitors.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf create mode 100644 configs/hyprland/mine/hypr/hyprland.d/visuals.conf create mode 100644 configs/hyprland/mine/hypr/hyprlock.conf create mode 100644 configs/hyprland/mine/nwg-bar/bar.json create mode 100644 configs/hyprland/mine/nwg-bar/style.css create mode 100644 configs/hyprland/mine/waybar/config create mode 100644 configs/hyprland/mine/waybar/style.css delete mode 100644 configs/sumo/functions.sh delete mode 100755 configs/sumo/scripts/airflow delete mode 100755 configs/sumo/scripts/airflow-v2 delete mode 100755 configs/sumo/scripts/airflow-v2-list-tasks delete mode 100755 configs/sumo/scripts/airflow-v2-restart-web-and-scheduler delete mode 100755 configs/sumo/scripts/analytics delete mode 100755 configs/sumo/scripts/csi delete mode 100755 configs/sumo/scripts/docker-login-sumo-ecr delete mode 100755 configs/sumo/scripts/eks delete mode 100755 configs/sumo/scripts/eks-namespace delete mode 100755 configs/sumo/scripts/get-memory-dump delete mode 100755 configs/sumo/scripts/helm-out delete mode 100755 configs/sumo/scripts/identify-perm delete mode 100755 configs/sumo/scripts/mount-dev delete mode 100755 configs/sumo/scripts/open-aws delete mode 100755 configs/sumo/scripts/regex delete mode 100755 configs/sumo/scripts/sagemaker delete mode 100755 configs/sumo/scripts/update-aws-cred delete mode 100755 configs/sumo/scripts/update-dsh-knobs delete mode 100644 hosts/asosnovsky-mac.nix delete mode 100644 modules/nixos/desktop/hyprland.nix create mode 100644 modules/nixos/desktop/hyprland/common.nix create mode 100644 modules/nixos/desktop/hyprland/default.nix create mode 100644 modules/nixos/desktop/hyprland/mine.nix diff --git a/configs/hyprland/mine/hypr/hypridle.conf b/configs/hyprland/mine/hypr/hypridle.conf new file mode 100644 index 0000000..7e373b0 --- /dev/null +++ b/configs/hyprland/mine/hypr/hypridle.conf @@ -0,0 +1,40 @@ +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 = 150 # 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 = 150 # 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 = 295 + on-timeout = hyprctl notify 0 5000 'rgb(ff0000)' 'Locking..' + on-resume = hyprctl notify 0 5000 'rgb(ff0000)' 'Stopping lock process..' +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl lock-session # lock screen when timeout has passed +} + +listener { + timeout = 380 # 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 = 1800 # 30min + on-timeout = systemctl suspend # suspend pc +} diff --git a/configs/hyprland/mine/hypr/hyprland.conf b/configs/hyprland/mine/hypr/hyprland.conf new file mode 100644 index 0000000..1aee73d --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.conf @@ -0,0 +1,2 @@ +source = ~/.config/hypr/hyprland.d/*.conf + diff --git a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf new file mode 100644 index 0000000..9993371 --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf @@ -0,0 +1,6 @@ +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 +exec-once = waybar diff --git a/configs/hyprland/mine/hypr/hyprland.d/consts.conf b/configs/hyprland/mine/hypr/hyprland.d/consts.conf new file mode 100644 index 0000000..a219328 --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/consts.conf @@ -0,0 +1,6 @@ +$term = alacritty +$browser = brave +$filemanager = thunar +$editor = nvim +$applauncher = wofi --show drun +$cmdlauncher = wofi --show run diff --git a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf new file mode 100644 index 0000000..2f7904c --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf @@ -0,0 +1,60 @@ +$mainMod = SUPER + + +# # We've defined $term, $editor and so on in includes.conf. +bind = $mainMod, W, exec, $browser +bind = $mainMod, C, exec, $editor +bind = $mainMod, F, exec, $filemanager +bind = $mainMod, space, exec, $applauncher +bind = $mainMod, R, exec, $cmdlauncher + +# My Binds +bind = $mainMod, T, exec, $term +bind = $mainMod, Q, killactive, +bind = ALT, F4, killactive, +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)" + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + + +# Switch workspaces with mainMod +bind = $mainMod, right, workspace, +1 +bind = $mainMod, left, workspace, -1 + +# Move active window to a workspace with mainMod + SHIFT +bind = $mainMod CTRL, right, movetoworkspace, +1 +bind = $mainMod CTRL, left, movetoworkspace, -1 + +# Resize actions +bind = $mainMod SHIFT, right, resizeactive, 10 0 +bind = $mainMod SHIFT, left, resizeactive, -10 0 +bind = $mainMod SHIFT, up, resizeactive, 0 -10 +bind = $mainMod SHIFT, down, resizeactive, 0 10 + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow +bindm = $mainMod, ALT_L, resizewindow + +# Brigthness +bind = ,XF86MonBrightnessDown, exec, brightnessctl s 20%- +bind = ,XF86MonBrightnessUp, exec, brightnessctl s +20% + +# Volume +binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+ && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) +binde =, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%- && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) +bind =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && hyprctl notify 0 500 'rgb(00ff00)' $(wpctl get-volume @DEFAULT_AUDIO_SINK@) diff --git a/configs/hyprland/mine/hypr/hyprland.d/monitors.conf b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf new file mode 100644 index 0000000..7f171d7 --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/monitors.conf @@ -0,0 +1,5 @@ +monitor = eDP-1, 2256x1504, 0x0, 2 +monitor = DP-9, 1920x1080, 1128x0, 2 +monitor = DP-10, 1920x1080, -970x0, 2 + +monitor = , preferred, auto-right, 1 \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf b/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf new file mode 100644 index 0000000..d12fcbf --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/slack-ws.conf @@ -0,0 +1 @@ +workspace = name:‍, monitor:DP-10, default:true, persistent:true, on-created-empty:[fullscreen] slack \ No newline at end of file diff --git a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf new file mode 100644 index 0000000..35d06ce --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf @@ -0,0 +1,24 @@ +# Extras +windowrulev2 = float,class:(nwg-.*) +windowrulev2 = float,class:(org\.kde\..*) +windowrulev2 = float,class:(.*blueman.*) + +# Vscode +windowrulev2 = fakefullscreen,class:(Code) +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 +windowrulev2 = float, class:$centerable +windowrulev2 = size 90% 90%, class:$centerable +windowrulev2 = move 5% 5%, class:$centerable diff --git a/configs/hyprland/mine/hypr/hyprland.d/visuals.conf b/configs/hyprland/mine/hypr/hyprland.d/visuals.conf new file mode 100644 index 0000000..a5313e6 --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprland.d/visuals.conf @@ -0,0 +1,79 @@ + +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + rounding = 5 + blur { + enabled = true + size = 3 + passes = 1 + new_optimizations = true + } + + drop_shadow = true + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = true + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default +} + +gestures { + workspace_swipe = on + workspace_swipe_fingers = 4 + workspace_swipe_create_new = true +} + +general { + border_size = 1 + no_border_on_floating = false + gaps_in = 3 + gaps_out = 3 + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + layout = dwindle + resize_on_border = true + extend_border_grab_area = true + hover_icon_on_border = true +} + + +# # INPUT DEVICES +input { + kb_layout = us + numlock_by_default = false + repeat_rate = 25 + repeat_delay = 600 + accel_profile = adaptive + scroll_method = 2fg + follow_mouse = 1 + mouse_refocus = true + float_switch_override_focus = 1 + touchpad { + natural_scroll = yes + clickfinger_behavior = yes + disable_while_typing = true + scroll_factor = 1.0 + tap_button_map = lrm + tap-to-click = true + } +} + +# # MISC SETTINGS +misc { + disable_hyprland_logo = true + vrr = 0 + mouse_move_enables_dpms = false + key_press_enables_dpms = false + layers_hog_keyboard_focus = true + focus_on_activate = false + mouse_move_focuses_monitor = true +} diff --git a/configs/hyprland/mine/hypr/hyprlock.conf b/configs/hyprland/mine/hypr/hyprlock.conf new file mode 100644 index 0000000..5a46246 --- /dev/null +++ b/configs/hyprland/mine/hypr/hyprlock.conf @@ -0,0 +1,140 @@ +# source = /home/justin/.cache/wal/colors-hyprland.conf + +# BACKGROUND +background { + monitor = + #path = screenshot + # path = /home/justin/Pictures/wal.png + color = rgba(255, 0, 0, 1) + blur_passes = 2 + contrast = 1 + brightness = 0.5 + vibrancy = 0.2 + vibrancy_darkness = 0.2 +} + +# GENERAL +general { + no_fade_in = true + no_fade_out = true + hide_cursor = false + grace = 0 + disable_loading_bar = true +} + +# INPUT FIELD +input-field { + monitor = + size = 250, 60 + outline_thickness = 2 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgba(0, 0, 0, 0) + inner_color = rgba(0, 0, 0, 0.2) + font_color = $foreground + fade_on_empty = false + rounding = -1 + check_color = rgb(204, 136, 34) + placeholder_text = Input Password... + hide_input = false + position = 0, -200 + halign = center + valign = center +} + +# DATE +label { + monitor = + text = cmd[update:1000] echo "$(date +"%A, %B %d")" + color = rgba(242, 243, 244, 0.75) + font_size = 22 + font_family = JetBrains Mono + position = 0, 300 + halign = center + valign = center +} + +# TIME +label { + monitor = + text = cmd[update:1000] echo "$(date +"%-I:%M")" + color = rgba(242, 243, 244, 0.75) + font_size = 95 + font_family = JetBrains Mono Extrabold + position = 0, 200 + halign = center + valign = center +} + + + +# Profile Picture +# image { +# monitor = +# path = /home/justin/Pictures/profile_pictures/justin_square.png +# size = 100 +# border_size = 2 +# border_color = $foreground +# position = 0, -100 +# halign = center +# valign = center +# } + +# # Desktop Environment +# image { +# monitor = +# path = /home/justin/Pictures/profile_pictures/hypr.png +# size = 75 +# border_size = 2 +# border_color = $foreground +# position = -50, 50 +# halign = right +# valign = bottom +# } + +# CURRENT SONG +# label { +# monitor = +# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whatsong.sh)" +# color = $foreground +# #color = rgba(255, 255, 255, 0.6) +# font_size = 18 +# font_family = Metropolis Light, Font Awesome 6 Free Solid +# position = 0, 50 +# halign = center +# valign = bottom +# } + +# label { +# monitor = +# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whoami.sh)" +# color = $foreground +# font_size = 14 +# font_family = JetBrains Mono +# position = 0, -10 +# halign = center +# valign = top +# } + +# label { +# monitor = +# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/battery.sh)" +# color = $foreground +# font_size = 24 +# font_family = JetBrains Mono +# position = -90, -10 +# halign = right +# valign = top +# } + +# label { +# monitor = +# text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/network-status.sh)" +# color = $foreground +# font_size = 24 +# font_family = JetBrains Mono +# position = -20, -10 +# halign = right +# valign = top +# } \ No newline at end of file diff --git a/configs/hyprland/mine/nwg-bar/bar.json b/configs/hyprland/mine/nwg-bar/bar.json new file mode 100644 index 0000000..a874e8e --- /dev/null +++ b/configs/hyprland/mine/nwg-bar/bar.json @@ -0,0 +1,27 @@ +[ + { + "label": "Sleep", + "exec": "systemctl suspend", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-suspend.svg" + }, + { + "label": "Hibernate", + "exec": "systemctl hibernate", + "icon": "/nix/store/rwc6cn4dcv2simn3c4kmy2wgi0s9x3df-nwg-bar-0.1.6/share/nwg-bar/images/system-hibernate.svg" + }, + { + "label": "Logout", + "exec": "hyprctl dispatch 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/hyprland/mine/nwg-bar/style.css b/configs/hyprland/mine/nwg-bar/style.css new file mode 100644 index 0000000..50e547d --- /dev/null +++ b/configs/hyprland/mine/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/hyprland/mine/waybar/config b/configs/hyprland/mine/waybar/config new file mode 100644 index 0000000..bc45b55 --- /dev/null +++ b/configs/hyprland/mine/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" + } +} \ No newline at end of file diff --git a/configs/hyprland/mine/waybar/style.css b/configs/hyprland/mine/waybar/style.css new file mode 100644 index 0000000..f038def --- /dev/null +++ b/configs/hyprland/mine/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/configs/sumo/functions.sh b/configs/sumo/functions.sh deleted file mode 100644 index 6536c68..0000000 --- a/configs/sumo/functions.sh +++ /dev/null @@ -1,55 +0,0 @@ -export DEV_DEPLOYMENTS=(stag long) -export PROD_DEPLOYMENTS=(dub fra mon mum prod syd tky us2 fed) -echo "Loading functions" -function airflow-v2-exec-web() { - dep=${1} - airflow-v2-exec $dep bash -} -function airflow-v2-exec() { - dep=${1} - airflow-v2 $dep exec -it svc/$dep-analytics-airflow-v2-webserver -c webserver -- ${@:2} -} -function tsh.login() { - tsh login -d --proxy teleport.kumoroku.com eks-${1} - tsh kube login eks-${1} -} -function tsh.hop() { - tsh ssh -d --cluster=eks-${1} hop-${2:-1} -} -function tsh.shared() { - tsh ssh -d --cluster=main shared_box-${2:-1} -} -function tsh.login.all() { - for dep in ${DEV_DEPLOYMENTS[@]}; do - echo "---------" - echo " $dep " - echo "---------" - tsh.login $dep - done - for dep in ${PROD_DEPLOYMENTS[@]}; do - echo "---------" - echo " $dep " - echo "---------" - tsh.login $dep - done -} -function airflow-v2-all-tasks() { - for dep in ${DEV_DEPLOYMENTS[@]}; do - echo "[ $dep ]" - airflow-v2-list-tasks $dep - done - for dep in ${PROD_DEPLOYMENTS[@]}; do - echo "[ $dep ]" - airflow-v2-list-tasks $dep - done -} -function airflow-v2-delete-pod-tasks() { - dep=${1} - for pod in $(airflow-v2-list-tasks $dep | awk -F ' ' '{print $1}'); do airflow-v2 $dep delete pod/$pod &; done -} -function open-paas() { - dep=${1:-infrastructure} - eval $(dev hcvault cli_env -a $dep) - export GITHUB_TOKEN=$(dev secrets get -s github_token | jq -r .github_token_password) - paas-iac-shell -} diff --git a/configs/sumo/scripts/airflow b/configs/sumo/scripts/airflow deleted file mode 100755 index e395ab5..0000000 --- a/configs/sumo/scripts/airflow +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -dep=${1} -eks $dep analytics-airflow ${@:2} \ No newline at end of file diff --git a/configs/sumo/scripts/airflow-v2 b/configs/sumo/scripts/airflow-v2 deleted file mode 100755 index ff27dcd..0000000 --- a/configs/sumo/scripts/airflow-v2 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -dep=${1} -eks $dep analytics-airflow-v2 ${@:2} diff --git a/configs/sumo/scripts/airflow-v2-list-tasks b/configs/sumo/scripts/airflow-v2-list-tasks deleted file mode 100755 index 0398695..0000000 --- a/configs/sumo/scripts/airflow-v2-list-tasks +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -current_dep=$(kubectl config current-context | cut -d '-' -f2) -airflow-v2 ${1:-$current_dep} get pod --sort-by=.status.startTime -l task_id \ No newline at end of file diff --git a/configs/sumo/scripts/airflow-v2-restart-web-and-scheduler b/configs/sumo/scripts/airflow-v2-restart-web-and-scheduler deleted file mode 100755 index 6f4ea1b..0000000 --- a/configs/sumo/scripts/airflow-v2-restart-web-and-scheduler +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -current_dep=$(kubectl config current-context | cut -d '-' -f2) -dep=${1:-$current_dep} -airflow-v2 $dep rollout restart deploy/$dep-analytics-airflow-v2-web & -airflow-v2 $dep rollout restart deploy/$dep-analytics-airflow-v2-scheduler & -wait diff --git a/configs/sumo/scripts/analytics b/configs/sumo/scripts/analytics deleted file mode 100755 index ca1b191..0000000 --- a/configs/sumo/scripts/analytics +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -dep=${1} -eks $dep analytics ${@:2} \ No newline at end of file diff --git a/configs/sumo/scripts/csi b/configs/sumo/scripts/csi deleted file mode 100755 index d059a0f..0000000 --- a/configs/sumo/scripts/csi +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -dep=${1} -eks $dep csi ${@:2} \ No newline at end of file diff --git a/configs/sumo/scripts/docker-login-sumo-ecr b/configs/sumo/scripts/docker-login-sumo-ecr deleted file mode 100755 index f436038..0000000 --- a/configs/sumo/scripts/docker-login-sumo-ecr +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - - -dev hcvault login -eval $(dev hcvault cli_env -a infrastructure) - -region="us-west-2" -aws_account_id=`aws sts get-caller-identity --query "Account" --output text` - -aws ecr get-login-password --region ${region} | docker login --username AWS --password-stdin ${aws_account_id}.dkr.ecr.${region}.amazonaws.com diff --git a/configs/sumo/scripts/eks b/configs/sumo/scripts/eks deleted file mode 100755 index 94c6621..0000000 --- a/configs/sumo/scripts/eks +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -dep=${1} -assembly=${2} -echo "${dep}/${assembly}" -kubectl --cluster eks-$dep -n $dep-${assembly} --context eks-$dep-eks-$dep ${@:3} diff --git a/configs/sumo/scripts/eks-namespace b/configs/sumo/scripts/eks-namespace deleted file mode 100755 index ef41b66..0000000 --- a/configs/sumo/scripts/eks-namespace +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -current_dep=$(kubectl config current-context | cut -d "-" -f2) -dep=${2:-$current_dep} -echo "$dep $current_dep" -kubectl config set-context --current --namespace=$dep-${1} \ No newline at end of file diff --git a/configs/sumo/scripts/get-memory-dump b/configs/sumo/scripts/get-memory-dump deleted file mode 100755 index ccb6d1c..0000000 --- a/configs/sumo/scripts/get-memory-dump +++ /dev/null @@ -1,25 +0,0 @@ - -# pod=analytics-84d4bff6c-2fzj9 -namespace=us2-analytics - -echo "getting pods..." -pods=`kubectl get pods -n $namespace` -totalpods=$(echo $pods | wc -l) -totalpods="$((totalpods-1))" -echo $pods | awk "NR==1" | awk '$0=" "$0' -echo $pods | awk "NR>1" | awk '$0=NR") "$0' -echo "> Please select one of the pods, enter a number between 1 and $totalpods" -read pod_num - -case ${pod_num#[-+]} in - *[!0-9]* | '') echo "Must be an integer." ;; -esac - -pod=$(kubectl get pods -n $namespace | awk {'print $1}' | awk -v pod_num=$pod_num 'NR==pod_num+1') -echo "Getting memory dump for $pod - Continue? [ANY KEY]..." -read -kubectl exec -n $namespace $pod -c analytics-assembly -- jcmd Bootstrap GC.heap_dump /tmp/$pod.hprof -kubectl exec -n $namespace $pod -c analytics-assembly -- gzip /tmp/$pod.hprof -kubectl -n $namespace cp -c analytics-assembly $pod:/tmp/$pod.hprof.gz $pod.hprof.gz - -kubectl exec -n $namespace $pod -c analytics-assembly -it -- /bin/bash \ No newline at end of file diff --git a/configs/sumo/scripts/helm-out b/configs/sumo/scripts/helm-out deleted file mode 100755 index 662745d..0000000 --- a/configs/sumo/scripts/helm-out +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -name=${1:-new} -dep=${2:-stag} - -cmd="helm template --values test_values.yaml --values values.yaml --values values-$dep.yaml" - -if [ ! -z "values-$dep.auto.yaml"]; then - cmd="$cmd --values values-$dep.auto.yaml" -fi - -cmd="$cmd --debug . > tmp/$name.yml" -echo $cmd - -$cmd - -if [ $name == "new" ]; - - if [ ! -z "tmp/old.yml" ]; then - diff tmp/original.yml tmp/new.yml > tmp/diff - fi - -fi \ No newline at end of file diff --git a/configs/sumo/scripts/identify-perm b/configs/sumo/scripts/identify-perm deleted file mode 100755 index b420d15..0000000 --- a/configs/sumo/scripts/identify-perm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -TF_LOG=trace terraform apply --auto-approve &> apply.log -TF_LOG=trace terraform destroy --auto-approve &> destroy.log - -cat destroy.log | grep "DEBUG: Request" | sed -nr 's/^.*Request (.*) Details:/\1/p' | sort | uniq > all.perms -cat apply.log | grep "DEBUG: Request" | sed -nr 's/^.*Request (.*) Details:/\1/p' | sort | uniq >> all.perms -cat all.perms | sort | uniq -u > required.perms -rm all.perms \ No newline at end of file diff --git a/configs/sumo/scripts/mount-dev b/configs/sumo/scripts/mount-dev deleted file mode 100755 index 76971a8..0000000 --- a/configs/sumo/scripts/mount-dev +++ /dev/null @@ -1,6 +0,0 @@ -#/bin/zsh -set -e - -dev encrypted_disk mount -dev provision ssh_keys -ssh-add /Volumes/Encrypted/keys/prod_rsa diff --git a/configs/sumo/scripts/open-aws b/configs/sumo/scripts/open-aws deleted file mode 100755 index 803024a..0000000 --- a/configs/sumo/scripts/open-aws +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e - -dev hcvault login -dev hcvault console -o diff --git a/configs/sumo/scripts/regex b/configs/sumo/scripts/regex deleted file mode 100755 index 7a90dbd..0000000 --- a/configs/sumo/scripts/regex +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -gawk 'match($0,/'$1'/, ary) {print ary['${2:-'1'}']}' \ No newline at end of file diff --git a/configs/sumo/scripts/sagemaker b/configs/sumo/scripts/sagemaker deleted file mode 100755 index 2f4519a..0000000 --- a/configs/sumo/scripts/sagemaker +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -eks us2 analytics-sagemaker ${@:1} \ No newline at end of file diff --git a/configs/sumo/scripts/update-aws-cred b/configs/sumo/scripts/update-aws-cred deleted file mode 100755 index bdae9d4..0000000 --- a/configs/sumo/scripts/update-aws-cred +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -e - -cred_file=${1} -aws_cred_file=$HOME/.aws/credentials - -source $HOME/$cred_file.sh - -if [ -z "${AWS_ACCESS_KEY_ID}" ]; then - echo "Missing access key"; - exit 1 -fi -if [ -z "${AWS_SECRET_ACCESS_KEY}" ]; then - echo "Missing AWS_SECRET_ACCESS_KEY"; - exit 1 -fi -if [ -z "${AWS_SESSION_TOKEN}" ]; then - echo "Missing AWS_SESSION_TOKEN"; - exit 1 -fi - -echo "Updating $aws_cred_file ..." -echo "[default]" > $aws_cred_file -echo "aws_access_key_id = $AWS_ACCESS_KEY_ID" >> $aws_cred_file -echo "aws_secret_access_key = $AWS_SECRET_ACCESS_KEY" >> $aws_cred_file -echo "aws_session_token=$AWS_SESSION_TOKEN" >> $aws_cred_file - -unset AWS_ACCESS_KEY_ID -unset AWS_SECRET_ACCESS_KEY -unset AWS_SESSION_TOKEN - -echo `aws sts get-caller-identity` diff --git a/configs/sumo/scripts/update-dsh-knobs b/configs/sumo/scripts/update-dsh-knobs deleted file mode 100755 index 371f05c..0000000 --- a/configs/sumo/scripts/update-dsh-knobs +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -echo "<<< ◉ Updating dsh ⦿ >>>" -cd ~/git/sumo && git fetch origin master:master && git merge master && git status - -echo "<<< ◉ Updatig knobs ⦿ >>>" -cd ~/git/knobs && git fetch origin master:master && git merge master && git status - diff --git a/hosts/asosnovsky-mac.nix b/hosts/asosnovsky-mac.nix deleted file mode 100644 index 5971714..0000000 --- a/hosts/asosnovsky-mac.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ user }: -{ pkgs, ... }: -let - zshSumo = builtins.filterSource (p: t: true) ../configs/sumo; - zshScripts = zshSumo + "/scripts"; - zshFunctions = zshSumo + "/functions.sh"; -in -{ - homebrew = { - enable = true; - brews = [ - "autoconf" - "autoconf-archive" - "automake" - "cmake" - "ffmpeg" - "ninja" - "ccache" - "pkg-config" - "qt" - ]; - }; - home-manager.users.${user.name} = { - home = { - packages = with pkgs; [ - coreutils-prefixed - awscli2 - kubernetes-helm - nixfmt-classic - nil - jq - pre-commit - devenv - terragrunt - oterm - ]; - shellAliases = { - k = "kubectl"; - gradlew = "dev gradlew"; - psh = "source $HOME/git/github/psh/psh.sh"; - hcvault = "dev hcvault"; - }; - sessionVariables = { - "DOCKER_DEFAULT_PLATFORM" = "linux/amd64"; - "SUMO_HOME" = "$HOME/git/sumo"; - "_JAVA_OPTIONS" = "-Djava.awt.headless=true"; - "LC_ALL" = "en_US.UTF-8"; - "JAVA_HOME" = "/Library/Java/JavaVirtualMachines/amazon-corretto-8.jdk/Contents/Home"; - }; - sessionPath = [ - "$HOME/.devcli/bin" - "$HOME/.krew/bin" - "$HOME/git/github/paas-infrastructure/bin" - "$HOME/.krew/bin" - # "$HOME/.rd/bin" - zshScripts - ]; - }; - programs.zsh.initExtra = '' - source ${zshFunctions} - eval "$(/opt/homebrew/bin/brew shellenv)" - source /dev/stdin <<< "$($HOME/.devcli/dev --init)" - complete -o default -F __start_kubectl k - source <(helm completion zsh) - complete -C '/opt/homebrew/bin/aws_completer' aws - source <(kubectl completion zsh) - test -f ~/.prada/artifactory.env && source ~/.prada/artifactory.env - ulimit -n $(sysctl -n kern.maxfilesperproc) - ''; - }; -} diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index b226f8d..26dd022 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -12,7 +12,10 @@ in skyg.nixos.desktop = { enabled = true; kde.enabled = true; - hyprland.enabled = true; + hyprland = { + enabled = true; + useNWG = true; + }; }; services.displayManager.defaultSession = "hyprland"; skyg.nixos.common.hardware.sound.enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 4440a4e..67d093f 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -6,8 +6,8 @@ let in { imports = [ + ./hyprland ./kde.nix - ./hyprland.nix ./wayland.nix ./x11.nix ./packages.nix diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix deleted file mode 100644 index 3a3f0b2..0000000 --- a/modules/nixos/desktop/hyprland.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - cfg = config.skyg.nixos.desktop.hyprland; -in -{ - options = { - skyg.nixos.desktop.hyprland = { - enabled = mkEnableOption - "Hyprland"; - }; - }; - config = mkIf cfg.enabled { - programs.hyprland.enable = true; - # programs.hyprland.xwayland.enable = true; - programs.hyprland.systemd.setPath.enable = true; - services.hypridle.enable = true; - programs.hyprlock.enable = true; - # programs.waybar.enable = true; - environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; - environment.systemPackages = with pkgs; [ - # sound - pavucontrol - - # notification daemon - dunst - libnotify - - # App Support - lxqt.lxqt-policykit - xdg-desktop-portal - xdg-desktop-portal-hyprland - - # general utilities - swappy # screenshot editor - hyprshot # screenshots - cliphist # clipboard manager - xfce.thunar # file manager - wofi # app launcher - wl-screenrec # screen recorder - slurp # helper selection tools - waypaper # wallpaper manager - swww # wallpaper service - waybar # top bar - nwg-bar # logout window - hypridle # idle watch - brightnessctl # brightness ctl - networkmanagerapplet # networking - ]; - # - system.userActivationScripts.hyprlandlocalConfig.text = '' - if [[ ! -h "$HOME/.config/hypr" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hypr" "$HOME/.config/hypr" - fi - if [[ ! -h "$HOME/.config/waybar" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/waybar" "$HOME/.config/waybar" - fi - if [[ ! -h "$HOME/.config/nwg-bar" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/nwg-bar" "$HOME/.config/nwg-bar" - fi - ''; - }; -} diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix new file mode 100644 index 0000000..905fe16 --- /dev/null +++ b/modules/nixos/desktop/hyprland/common.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop.hyprland; +in +{ + config = mkIf cfg.enabled { + programs.hyprland.enable = true; + programs.hyprland.xwayland.enable = true; + programs.hyprland.systemd.setPath.enable = true; + services.hypridle.enable = true; + # programs.hyprlock.enable = true; + # programs.waybar.enable = true; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; + environment.systemPackages = with pkgs; [ + # sound + pavucontrol + + # notification daemon + dunst + libnotify + + # App Support + xwaylandvideobridge + lxqt.lxqt-policykit + xdg-desktop-portal + xdg-desktop-portal-hyprland + + # general utilities + brightnessctl # brightness ctl + networkmanagerapplet # networking + ]; + # + }; +} diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix new file mode 100644 index 0000000..cd5011d --- /dev/null +++ b/modules/nixos/desktop/hyprland/default.nix @@ -0,0 +1,16 @@ +{ lib, ... }: +with lib; +{ + import = [ + ./mine.nix + ./nwg-shell.nix + ]; + options = { + skyg.nixos.desktop.hyprland = { + enabled = mkEnableOption + "Hyprland"; + useNWG = mkEnableOption + "nwg-shell experience"; + }; + }; +} diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix new file mode 100644 index 0000000..aa10272 --- /dev/null +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop.hyprland; +in +{ + config = mkIf (cfg.enabled && !cfg.useNWG) { + programs.hyprlock.enable = true; + environment.systemPackages = with pkgs; [ + # general utilities + swappy # screenshot editor + hyprshot # screenshots + cliphist # clipboard manager + xfce.thunar # file manager + wofi # app launcher + wl-screenrec # screen recorder + slurp # helper selection tools + waypaper # wallpaper manager + swww # wallpaper service + waybar # top bar + nwg-bar # logout window + ]; + system.userActivationScripts.hyprlandMineConfig.text = '' + rm "$HOME/.config/hypr" + if [[ ! -h "$HOME/.config/hypr" ]]; then + ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr" + fi + rm "$HOME/.config/waybar" + if [[ ! -h "$HOME/.config/waybar" ]]; then + ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar" + fi + rm "$HOME/.config/nwg-bar" + if [[ ! -h "$HOME/.config/nwg-bar" ]]; then + ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar" + fi + ''; + }; +}