diff --git a/hm_modules/dunst.nix b/hm_modules/dunst.nix index 1bd32ff..af8dddf 100644 --- a/hm_modules/dunst.nix +++ b/hm_modules/dunst.nix @@ -8,55 +8,22 @@ in enable = true; iconTheme = { package = pkgs.qogir-icon-theme; - name = "Qogir-dark"; + name = "Qogir"; }; settings = { global = { - monitor = 0; - follow = "mouse"; - geometry = "300x6-20+50"; - indicate_hidden = false; - shrink = "yes"; - transparency = 10; - notification_height = 0; - separator_height = 2; - padding = 8; - horizontal_padding = 8; - frame_width = 2; - frame_color = strPalette.normal.black; + width = "(0, 320)"; + height = 320; + notification_limit = 10; + transparency = 100 - float.round (pkgs.rice.opacity * 100); + frame_width = 1; + frame_color = strPalette.normal.blue; separator_color = strPalette.normal.blue; - sort = "yes"; - idle_threshold = 120; - font = "${pkgs.rice.font.normal.name} 10"; - line_height = 0; - markup = "full"; - format = "%s\\n%b"; - alignment = "left"; - show_age_threshold = 60; - word_wrap = "yes"; - ellipsize = "middle"; - ignore_newline = "no"; - stack_duplicates = "true"; - hide_duplicate_count = "false"; - show_indicators = true; - icon_position = "off"; - max_icon_size = 32; - sticky_history = "yes"; - history_length = 20; - dmenu = "rofi -dmenu -p dunst:"; - # browser = "google-chrome-stable"; - browser = "firefox"; - always_run_script = "true"; - title = "Dunst"; - class = "Dunst"; - startup_notification = "false"; - verbosity = "mesg"; - corner_radius = 0; - force_xinerama = "false"; - mouse_left_click = "close_current"; + dmenu = "${pkgs.rofi}/bin/rofi -dmenu -p dunst:"; + browser = "${pkgs.xdg-utils}/bin/xdg-open"; + # corner_radius = 8; mouse_middle_click = "context"; - mouse_right_click = "close_all"; }; urgency_low = { inherit (strPalette) background foreground; @@ -72,10 +39,10 @@ in timeout = 0; }; shortcuts = { - close = "ctrl+space"; - close_all = "ctrl+shift+space"; - history = "ctrl+backslash"; - context = "ctrl+shift+period"; + # close = "ctrl+space"; + # close_all = "ctrl+shift+space"; + # history = "ctrl+backslash"; + # context = "ctrl+shift+period"; }; }; }; diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix index 3af0980..5764dd8 100644 --- a/hm_modules/sxhkd.nix +++ b/hm_modules/sxhkd.nix @@ -7,12 +7,12 @@ bc gnome.gnome-screenshot lockscreen - pamixer + playerctl terminator bsp-layout update-background - xorg.xbacklight + clipedit ]; services.sxhkd = @@ -23,6 +23,8 @@ emojiChooser = "rofimoji --skin-tone light -a copy"; yad = "${pkgs.yad}/bin/yad"; notify = "${pkgs.libnotify}/bin/notify-send"; + pamixer = "${pkgs.pamixer}/bin/pamixer"; + xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight"; resetBspwm = pkgs.writeShellScript "resetBspwm" '' bspc wm -r systemctl --user restart polybar # Restart polybar @@ -30,6 +32,14 @@ moveAllNodesToPrimary = pkgs.writeShellScript "moveAllNodesToPrimary" '' comm -23 <(bspc query -N | sort) <(bspc query -m primary -N | sort) | while read n; do bspc node $n -m primary; done ''; + notifyVolume = pkgs.writeShellScript "notifyVolume" '' + volume=`${pamixer} --get-volume` + ${notify} -r 1 -h "int:value:$volume" "Volume $volume%" + ''; + notifyBrightness = pkgs.writeShellScript "notifyBrightness" '' + level=`printf "%.0f" $(${xbacklight} -get)` + ${notify} -r 2 -h "int:value:$level" "Luminosità $level" + ''; in { enable = true; @@ -77,11 +87,9 @@ "super + {_,shift + } w" = "bspc node -{c,k}"; "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}"; # "super + y" = "bspc node newest.marked.local -n newest.!automatic.local"; - "{XF86AudioLowerVolume,XF86AudioMute,XF86AudioRaiseVolume}" = "pamixer {-d 2 -u,-t,-i 2 -u} && ${notify} -r 1 Volume `pamixer --get-volume-human`"; + "XF86Audio{LowerVolume,Mute,RaiseVolume}" = "${pamixer} {-d 2 -u,-t,-i 2 -u} && ${notifyVolume}"; "XF86Audio{Next,Play,Prev}" = "playerctl {next,play-pause,previous}"; - "XF86MonBrightness{Up,Down}" = '' - xbacklight -{inc,dec} 10 && ${notify} -r 2 Luminosità `printf "%.0f" $(xbacklight -get)` - ''; + "XF86MonBrightness{Up,Down}" = " ${xbacklight} -{inc,dec} 10 && ${notifyBrightness}"; }; }; }