diff --git a/common/fragments/graphical/bspwm.nix b/common/fragments/graphical/bspwm.nix index 7a618e5..21a931b 100644 --- a/common/fragments/graphical/bspwm.nix +++ b/common/fragments/graphical/bspwm.nix @@ -63,7 +63,8 @@ in { ''; # Calculator "super + shift + c" = '' - rofi -show calc -modi calc -calc-command 'xdotool type --clearmodifiers "\{result\}"''; + ROFI_PLUGIN_PATH=${pkgs.rofi-calc}/lib/rofi rofi -show calc -modi calc -calc-command '${pkgs.xdotool}/bin/xdotool type --clearmodifiers "\{result\}' + ''; # Media keys "XF86Audio{Raise,Lower}Volume" = "pamixer {-i,-d} 5"; "XF86AudioMute" = "pamixer -t"; diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index ec6656d..39125ca 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -3,6 +3,7 @@ ./bspwm.nix ./picom.nix ./polybar.nix + ./dunst.nix ./iosevka.nix ./kitty.nix ./element.nix @@ -16,6 +17,7 @@ element-desktop firefox flameshot + glib gnome.eog gnome.file-roller gnome.geary @@ -42,6 +44,8 @@ wireguard-tools xdg-utils yubioath-desktop + clipmenu + xdotool ]; # Brightness/volume keys @@ -125,6 +129,7 @@ }; }; + services.gvfs.enable = true; security.polkit.enable = true; # Screenshare on wlroots @@ -164,4 +169,6 @@ alsa.support32Bit = true; pulse.enable = true; }; + + programs.noisetorch.enable = true; } diff --git a/common/fragments/graphical/dunst.nix b/common/fragments/graphical/dunst.nix new file mode 100644 index 0000000..158f9a3 --- /dev/null +++ b/common/fragments/graphical/dunst.nix @@ -0,0 +1,8 @@ +{ config, pkgs, lib, ... }: { + home-manager.users.agatha = { + services.dunst = { + enable = true; + + }; + }; +} diff --git a/common/fragments/graphical/polybar.nix b/common/fragments/graphical/polybar.nix index caa99d6..af03e4b 100644 --- a/common/fragments/graphical/polybar.nix +++ b/common/fragments/graphical/polybar.nix @@ -4,6 +4,15 @@ let colorscheme = utils.colorscheme "purple" ../../../external/6.png; in { home-manager.users.agatha = { + + systemd.user.services.polybar = { + Service = { + Environment = lib.mkForce + "PATH=${config.home-manager.users.agatha.services.polybar.package}/bin:/run/wrappers/bin:${pkgs.dbus}/bin:${pkgs.dunst}/bin"; + }; + Install = { WantedBy = [ "graphical-session.target" ]; }; + }; + services.polybar = { enable = true; package = pkgs.polybarFull; @@ -63,7 +72,7 @@ in { left = "bspwm"; center = "date"; right = - "filesystem battery pulseaudio xkeyboard memory cpu notication-status powermenu"; + "filesystem battery pulseaudio xkeyboard memory cpu notification-status powermenu"; }; wm-restack = "bspwm"; @@ -125,7 +134,7 @@ in { format-prefix-foreground = "\${colors.foreground-alt}"; label = '' - %{A3:dunstify ' Calendar' "$(cal --color=always | sed "s#\\x1b\\[7m##;s#\\x1b\\[27m##g")​":}%date%%{A} %time%''; + %{A3:${pkgs.dunst}/bin/dunstify ' Calendar' "$(cal --color=always | sed "s#\\x1b\\[7m##;s#\\x1b\\[27m##g")​":}%date%%{A} %time%''; }; "module/filesystem" = { @@ -248,7 +257,7 @@ in { "module/notification-status" = { type = "custom/script"; exec = '' - if $(dunstctl is-paused); then; echo "Notifications paused"; else; echo ""; fi;''; + if $(dunstctl is-paused); then echo "Notifications paused"; else echo ""; fi''; interval = 2; format-prefix = " "; }; diff --git a/hosts/ritual/configuration.nix b/hosts/ritual/configuration.nix index 0c7026d..6d0d46d 100644 --- a/hosts/ritual/configuration.nix +++ b/hosts/ritual/configuration.nix @@ -39,6 +39,9 @@ oci-containers = { backend = "podman"; }; }; + hardware.bluetooth.enable = true; + services.blueman.enable = true; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave