diff --git a/flake.lock b/flake.lock
index 473d3a7..a7ce13f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,11 +44,11 @@
"dotfiles": {
"flake": false,
"locked": {
- "lastModified": 1729784995,
- "narHash": "sha256-V/Wsvb/gCYNvBW5zixZM+47ycIUxWfoiDh0sK4EX3VU=",
+ "lastModified": 1729874151,
+ "narHash": "sha256-su05kUiCGCYTvpxcVkMAAOh2O3I63vbKptgLrps6E+M=",
"ref": "refs/heads/main",
- "rev": "7b6447b8d5a37504668f2c6dcceb210feec5d8fb",
- "revCount": 32,
+ "rev": "9d3e14744518dabb24e08e1a28f98bf29d6f5716",
+ "revCount": 37,
"type": "git",
"url": "https://github.com/nomadics9/dotfiles.git"
},
diff --git a/flake.nix b/flake.nix
index 92af3b2..7e919ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,9 @@
'';
inputs = {
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@@ -18,9 +21,6 @@
};
disko.url = "github:nix-community/disko";
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
-
dotfiles = {
url = "git+https://github.com/nomadics9/dotfiles.git";
flake = false;
diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/wayland.nix
index 10f8468..b604f4a 100644
--- a/home/features/desktop/wayland.nix
+++ b/home/features/desktop/wayland.nix
@@ -597,10 +597,11 @@ in
brightnessctl
pamixer
pavucontrol # Volume control
- dunst # Notifications
jellyfin-ffmpeg # Multimedia libs
viewnior # Image viewr
+ mako # Notifications
libcanberra-gtk3 # Notification sound
+ libnotify # notify-send
# Gnome Stuff
gtk-engine-murrine
diff --git a/home/nomad/dotfiles/default.nix b/home/nomad/dotfiles/default.nix
index d198c69..516c530 100644
--- a/home/nomad/dotfiles/default.nix
+++ b/home/nomad/dotfiles/default.nix
@@ -1,7 +1,6 @@
{ inputs, pkgs, ... }: {
imports = [
./bat.nix
- ./dunst.nix
];
home.file.".config/nvim" = {
@@ -9,6 +8,11 @@
recursive = true;
};
+ home.file.".config/mako" = {
+ source = "${inputs.dotfiles}/mako";
+ recursive = true;
+ };
+
home.file.".config/hypr/scripts" = {
source = "${inputs.dotfiles}/scripts";
recursive = true;
diff --git a/home/nomad/dotfiles/dunst.nix b/home/nomad/dotfiles/dunst.nix
deleted file mode 100644
index 9b75c76..0000000
--- a/home/nomad/dotfiles/dunst.nix
+++ /dev/null
@@ -1,208 +0,0 @@
-{
- home.file.".config/dunst/dunstrc".text = ''
- [global]
-
- # --- Display --- #
-
- # The monitor to be displayed to
- monitor = 0
-
- # Follow monitor with mouse
- follow = mouse
-
- width = 300
- # height = 260
- origin = top-right
- offset = 10x1
-
-
- progress_bar = true
- progress_bar_height = 14
- progress_bar_frame_width = 1
- progress_bar_min_width = 150
- progress_bar_max_width = 300
- progress_bar_corner_radius = 5
-
-
- # Show how many messages are hidden
- indicate_hidden = yes
-
- # Shrink window if it's smaller than the width.
- shrink = no
-
- # The transparency of the window.
- transparency = 1
-
- # Draw a line between multiple notifications
- separator_height = 6
-
- separator_color = "#272f57"
-
- # Set notification padding
- padding = 16
- horizontal_padding = 16
-
- # Disable frame (border)
- frame_width = 0
-
- # Sort messages by urgency.
- sort = no
-
- # Disable idle time
- idle_threshold = 0
-
-
- # --- Text --- #
-
- # Set the font
- # font = "Noto Sans 11"
- font = "JetBrainsMono 11"
-
- # Set line height to font height
- line_height = 0
-
- # Reference for markup and formatting:
- # bold
- # italic
- # strikethrough
- # underline
- # .
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # %n progress value if set without any extra characters
- # %% Literal %
-
- markup = full
- format = "%a\n%b\n%s"
-
- # Left align the text
- alignment = left
-
- # Vertical alignment of message text and icon.
- vertical_alignment = center
-
- # Show age of message if message is old
- show_age_threshold = 120
-
- # Wrap text if it doesn't fit in geometry
- word_wrap = yes
-
- # Where to place ellipses if word wrap is disabled
- # ellipsize = middle
-
- # Use newlines '\n' in notifications.
- ignore_newline = no
-
- # Don't stack together notifications
- stack_duplicates = true
-
- # Hide the count of stacked notifications
- # hide_duplicate_count = false
-
- # Display indicators for URLs (U) and actions (A).
- show_indicators = yes
-
-
- # ---- Icons ---- #
-
- # Align icons left/right/off
- icon_position = left
-
- # Scale small icons up to this size, set to 0 to disable.
- min_icon_size = 50
-
- # Scale larger icons down to this size, set to 0 to disable
- max_icon_size = 60
-
- # Paths to default icons.
- icon_path = /usr/share/icons/kora/apps/scalable:/usr/share/icons/kora/status/scalable:/usr/share/icons/kora/actions/scalable:/usr/share/icons/kora/emblems/scalable:/usr/share/icons/kora/devices/scalable
-
- # --- History --- #
-
- # Avoid timing out hidden notifications
- sticky_history = yes
-
- # Maximum amount of notifications kept in history
- history_length = 100
-
-
- # --- Misc/Advanced --- #
-
- dmenu = /usr/bin/dmenu -p dunst:
-
- # Browser for opening urls in context menu.
- browser = google-chrome-stable -new-tab
-
- # Always run rule-defined scripts, even if the notification is suppressed
- always_run_script = false
-
- # Define the title of the windows spawned by dunst
- title = Dunst
-
- # Define the class of the windows spawned by dunst
- class = Dunst
-
- # Define the corner radius of the notification window
- corner_radius = 20
-
- # Don't gnore the dbus closeNotification message.
- ignore_dbusclose = false
-
-
- # --- Legacy --- #
-
- # Use the Xinerama extension instead of RandR for multi-monitor support.
- force_xinerama = false
-
-
- # --- Mouse --- #
- mouse_left_click = close_current
- mouse_middle_click = close_all, close_current
- mouse_right_click = do_action
-
-
- [experimental]
- per_monitor_dpi = false
-
- [urgency_low]
- background = "#141929fe"
- highlight = "#6fa6e7"
- frame_color = "#272f57"
- foreground = "#dae1f2"
- timeout = 8
-
- [urgency_normal]
- background = "#26292e"
- highlight = "#5ca1ff"
-
- frame_color = "#272f57"
- foreground = "#dae1f2"
- timeout = 8
-
- [urgency_critical]
- background = "#5ca1ffff"
- highlight = "#fe6c5a"
- foreground = "#1c2138"
- frame_color = "#52426e"
- timeout = 0
- icon = battery-ac-adapter
-
- [backlight]
- appname = "Backlight"
- highlight = "#fc7b80"
-
- [music]
- appname = "Music"
-
- [volume]
- summary = "Volume*"
- highlight = "#cb8cf4"
-
- [battery]
- appname = "Power Warning"
- '';
-}
diff --git a/update-report.sh b/update-report.sh
index c3c5446..375af89 100755
--- a/update-report.sh
+++ b/update-report.sh
@@ -21,5 +21,5 @@ formatted_output=$(echo "$output" | awk '
printf "🔹 %s: %s +%s\n", package, version, size_mib_rounded
}
}')
-dunstify -u low -h string:x-dunst-stack-tag:diff -a "💫 Updated Packages" "$formatted_output"
+notify-send -u low -h string:x-mako-stack-tag:diff "💫 Updated Packages" "$formatted_output" -t 0 -u critical