summaryrefslogtreecommitdiff
path: root/modules/desktop
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-06-23 22:33:44 -0400
committerFreya Murphy <freya@freyacat.org>2025-06-23 22:33:44 -0400
commit328c741b1aac74020412e99e0dca7c728dbc92fa (patch)
tree461f4ebcd3252d542749a34668defd62de356c73 /modules/desktop
parentremoved unused packages (diff)
downloaddotfiles-nix-328c741b1aac74020412e99e0dca7c728dbc92fa.tar.gz
dotfiles-nix-328c741b1aac74020412e99e0dca7c728dbc92fa.tar.bz2
dotfiles-nix-328c741b1aac74020412e99e0dca7c728dbc92fa.zip
refactor
Diffstat (limited to '')
-rw-r--r--modules/desktop/astal.nix24
-rw-r--r--modules/desktop/default.nix106
-rw-r--r--modules/desktop/firefox/default.nix39
-rw-r--r--modules/desktop/firefox/extraPrefs.nix (renamed from programs/firefox/extraPrefs.nix)0
-rw-r--r--modules/desktop/firefox/policy.nix (renamed from programs/firefox/policy.nix)0
-rw-r--r--modules/desktop/firefox/policyExtensions.nix (renamed from programs/firefox/policyExtensions.nix)0
-rw-r--r--modules/desktop/firefox/policyPrefs.nix (renamed from programs/firefox/policyPrefs.nix)0
-rw-r--r--modules/desktop/firefox/userChrome.nix (renamed from programs/firefox/userChrome.nix)0
-rw-r--r--modules/desktop/hypridle.nix45
-rw-r--r--modules/desktop/hyprland.nix353
-rw-r--r--modules/desktop/hyprlock.nix87
-rw-r--r--modules/desktop/hyprpaper.nix22
-rw-r--r--modules/desktop/mako.nix35
-rw-r--r--modules/desktop/waybar/default.nix87
-rw-r--r--modules/desktop/waybar/style.nix (renamed from programs/waybar/style.nix)0
-rw-r--r--modules/desktop/wofi/default.nix29
-rw-r--r--modules/desktop/wofi/style.nix (renamed from programs/wofi/style.nix)0
17 files changed, 827 insertions, 0 deletions
diff --git a/modules/desktop/astal.nix b/modules/desktop/astal.nix
new file mode 100644
index 0000000..2f7f0f3
--- /dev/null
+++ b/modules/desktop/astal.nix
@@ -0,0 +1,24 @@
+{
+ lib,
+ config,
+ pkgs,
+ inputs,
+ ...
+}: let
+ system = pkgs.stdenv.hostPlatform.system;
+ astal = inputs.self.packages.${system};
+
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.astal {
+ default.appLauncher = lib.mkDefault "astal-launcher";
+
+ home-manager.users.${config.user} = {
+ home.packages = [
+ astal.astal.shell
+ astal.astal.launcher
+ ];
+ };
+ };
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..a11842c
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,106 @@
+{
+ lib,
+ config,
+ pkgs,
+ ...
+}: let
+ inherit (lib) mkEnableOption mkIf optionals;
+ cfg = config.desktop;
+in {
+ imports = [
+ ./firefox
+ ./waybar
+ ./wofi
+ ./astal.nix
+ ./hypridle.nix
+ ./hyprland.nix
+ ./hyprlock.nix
+ ./hyprpaper.nix
+ ./mako.nix
+ ];
+
+ options.desktop = {
+ enable = mkEnableOption "Enable baseline desktop utils and programs.";
+ astal = mkEnableOption "Enable the astal gtk shell.";
+ firefox = mkEnableOption "Enable the firefox browser.";
+ hypridle = mkEnableOption "Enable the hypridle daemon.";
+ hyprland = mkEnableOption "Install the Hyprland desktop.";
+ hyprlock = mkEnableOption "Enable the hyprlock lockscreen.";
+ hyprpaper = mkEnableOption "Enable the hyprpaper wallpaper daemon.";
+ mako = mkEnableOption "Enable the mako notification daemon.";
+ waybar = mkEnableOption "Enable the waybar bar.";
+ wofi = mkEnableOption "Enable the wofi launcher.";
+ };
+
+ config = mkIf cfg.enable {
+ home-manager.users.${config.user} = {
+ # desktop specific programs
+ home.packages = with pkgs; [
+ # gtk
+ adwaita-icon-theme
+ orchis-theme
+ # media
+ ffmpeg
+ libaacs
+ libavif
+ libbluray
+ libjxl
+ # wayland
+ cage
+ grimblast
+ wl-clipboard
+ wl-clip-persist
+ wl-mirror
+ # xdg
+ libnotify
+ ];
+
+ # desktop only fonts
+ fonts.packages =
+ (with pkgs; [
+ corefonts
+ dejavu_fonts
+ fira-code
+ fira-code-symbols
+ jetbrains-mono
+ material-icons
+ nerd-fonts.fira-code
+ noto-fonts
+ noto-fonts-cjk-sans
+ noto-fonts-emoji
+ twemoji-color-font
+ vistafonts
+ ])
+ ++ (with inputs.apple-fonts.packages.${pkgs.system}; [
+ sf-pro
+ sf-mono
+ sf-compact
+ ]);
+
+ fonts.fontconfig = {
+ enable = true;
+ defaultFonts = {
+ serif = [
+ "Twemoji"
+ "DejaVu Serif"
+ ];
+ sansSerif = [
+ "Twemoji"
+ "DejaVu Sans"
+ ];
+ monospace = [
+ "Fira Code"
+ "FiraCode Nerd Font Mono"
+ "Font Awesome 6 Pro Regular"
+ "Twemoji"
+ "DejaVu Sans Mono"
+ ];
+ emoji = [
+ "Twemoji"
+ "Noto Color Emoji"
+ ];
+ };
+ };
+ };
+ };
+}
diff --git a/modules/desktop/firefox/default.nix b/modules/desktop/firefox/default.nix
new file mode 100644
index 0000000..e7720b2
--- /dev/null
+++ b/modules/desktop/firefox/default.nix
@@ -0,0 +1,39 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}: let
+ extraPrefs = import ./extraPrefs.nix;
+ userChrome = import ./userChrome.nix;
+ my-firefox = pkgs.firefox.override {
+ extraPrefs = extraPrefs;
+ };
+
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.firefox {
+ default.browser = lib.mkDefault "firefox";
+
+ home-manager.users.${config.user} = {
+ programs.firefox = {
+ enable = true;
+ package = my-firefox;
+
+ # import configuration
+ policies = import ./policy.nix;
+
+ # create profile for me :3
+ profiles.${config.user} = {
+ search = {
+ force = true;
+ default = "ddg";
+ };
+
+ userChrome = userChrome;
+ };
+ };
+ };
+ };
+}
diff --git a/programs/firefox/extraPrefs.nix b/modules/desktop/firefox/extraPrefs.nix
index 74db984..74db984 100644
--- a/programs/firefox/extraPrefs.nix
+++ b/modules/desktop/firefox/extraPrefs.nix
diff --git a/programs/firefox/policy.nix b/modules/desktop/firefox/policy.nix
index e222553..e222553 100644
--- a/programs/firefox/policy.nix
+++ b/modules/desktop/firefox/policy.nix
diff --git a/programs/firefox/policyExtensions.nix b/modules/desktop/firefox/policyExtensions.nix
index 51d7e9d..51d7e9d 100644
--- a/programs/firefox/policyExtensions.nix
+++ b/modules/desktop/firefox/policyExtensions.nix
diff --git a/programs/firefox/policyPrefs.nix b/modules/desktop/firefox/policyPrefs.nix
index 73d2781..73d2781 100644
--- a/programs/firefox/policyPrefs.nix
+++ b/modules/desktop/firefox/policyPrefs.nix
diff --git a/programs/firefox/userChrome.nix b/modules/desktop/firefox/userChrome.nix
index ab93747..ab93747 100644
--- a/programs/firefox/userChrome.nix
+++ b/modules/desktop/firefox/userChrome.nix
diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix
new file mode 100644
index 0000000..01d4996
--- /dev/null
+++ b/modules/desktop/hypridle.nix
@@ -0,0 +1,45 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.hypridle {
+ home-manager.users.${config.user} = {
+ services.hypridle = {
+ enable = true;
+
+ settings = {
+ general = {
+ lock_cmd = "pidof hyprlock || hyprlock";
+ before_sleep_cmd = "loginctl lock-session";
+ after_sleep_cmd = "hyprctl dispatch dpms on";
+ ignore_dbus_inhibit = false;
+ };
+
+ listener = [
+ # dim screen
+ {
+ timeout = 150;
+ on-timeout = "brightnessctl -s set 10";
+ on-resume = "brightnessctl -r";
+ }
+ # lock
+ {
+ timeout = 300;
+ on-timeout = "loginctl lock-session";
+ }
+ # turn off screen
+ {
+ timeout = 350;
+ on-timeout = "hyprctl dispatch dpms off";
+ on-resume = "hyprctl dispatch dpms on";
+ }
+ ];
+ };
+ };
+ };
+ };
+}
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
new file mode 100644
index 0000000..10b058d
--- /dev/null
+++ b/modules/desktop/hyprland.nix
@@ -0,0 +1,353 @@
+{
+ config,
+ pkgs,
+ lib,
+ inputs,
+ ...
+}: let
+ system = pkgs.stdenv.hostPlatform.system;
+ hyprland = inputs.hyprland.packages.${system};
+ hyprland-plugins = inputs.hyprland-plugins.packages.${system};
+ hy3 = inputs.hy3.packages.${system};
+
+ fg = "rgb(${config.theme.colors.fg})";
+ bg = "rgb(${config.theme.colors.bg})";
+ primary = "rgb(${config.theme.colors.primary})";
+ inactive = "rgb(${config.theme.colors.surface.bg})";
+
+ debug = false;
+
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.hyprland {
+ environment = {
+ variables = {
+ HYPRLAND_TRACE =
+ if debug
+ then "1"
+ else "0";
+ AQ_TRACE =
+ if debug
+ then "1"
+ else "0";
+
+ XDG_CURRENT_DESKTOP = "Hyprland";
+ XDG_SESSION_TYPE = "wayland";
+ XDG_SESSION_DESKTOP = "Hyprland";
+ LIBSEAT_BACKEND = "logind";
+ };
+ sessionVariables = {
+ XCURSOR_THEME = "Adwaita";
+ XCURSOR_SIZE = "24";
+
+ GTK_THEME = "Orchis-Teal-Dark";
+
+ MOZ_ENABLE_WAYLAND = "1";
+ MOZ_USE_XINPUT = "1";
+ _JAVA_AWT_WM_NONREPARENTING = "1";
+ };
+ };
+
+ xdg.portal = {
+ enable = true;
+ xdgOpenUsePortal = true;
+ config = {
+ common.default = ["gtk"];
+ hyprland.default = ["gtk" "hyprland"];
+ };
+ extraPortals = [
+ pkgs.xdg-desktop-portal-gtk
+ pkgs.xdg-desktop-portal-wlr
+ hyprland.xdg-desktop-portal-hyprland
+ ];
+ };
+
+ programs.xwayland.enable = true;
+
+ home-manager.users.${config.user} = {
+ wayland.windowManager.hyprland = {
+ enable = true;
+ package = hyprland.hyprland;
+
+ xwayland.enable = true;
+ systemd.enable = true;
+
+ # Plugins
+ plugins = [
+ hyprland-plugins.hyprexpo
+ hy3.hy3
+ ];
+
+ # Config
+ settings = {
+ # Debug
+ debug.disable_logs = ! debug;
+ debug.disable_time = ! debug;
+ debug.enable_stdout_logs = debug;
+
+ # Monitors
+ monitor =
+ map (
+ monitor: "${monitor.name}, highres, auto, ${toString monitor.scale}, bitdepth, ${toString monitor.bitdepth}"
+ )
+ config.monitors;
+
+ # Autostart
+ exec-once = config.autoRun;
+
+ # General
+ general = {
+ gaps_in = config.theme.innerGap;
+ gaps_out = config.theme.outerGap;
+ layout = "hy3";
+ resize_on_border = "yes";
+ extend_border_grab_area = 20;
+ border_size = config.theme.borderWidth;
+ "col.active_border" = "${primary}";
+ "col.inactive_border" = "${inactive}";
+ };
+
+ # Gestures
+ gestures = {
+ workspace_swipe = true;
+ workspace_swipe_fingers = 3;
+ workspace_swipe_forever = true;
+ workspace_swipe_cancel_ratio = 0.15;
+ };
+
+ # Decoration
+ decoration = {
+ rounding = config.theme.outerRadius;
+ shadow.enabled = false;
+ blur = {
+ enabled = config.theme.blur;
+ size = 4;
+ passes = 2;
+ noise = 0.008;
+ contrast = 0.8916;
+ brightness = 0.8;
+ };
+ };
+
+ # Animations
+ animations = {
+ enabled = true;
+
+ bezier = [
+ "windowIn, 0.06, 0.71, 0.25, 1"
+ "windowResize, 0.04, 0.67, 0.38, 1"
+ ];
+
+ animation = [
+ "windowsIn, 1, 3, windowIn, slide #popin 20%"
+ "windowsOut, 1, 3, windowIn, slide #popin 70%"
+ "windowsMove, 1, 2.5, windowResize"
+ "border, 1, 10, default"
+ "borderangle, 1, 8, default"
+ "fade, 1, 3, default"
+ "workspaces, 1, 6, default"
+ "layers, 1, 5, windowIn, slide"
+ ];
+ };
+
+ # Input
+ input = {
+ kb_layout = "us";
+ kb_variant = "";
+ kb_model = "";
+ kb_options = "gtp:alt_shift_toggle, compose:ralt";
+ kb_rules = "";
+ follow_mouse = 1;
+ touchpad = {
+ natural_scroll = "yes";
+ };
+ sensitivity = 0;
+ };
+
+ # Keybinds
+ "$mod" = "SUPER";
+ bind = [
+ # Launch programs
+
+ "$mod, W, exec, ${config.default.browser}"
+ "$mod, D, exec, ${config.default.appLauncher}"
+ "$mod, L, exec, ${config.default.lockScreen}"
+ "$mod, Return, exec, ${config.default.terminal}"
+ ", Print, exec, grimblast copy area"
+
+ # Misc
+
+ "$mod SHIFT, L, exit"
+ "$mod, tab, hyprexpo:expo, toggle"
+
+ # Window operations
+
+ "$mod SHIFT, Q, killactive"
+ "$mod SHIFT, SPACE, togglefloating"
+ "$mod, F, fullscreen"
+ "$mod, J, togglesplit"
+
+ # Move focus with mod + arrow keys
+
+ "$mod, left, movefocus, l"
+ "$mod, right, movefocus, r"
+ "$mod, up, movefocus, u"
+ "$mod, down, movefocus, d"
+
+ # Move window across workspace with mod + arrow keys
+
+ "$mod SHIFT, left, hy3:movewindow, l"
+ "$mod SHIFT, right, hy3:movewindow, r"
+ "$mod SHIFT, up, hy3:movewindow, u"
+ "$mod SHIFT, down, hy3:movewindow, d"
+
+ # Switch workspaces with mod + [0-9]
+
+ "$mod, 1, workspace, 1"
+ "$mod, 2, workspace, 2"
+ "$mod, 3, workspace, 3"
+ "$mod, 4, workspace, 4"
+ "$mod, 5, workspace, 5"
+ "$mod, 6, workspace, 6"
+ "$mod, 7, workspace, 7"
+ "$mod, 8, workspace, 8"
+ "$mod, 9, workspace, 9"
+
+ # Move active window to a workspace with mod + SHIFT + [0-9]
+
+ "$mod SHIFT, 1, movetoworkspacesilent, 1"
+ "$mod SHIFT, 2, movetoworkspacesilent, 2"
+ "$mod SHIFT, 3, movetoworkspacesilent, 3"
+ "$mod SHIFT, 4, movetoworkspacesilent, 4"
+ "$mod SHIFT, 5, movetoworkspacesilent, 5"
+ "$mod SHIFT, 6, movetoworkspacesilent, 6"
+ "$mod SHIFT, 7, movetoworkspacesilent, 7"
+ "$mod SHIFT, 8, movetoworkspacesilent, 8"
+ "$mod SHIFT, 9, movetoworkspacesilent, 9"
+ "$mod SHIFT, 0, movetoworkspacesilent, 10"
+
+ # Move to tab
+
+ "LALT, 1, hy3:focustab, index, 01"
+ "LALT, 2, hy3:focustab, index, 02"
+ "LALT, 3, hy3:focustab, index, 03"
+ "LALT, 4, hy3:focustab, index, 04"
+ "LALT, 5, hy3:focustab, index, 05"
+ "LALT, 6, hy3:focustab, index, 06"
+ "LALT, 7, hy3:focustab, index, 07"
+ "LALT, 8, hy3:focustab, index, 08"
+ "LALT, 9, hy3:focustab, index, 09"
+ "LALT, 0, hy3:focustab, index, 10"
+
+ "$mod SHIFT, B, hy3:makegroup, h"
+ "$mod SHIFT, V, hy3:makegroup, v"
+ "$mod SHIFT, C, hy3:changegroup, toggletab"
+
+ # Scroll through existing workspaces with mod + scroll
+
+ "$mod, mouse_down, workspace, e+1"
+ "$mod, mouse_up, workspace, e-1"
+ ];
+
+ bindn = [
+ # Focus windows with scroll wheel or middle click
+
+ ", mouse:272, hy3:focustab, mouse"
+ ", mouse_down, hy3:focustab, l, require_hovered"
+ ", mouse_up, hy3:focustab, r, require_hovered"
+ ];
+
+ bindm = [
+ # Move/resize windows with mod + LMB/RMB and dragging
+
+ "$mod, mouse:272, movewindow"
+ "$mod, mouse:273, resizewindow"
+ ];
+
+ binde = [
+ # Audio
+
+ # raise volume
+ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
+ # lower volume
+ ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+ # mute speaker
+ ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+ # mute mic
+ ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+
+ # Media
+
+ # play
+ ", XF86AudioPlay, exec, playerctl play-pause"
+ # next
+ ", XF86AudioNext, exec, playerctl next"
+ # prev
+ ", XF86AudioPrev, exec, playerctl previous"
+
+ # Backlight
+
+ ", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
+ ", XF86MonBrightnessUp, exec, brightnessctl set 5%+"
+ ];
+
+ # Plugin configuration
+ plugin = {
+ # hy3
+ hy3 = {
+ tabs = {
+ height = 24;
+ text_height = 9;
+ text_padding = 10;
+ padding = 2;
+ render_text = true;
+ text_font = "monospace";
+ radius = config.theme.outerRadius;
+ border_width = config.theme.borderWidth;
+
+ "col.active" = "${bg}";
+ "col.active.border" = "${inactive}";
+ "col.active.text" = "${fg}";
+ "col.inactive" = "${bg}";
+ "col.inactive.border" = "${inactive}";
+ "col.inactive.text" = "${fg}";
+ };
+
+ autotile = {
+ enable = true;
+ };
+ };
+ };
+
+ # XWayland
+ xwayland = {
+ force_zero_scaling = "true";
+ use_nearest_neighbor = "false";
+ };
+
+ # Misc
+ misc = {
+ disable_hyprland_logo = true;
+ disable_splash_rendering = true;
+ key_press_enables_dpms = true;
+ mouse_move_enables_dpms = true;
+ enable_anr_dialog = false;
+ vrr = 1;
+ };
+
+ # Ecosystem
+ ecosystem = {
+ no_update_news = true;
+ no_donation_nag = true;
+ };
+
+ # Experimental
+ experimental = {
+ xx_color_management_v4 = true;
+ };
+ }; # end settings
+ }; # end hyprland
+ }; # end home-manager
+ };
+}
diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix
new file mode 100644
index 0000000..9237be5
--- /dev/null
+++ b/modules/desktop/hyprlock.nix
@@ -0,0 +1,87 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ fg = "rgb(${config.theme.colors.fg})";
+ bg = "rgb(${config.theme.colors.bg})";
+ error = "rgb(${config.theme.colors.error})";
+ trans = "rgba(0,0,0,0)";
+
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.hyprlock {
+ default.lockScreen = lib.mkDefault "hyprlock";
+
+ home-manager.users.${config.user} = {
+ programs.hyprlock = {
+ enable = true;
+
+ settings = {
+ background = {
+ path = config.theme.lockscreen;
+ color = bg;
+ blur_passes = 0;
+ blur_size = 2;
+ noise = 0;
+ contrast = 0;
+ brightness = 0;
+ vibrancy = 0;
+ vibrancy_darkness = 0.0;
+ };
+
+ # Password Input
+ input-field = {
+ size = "300, 30";
+ outline_thickness = 0;
+ dots_size = 0.25;
+ dots_spacing = 0.55;
+ dots_center = true;
+ dots_rounding = -1;
+ outer_color = trans;
+ inner_color = trans;
+ font_color = fg;
+ fade_on_empty = false;
+ placeholder_text = "Enter Password";
+ hide_input = false;
+ check_color = error;
+ fail_color = error;
+ capslock_color = -1;
+ numlock_color = -1;
+ bothlock_color = -1;
+ invert_numlock = false;
+ swap_font_color = false;
+ font_family = config.theme.font.regular;
+ position = "0, 50";
+ halign = "center";
+ valign = "bottom";
+ };
+
+ label = [
+ # Date
+ {
+ text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
+ color = fg;
+ font_size = 20;
+ font_family = config.theme.font.header;
+ position = "0, -100";
+ halign = "center";
+ valign = "top";
+ }
+ # Clock
+ {
+ text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\"";
+ color = fg;
+ font_size = 90;
+ font_family = config.theme.font.header;
+ position = "0, -130";
+ halign = "center";
+ valign = "top";
+ }
+ ];
+ };
+ };
+ };
+ };
+}
diff --git a/modules/desktop/hyprpaper.nix b/modules/desktop/hyprpaper.nix
new file mode 100644
index 0000000..045ae62
--- /dev/null
+++ b/modules/desktop/hyprpaper.nix
@@ -0,0 +1,22 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.hyprpaper {
+ home-manager.users.${config.user} = {
+ services.hyprpaper = {
+ enable = true;
+
+ settings = {
+ preload = config.theme.wallpaper;
+ wallpaper = ",${config.theme.wallpaper}";
+ splash = false;
+ };
+ };
+ };
+ };
+}
diff --git a/modules/desktop/mako.nix b/modules/desktop/mako.nix
new file mode 100644
index 0000000..17ed94f
--- /dev/null
+++ b/modules/desktop/mako.nix
@@ -0,0 +1,35 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.mako {
+ home-manager.users.${config.user} = {
+ services.mako = {
+ enable = false; # now using astal
+
+ settings = {
+ font = "${config.theme.font.monospace} 11";
+
+ margin = toString config.theme.outerGap;
+ padding = toString config.theme.innerGap;
+
+ background-color = "#${config.theme.colors.bg}";
+ progress-color = "#${config.theme.colors.primary}";
+ text-color = "#${config.theme.colors.fg}";
+
+ border-color = "#${config.theme.colors.fg}";
+ border-size = config.theme.borderWidth;
+ border-radius = config.theme.outerRadius;
+
+ default-timeout = 5000;
+ layer = "overlay";
+ icons = true;
+ };
+ };
+ };
+ };
+}
diff --git a/modules/desktop/waybar/default.nix b/modules/desktop/waybar/default.nix
new file mode 100644
index 0000000..c2d6927
--- /dev/null
+++ b/modules/desktop/waybar/default.nix
@@ -0,0 +1,87 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.waybar {
+ home-manager.users.${config.user} = {
+ programs.waybar = {
+ enable = false; # using astal now
+
+ settings = [
+ {
+ height = 24;
+ layer = "top";
+ position = "top";
+ spacing = 4;
+
+ modules-left = [
+ "hyprland/workspaces"
+ ];
+ modules-center = [
+ "clock"
+ ];
+ modules-right = [
+ "battery"
+ "wireplumber"
+ "network"
+ "tray"
+ ];
+
+ "hyprland/workspaces" = {
+ disable-scroll = true;
+ all-outputs = true;
+ format = "{name}";
+ };
+
+ battery = {
+ interval = 1;
+ states = {
+ warning = 30;
+ critical = 15;
+ };
+ format = " {capacity}%";
+ format-charging = " {capacity}%";
+ format-plugged = " {capacity}%";
+ format-full = " {capacity}%";
+ format-warning = " {capacity}%";
+ format-critical = " {capacity}%";
+ };
+
+ wireplumber = {
+ format = " {volume}%";
+ format-bluetooth = " {volume}%";
+ format-muted = " muted";
+ scroll-step = 1;
+ on-click = "pavucontrol";
+ ignored-sinks = ["Easy Effects Sink"];
+ };
+
+ network = {
+ format = " disconnected";
+ format-wifi = " {essid}";
+ format-ethernet = " {ipaddr}/{cidr}";
+ format-disconnected = " disconnected";
+ max-length = 50;
+ on-click = "nm-connection-editor";
+ };
+
+ clock = {
+ interval = 1;
+ format = "{:%Y-%m-%d %a %H:%M:%S}";
+ };
+
+ tray = {
+ spacing = config.theme.outerGap;
+ };
+ }
+ ];
+
+ style = import ./style.nix {theme = config.theme;};
+ };
+ };
+ };
+}
diff --git a/programs/waybar/style.nix b/modules/desktop/waybar/style.nix
index 33db673..33db673 100644
--- a/programs/waybar/style.nix
+++ b/modules/desktop/waybar/style.nix
diff --git a/modules/desktop/wofi/default.nix b/modules/desktop/wofi/default.nix
new file mode 100644
index 0000000..aa04495
--- /dev/null
+++ b/modules/desktop/wofi/default.nix
@@ -0,0 +1,29 @@
+{
+ config,
+ lib,
+ ...
+}: let
+ inherit (lib) mkIf;
+ cfg = config.desktop;
+in {
+ config = mkIf cfg.wofi {
+ default.appLauncher = lib.mkDefault "wofi --show drun --prompt 'Seach Programs'";
+
+ home-manager.users.${config.user} = {
+ programs.wofi = {
+ enable = true;
+
+ settings = {
+ key_expand = "Tab";
+ term = "kitty";
+ matching = "multi-contains";
+ insensitive = true;
+ gtk_dark = true;
+ hide_scroll = true;
+ };
+
+ style = import ./style.nix {theme = config.theme;};
+ };
+ };
+ };
+}
diff --git a/programs/wofi/style.nix b/modules/desktop/wofi/style.nix
index 27b7205..27b7205 100644
--- a/programs/wofi/style.nix
+++ b/modules/desktop/wofi/style.nix