Remove dunst duplication, fix config

This commit is contained in:
Evie Litherland-Smith 2023-04-12 15:36:35 +01:00
parent a43db291fd
commit c13d414913
7 changed files with 19 additions and 67 deletions

View file

@ -8,7 +8,7 @@ monitor=DP-1,preferred,auto,auto,transform,1
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
exec-once = hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf & waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config & eww daemon
exec-once = dunst & hyprpaper -c ~/.dotfiles/nixos/home-manager/env/config/hypr/hyprpaper.conf & waybar -c ~/.dotfiles/nixos/home-manager/env/config/waybar/config & eww daemon
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
@ -103,13 +103,13 @@ device:epic-mouse-v1 {
windowrule = float, ^(pavucontrol)$
windowrule = workspace 1, ^(foot)$
windowrule = workspace 2, ^(firefox)$
windowrule = workspace 3, ^(dolphin)$
windowrule = workspace 3, ^(org.kde.dolphin)$
windowrule = workspace 4, ^(thunderbird)$
windowrule = workspace 4, ^(mailspring)$
windowrule = workspace 5, ^(element)$
windowrule = workspace 5, ^(signal)$
windowrule = workspace 6, ^(steam)$
windowrule = workspace 7, ^(bitwarden)$
windowrule = workspace 5, ^(Element)$
windowrule = workspace 5, ^(Signal)$
windowrule = workspace 6, ^(Steam)$
windowrule = workspace 7, ^(Bitwarden)$
windowrule = workspace 8, ^(Nxplayer.bin)$
wsbind=1,HDMI-A-1

View file

@ -5,12 +5,7 @@
settings = {
global = {
follow = "mouse";
width = 300;
height = 300;
origin = "top-right";
offset = "30x40";
scale = 0;
notification_limit = 5;
progress_bar = true;
progress_bar_height = 10;
progress_bar_frame_width = 1;
@ -18,22 +13,9 @@
progress_bar_max_width = 300;
indicate_hidden = "yes";
transparency = 16;
separator_height = 2;
padding = 8;
horizontal_padding = 8;
text_icon_padding = 0;
frame_width = 1;
frame_color = "#8AADF4";
separator_color = "frame";
sort = "yes";
idle_threshold = 0;
font = "Noto Sans Regular 9";
line_height = 0;
markup = "full";
format = "<b>%s</b>\n%b";
alignment = "left";
vertical_alignment = "centre";
show_age_threshold = 60;
font = "FiraCode Nerd Font 10";
ellipsize = "end";
ignore_newline = "no";
stack_duplicates = true;
@ -45,16 +27,19 @@
mouse_middle_click = "do_action, close_current";
mouse_right_click = "close_all";
};
urgency_low = {
background = "#24273A";
foreground = "#CAD3F5";
timeout = 5;
};
urgency_normal = {
background = "#24273A";
foreground = "#CAD3F5";
timeout = 5;
};
urgency_critical = {
background = "#24273A";
foreground = "#CAD3F5";
@ -62,5 +47,13 @@
timeout = 120;
};
};
#settings = builtins.readFile(
# pkgs.fetchFromGitHub {
# owner = "catppuccin";
# repo = "dunst";
# rev = "b0b838d38f134136322ad3df2b6dc57c4ca118cf";
# sha256 = "ruFcHh1dkd4Zy9qNlAA8qAksTzNjXPd2hSSmhdGgflU=";
# } + "/src/macchiato.conf"
#);
};
}

View file

@ -4,7 +4,6 @@
./packages/env
./packages/tui
./packages/gui/browser.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/kitty.nix
];

View file

@ -1,10 +1,9 @@
{ pkgs, ... }:
{ ... }:
{
imports = [
./browser.nix
./cloud.nix
./dunst.nix
./foot.nix
./gaming.nix
./kitty.nix

View file

@ -1,37 +0,0 @@
{ ... }:
{
imports = [ ./common.nix ];
services.dunst = {
enable = true;
settings = {
global = {
frame_color = "#8AADF4";
separator_color = "frame";
};
urgency_low = {
background = "#24273A";
foreground = "#CAD3F5";
};
urgency_normal = {
background = "#24273A";
foreground = "#CAD3F5";
};
urgency_critical = {
background = "#24273A";
foreground = "#CAD3F5";
frame_color = "#F5A97F";
};
};
#settings = builtins.readFile(
# pkgs.fetchFromGitHub {
# owner = "catppuccin";
# repo = "dunst";
# rev = "b0b838d38f134136322ad3df2b6dc57c4ca118cf";
# sha256 = "ruFcHh1dkd4Zy9qNlAA8qAksTzNjXPd2hSSmhdGgflU=";
# } + "/src/macchiato.conf"
#);
};
}

View file

@ -6,7 +6,6 @@
./packages/tui
./packages/gui/browser.nix
./packages/gui/cloud.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/kitty.nix
./packages/gui/messaging.nix

View file

@ -5,7 +5,6 @@
./packages/tui
./packages/gui/browser.nix
./packages/gui/cloud.nix
./packages/gui/dunst.nix
./packages/gui/foot.nix
./packages/gui/gaming.nix
./packages/gui/kitty.nix