diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf
index ef70e06..69d693f 100644
--- a/configs/hypr/hyprland.conf
+++ b/configs/hypr/hyprland.conf
@@ -1,8 +1,6 @@
-
$terminal = ghostty
$fileManager = dolphin
-$menu = sherlock
+$menu = walker
$browser = chromium
source = ~/.config/hypr/hyprland.d/*.conf
-
diff --git a/configs/hypr/hyprland.d/exec.conf b/configs/hypr/hyprland.d/exec.conf
index 0b13e4d..3720d31 100644
--- a/configs/hypr/hyprland.d/exec.conf
+++ b/configs/hypr/hyprland.d/exec.conf
@@ -1,2 +1,3 @@
exec-once = nm-applet &
-exec-once = hyprctl plugin load "$HYPR_PLUGIN_DIR/lib/libhyprexpo.so"
+exec-once = $HOME/.configs/hypr/start-up-script.sh
+# exec-once = hyprctl plugin load "$HYPR_PLUGIN_DIR/lib/libhyprexpo.so"
diff --git a/configs/hypr/hyprland.d/plugins.conf b/configs/hypr/hyprland.d/plugins.conf
deleted file mode 100644
index 810559f..0000000
--- a/configs/hypr/hyprland.d/plugins.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# .config/hypr/hyprland.conf
-plugin {
- hyprexpo {
- columns = 2
- gap_size = 2
- skip_empty = true
- bg_col = rgb(111111)
- workspace_method = center current
- enable_gesture = true
- gesture_fingers = 3
- gesture_distance = 300
- gesture_positive = false
- }
- hyprbars {
- enabled = true
- bar_height = 20
-
- hyprbars-button = rgb(ff4040), 10, , hyprctl dispatch killactive
- hyprbars-button = rgb(eeee11), 10, , hyprctl dispatch fullscreen 1
-
- on_double_click = hyprctl dispatch fullscreen 1
- }
-}
\ No newline at end of file
diff --git a/configs/hypr/start-up-script.sh b/configs/hypr/start-up-script.sh
new file mode 100755
index 0000000..6819893
--- /dev/null
+++ b/configs/hypr/start-up-script.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+killall -q waybar
+sleep 1
+
+waybar --config /home/ari/nixos-setup/configs/hypr/waybar/bottom-bar.jsonc --style /home/ari/nixos-setup/configs/hypr/waybar/bottom-bar.css &
+waybar --config /home/ari/nixos-setup/configs/hypr/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/hypr/waybar/top-bar.css &
+waypaper --restore
+
+killall -q hypridle
+hypridle &
+
+killall -q swayosd-server
+swayosd-server &
+killall -q walker
+walker --gapplication-service &
+
+notify-send "Hyprland Startup Script" "Completed 🎉"
diff --git a/configs/hypr/waybar/bottom-bar.css b/configs/hypr/waybar/bottom-bar.css
new file mode 100644
index 0000000..ea867ca
--- /dev/null
+++ b/configs/hypr/waybar/bottom-bar.css
@@ -0,0 +1,88 @@
+* {
+ font-family: "Fira Code", "SF Pro Display", sans-serif;
+ font-size: 10px;
+}
+
+window#waybar {
+ background-color: transparent;
+ color: #ffffff;
+}
+
+window#waybar.hidden {
+ opacity: 0.2;
+}
+
+/* === Reset button styles === */
+
+/* button {
+ box-shadow: none;
+ border: none;
+ border-radius: 0;
+ transition: background-color 0.15s ease, border-color 0.15s ease;
+}
+
+button:hover {
+ background: none;
+ box-shadow: none;
+ text-shadow: none;
+ border: none;
+ -gtk-icon-effect: none;
+ -gtk-icon-shadow: none;
+} */
+
+/* === Workspaces as a tray === */
+/* #workspaces {
+ margin: 0 10px;
+ padding: 0 4px;
+ background: transparent;
+ border-bottom: 2px solid rgba(255, 255, 255, 0.15);
+}
+
+#workspaces button {
+ background: transparent;
+ color: #ffffff;
+ margin: 0 6px;
+ padding: 6px 10px;
+ border-radius: 0;
+ border-bottom: 2px solid transparent;
+}
+
+#workspaces button:hover {
+ border-bottom: 2px solid rgba(255, 255, 255, 0.5);
+}
+
+#workspaces button.focused {
+ border-bottom: 2px solid rgba(255, 255, 255, 0.9);
+}
+
+#workspaces button.urgent {
+ border-bottom: 2px solid #eb4d4b;
+} */
+
+/* === Taskbar as a tray === */
+/* #taskbar {
+ background: transparent;
+ margin: 0 10px;
+ padding: 0 4px;
+ border-bottom: 2px solid rgba(255, 255, 255, 0.15);
+}
+
+#taskbar button {
+ color: #f0f0ff;
+ margin: 0 6px;
+ padding: 6px 10px;
+ border-radius: 0;
+ border-bottom: 2px solid transparent;
+}
+
+#taskbar button:hover {
+ border-bottom: 2px solid rgba(255, 255, 255, 0.5);
+}
+
+#taskbar button.active {
+ border-bottom: 2px solid rgba(255, 255, 255, 0.9);
+}
+
+#taskbar button.active:hover {
+ border-bottom: 2px solid rgba(255, 255, 255, 1.0);
+} */
\ No newline at end of file
diff --git a/configs/hypr/waybar/bottom-bar.jsonc b/configs/hypr/waybar/bottom-bar.jsonc
new file mode 100644
index 0000000..0c80c42
--- /dev/null
+++ b/configs/hypr/waybar/bottom-bar.jsonc
@@ -0,0 +1,20 @@
+{
+ "reload_style_on_change": true,
+ "layer": "top",
+ "position": "bottom",
+ "height": 10,
+ "margin-top": 0,
+ "margin-bottom": 4,
+ "margin-left": 4,
+ "margin-right": 4,
+ "spacing": 0,
+ "modules-left": ["hyprland/workspaces"],
+ "modules-center": ["wlr/taskbar"],
+ "modules-right": [],
+ "niri/workspaces": {},
+ "wlr/taskbar": {
+ "tooltip": true,
+ "tooltip-format": "{title}",
+ "on-click": "activate",
+ },
+}
diff --git a/configs/hypr/waybar/mocha.css b/configs/hypr/waybar/mocha.css
new file mode 100644
index 0000000..67f20b5
--- /dev/null
+++ b/configs/hypr/waybar/mocha.css
@@ -0,0 +1,26 @@
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;
\ No newline at end of file
diff --git a/configs/hypr/waybar/top-bar.css b/configs/hypr/waybar/top-bar.css
new file mode 100644
index 0000000..ea5065d
--- /dev/null
+++ b/configs/hypr/waybar/top-bar.css
@@ -0,0 +1,265 @@
+* {
+ font-family: "Fira Code";
+ font-size: 14px;
+}
+
+window#waybar {
+ background-color: rgba(30, 30, 46, 0.5);
+ color: #ffffff;
+}
+
+window#waybar.hidden {
+ opacity: 0.2;
+}
+
+window#waybar.termite {
+ background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+ background-color: #000000;
+ border: none;
+}
+
+button {
+ box-shadow: none;
+ border: none;
+ border-radius: 0;
+ transition-property: none;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+ background: none;
+ box-shadow: none;
+ text-shadow: none;
+ border: none;
+ -gtk-icon-effect: none;
+ -gtk-icon-shadow: none;
+}
+
+#workspaces button {
+ background-color: transparent;
+ color: #ffffff;
+}
+
+#workspaces button:hover {
+ background: rgba(0, 0, 0, 0.2);
+}
+
+#workspaces button.focused {
+ background-color: #64727D;
+ box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+ background-color: #eb4d4b;
+}
+
+#mode {
+ background-color: #64727D;
+ border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#keyboard-state,
+#scratchpad,
+#custom-logout,
+#mpd {
+ padding: 0px 10px;
+ margin-right: 1px;
+ color: #f0f0ff;
+ border-radius: 5px;
+}
+
+#window,
+#workspaces {
+ margin: 0 4px;
+}
+
+.modules-left>widget:first-child>#workspaces {
+ margin-left: 0;
+}
+
+.modules-right>widget:last-child>#workspaces {
+ margin-right: 0;
+}
+
+#clock {
+ font-weight: bold;
+}
+
+#battery {
+ margin-left: 4px;
+}
+
+#battery.charging,
+#battery.plugged {
+ color: #ffffff;
+ background-color: rgba(38, 166, 91, 0.9);
+}
+
+@keyframes blink {
+ to {
+ background-color: rgba(255, 255, 255, 0.9);
+ color: #000000;
+ }
+}
+
+#battery.critical:not(.charging) {
+ background-color: rgba(245, 60, 60, 0.9);
+ color: #fff;
+ animation-name: blink;
+ animation-duration: 0.5s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+}
+
+label:focus {
+ background-color: rgba(0, 0, 0, 0.9);
+}
+
+#network.disconnected {
+ background-color: rgba(245, 60, 60, 0.9);
+}
+
+
+#taskbar {
+ margin-left: 4px;
+}
+
+#taskbar button {
+ color: #f0f0ff;
+ background-color: rgba(30, 30, 46, 0.6);
+}
+
+#taskbar button:first-child {
+ border-radius: 99px 0 0 99px;
+}
+
+#taskbar button:last-child {
+ border-radius: 0 99px 99px 0;
+}
+
+#taskbar button:first-child:last-child {
+ border-radius: 99px;
+}
+
+#taskbar button:hover {
+ background-color: rgba(49, 50, 68, 0.6);
+}
+
+#taskbar button.active {
+ background-color: rgba(88, 91, 112, 0.6);
+}
+
+#taskbar button.active:hover {
+ background-color: rgba(108, 112, 134, 0.6);
+}
+
+
+#pulseaudio.muted {
+ background-color: rgba(46, 32, 30, 0.9);
+}
+
+slider {
+ min-height: 0px;
+ min-width: 0px;
+ opacity: 0;
+ background-image: none;
+ border: none;
+ box-shadow: none;
+}
+
+trough {
+ min-height: 10px;
+ min-width: 80px;
+ border-radius: 5px;
+ background-color: black;
+}
+
+highlight {
+ min-width: 10px;
+ border-radius: 5px;
+ background-color: green;
+}
+
+#wireplumber {
+ background-color: rgba(255, 240, 245, 0.8);
+ color: #000000;
+}
+
+#wireplumber.muted {
+ background-color: rgba(245, 60, 60, 0.9);
+}
+
+
+#temperature.critical {
+ background-color: rgba(235, 77, 75, 0.8);
+}
+
+#tray {
+ background-color: rgba(41, 128, 185, 0.8);
+}
+
+#tray>.passive {
+ -gtk-icon-effect: dim;
+}
+
+#tray>.needs-attention {
+ -gtk-icon-effect: highlight;
+ background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+ background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+ background-color: #ecf0f1;
+ color: #2d3436;
+}
+
+#language {
+ background: #00b093;
+ color: #740864;
+ margin: 0 5px;
+ min-width: 16px;
+}
+
+#keyboard-state {
+ background: rgba(151, 225, 173, 0.8);
+ color: #000000;
+}
+
+#keyboard-state>label {
+ margin-left: 2.5px;
+ margin-right: 2.5px;
+ padding: 0 5px;
+}
+
+#keyboard-state>label.locked {
+ background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+ background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+ background-color: transparent;
+}
\ No newline at end of file
diff --git a/configs/hypr/waybar/top-bar.jsonc b/configs/hypr/waybar/top-bar.jsonc
new file mode 100644
index 0000000..34fa3be
--- /dev/null
+++ b/configs/hypr/waybar/top-bar.jsonc
@@ -0,0 +1,190 @@
+{
+ "reload_style_on_change": true,
+ "layer": "top", // Waybar at top layer
+ "height": 32, // Waybar height (to be removed for auto height)
+ "margin-top": 4,
+ "margin-left": 4,
+ "margin-right": 4,
+ "spacing": 0, // Gaps between modules (4px)
+ "modules-left": [
+ "niri/window"
+ ],
+ "modules-center": [
+ "privacy",
+ "clock",
+ ],
+ "modules-right": [
+ "group/controls",
+ "battery",
+ "group/sound",
+ "group/backlight",
+ "tray",
+ "mpd",
+ // "jack",
+ // "wireplumber",
+ "custom/logout"
+ ],
+ // Modules configuration
+ "group/sound": {
+ "click-to-reveal": true,
+ "orientation": "horizontal",
+ "drawer": {
+ "transition-duration": 500,
+ "transition-left-to-right": true
+ },
+ "modules": [
+ "pulseaudio",
+ "pulseaudio/slider"
+ ]
+ },
+ "group/backlight": {
+ "click-to-reveal": true,
+ "orientation": "horizontal",
+ "drawer": {
+ "transition-duration": 500,
+ "transition-left-to-right": true
+ },
+ "modules": [
+ "backlight",
+ "backlight/slider"
+ ]
+ },
+ "pulseaudio/slider": {
+ "min": 0,
+ "max": 100,
+ "orientation": "horizontal",
+ },
+ "custom/logout": {
+ "format": "⏻",
+ "tooltip": true,
+ "on-click": "nwg-bar"
+ },
+ "keyboard-state": {
+ "numlock": true,
+ "capslock": true,
+ "format-icons": {
+ "locked": "",
+ "unlocked": ""
+ },
+ "format": {
+ "numlock": "N {icon}",
+ "capslock": "C {icon}"
+ }
+ },
+ "niri/window": {
+ "icon": true,
+ "format": "{app_id}/{title}"
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ }
+ },
+ "tray": {
+ "spacing": 10
+ },
+ "custom/controls": {
+ "format": "🎛️",
+ "tooltip": true
+ },
+ "group/controls": {
+ "click-to-reveal": true,
+ "orientation": "horizontal",
+ "drawer": {
+ "transition-duration": 500,
+ "transition-left-to-right": false
+ },
+ "modules": [
+ "custom/controls",
+ "network",
+ "cpu",
+ "memory",
+ "temperature",
+ "idle_inhibitor",
+ "keyboard-state"
+ ]
+ },
+ "clock": {
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format": "{:%e %B %H:%M}",
+ "on-click": "gnome-calendar"
+ },
+ "cpu": {
+ "format": "{usage}% ",
+ "tooltip": false
+ },
+ "memory": {
+ "format": "{}% "
+ },
+ "temperature": {
+ "critical-threshold": 80,
+ "format": "{temperatureC}°C {icon}",
+ "format-icons": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "backlight": {
+ "format": "{icon}",
+ "format-icons": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "battery": {
+ "states": {
+ "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{capacity}% {icon}",
+ "format-charging": "{capacity}% ",
+ "format-plugged": "{capacity}% ",
+ "format-alt": "{time} {icon}",
+ "format-icons": [
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "network": {
+ "format": "{ifname} {essid}",
+ "tooltip-format": "{ifname} {ipaddr}/{cidr} {essid} {icon} {frequency} {signaldBm}",
+ "on-click": "nmcli device wifi rescan && ghostty -e nmtui"
+ },
+ "pulseaudio": {
+ "format": "{icon}",
+ "format-bluetooth": "{volume}% {icon}",
+ "format-bluetooth-muted": " {icon}",
+ "format-muted": "",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "on-click": "/run/current-system/sw/bin/flatpak run org.pipewire.Helvum"
+ // "on-click": "/run/current-system/sw/bin/pavucontrol"
+ }
+}
\ No newline at end of file
diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl
index 59f5c64..1c662a0 100644
--- a/configs/niri/config.kdl
+++ b/configs/niri/config.kdl
@@ -32,8 +32,6 @@ window-rule {
open-focused true
}
-spawn-at-startup "waypaper" "--restore"
-spawn-at-startup "flameshot"
// =========================
// Outputs
@@ -165,6 +163,17 @@ window-rule {
match is-active=false
opacity 0.85
}
+window-rule {
+ match app-id="satty"
+ open-focused true
+ open-floating true
+ min-width 800
+ min-height 400
+ default-floating-position x=-200 y=200 relative-to="top"
+
+ default-window-height { proportion 0.75; }
+ default-column-width { proportion 0.75; }
+}
window-rule {
match app-id=r#"^Slack$"#
match app-id="code"
@@ -194,10 +203,13 @@ hotkey-overlay {
binds {
Mod+Shift+H { show-hotkey-overlay; }
Mod+T { spawn "ghostty"; }
- Mod+Space { spawn "sherlock"; }
- Mod+B { spawn "flatpak" "run" "app.zen_browser.zen"; }
+ // Mod+Space { spawn-sh "/run/current-system/sw/bin/rofi -show drun -theme $HOME/.config/rofi-collection/nord/nord.rasi"; }
+ Mod+Space { spawn "walker"; }
+ // Mod+Space { spawn-sh "rofi -show drun -theme $HOME/.config/rofi-collection/nord/nord.rasi"; }
+ // Mod+Space { spawn-sh "/run/current-system/sw/bin/sherlock"; }
+ Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; }
//Mod+B { spawn "chromium" "--profile-directory=ProfilePersonal"; }
- //Mod+Alt+B { spawn "chromium" "--profile-directory=ProfileWork"; }
+ Mod+B { spawn "chromium"; }
Mod+E { spawn "wofi-emoji"; }
XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; }
XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; }
@@ -244,11 +256,9 @@ binds {
Ctrl+Alt+Delete { quit; }
Mod+Q { close-window; }
- Mod+Ctrl+P { spawn "waypaper" "--restore"; }
-
Mod+Ctrl+W {
- spawn "sh" "-c" "/home/ari/.config/niri/waybar/start-up-script.sh";
+ spawn "sh" "-c" "/home/ari/.config/niri/start-up-script.sh";
}
}
-spawn-at-startup "/home/ari/.config/niri/waybar/start-up-script.sh"
+spawn-at-startup "/home/ari/.config/niri/start-up-script.sh"
diff --git a/configs/niri/waybar/start-up-script.sh b/configs/niri/start-up-script.sh
similarity index 86%
rename from configs/niri/waybar/start-up-script.sh
rename to configs/niri/start-up-script.sh
index 6213b72..01a5c1a 100755
--- a/configs/niri/waybar/start-up-script.sh
+++ b/configs/niri/start-up-script.sh
@@ -11,6 +11,8 @@ killall -q hypridle
hypridle &
killall -q swayosd-server
-swayosd-server
+swayosd-server &
+killall -q walker
+walker --gapplication-service &
notify-send "Niri Startup Script" "Completed 🎉"
diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix
index 0ffac7b..52e01d0 100644
--- a/hosts/fwbook.nix
+++ b/hosts/fwbook.nix
@@ -27,13 +27,13 @@ in
};
desktop = {
enable = true;
- cosmic.enable = false;
+ cosmic.enable = true;
kde.enable = false;
crypto.enable = true;
gnome.enable = false;
tiler = {
enable = true;
- hyprland.enable = false;
+ hyprland.enable = true;
niri.enable = true;
background = {
enable = true;
diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix
index f6eb7c4..9517029 100644
--- a/modules/nixos/desktop/tiler/default.nix
+++ b/modules/nixos/desktop/tiler/default.nix
@@ -40,7 +40,7 @@ in
networkmanagerapplet
blueman
# Apps
- sherlock-launcher
+ walker
waybar
nwg-bar
gnome-calendar
diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix
index 5b6c51b..4b622ed 100644
--- a/modules/nixos/desktop/tiler/hyprland.nix
+++ b/modules/nixos/desktop/tiler/hyprland.nix
@@ -1,14 +1,14 @@
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.nixos.desktop.tiler.hyprland;
- hypr-plugin-dir = pkgs.symlinkJoin {
- name = "hyrpland-plugins";
- paths = with pkgs.hyprlandPlugins; [
- hyprexpo
- hyprbars
- hyprspace
- ];
- };
+ # hypr-plugin-dir = pkgs.symlinkJoin {
+ # name = "hyrpland-plugins";
+ # paths = with pkgs.hyprlandPlugins; [
+ # hyprexpo
+ # hyprbars
+ # hyprspace
+ # ];
+ # };
in
{
options = {
@@ -22,18 +22,23 @@ in
programs.hyprland = {
enable = true;
withUWSM = true;
+ xwayland.enable = true;
};
programs.uwsm.enable = true;
environment.systemPackages = with pkgs; [
hyprls
];
- environment.sessionVariables = {
- HYPR_PLUGIN_DIR = hypr-plugin-dir;
- };
- home-manager.users.${config.skyg.user.name} = {
- programs.hyprpanel = {
+ xdg.portal = {
enable = true;
- };
+ extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ];
};
+ # environment.sessionVariables = {
+ # HYPR_PLUGIN_DIR = hypr-plugin-dir;
+ # };
+ # home-manager.users.${config.skyg.user.name} = {
+ # programs.hyprpanel = {
+ # enable = true;
+ # };
+ # };
};
}