Replace dunst with swaynotificationcenter, add bash-language-server

This commit is contained in:
Erwin Boskma 2022-04-11 09:57:19 +02:00
parent 6ab35dcdd2
commit 9286319589
Signed by: erwin
GPG key ID: 270B20D17394F7E5
6 changed files with 28 additions and 9 deletions

View file

@ -48,6 +48,7 @@ in {
inherit (texlive) scheme-small wrapfig ulem capt-of; inherit (texlive) scheme-small wrapfig ulem capt-of;
}) })
orgProtocolDesktop orgProtocolDesktop
nodePackages.bash-language-server
]; ];
}; };
} }

View file

@ -198,6 +198,8 @@ in {
"XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down"; "XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down";
"XF86AudioMute" = "exec ${pkgs.pamedia}/bin/pamedia mute"; "XF86AudioMute" = "exec ${pkgs.pamedia}/bin/pamedia mute";
"XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator"; "XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator";
"${mod}+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
}; };
# terminal = "${pkgs.alacritty}/bin/alacritty"; # terminal = "${pkgs.alacritty}/bin/alacritty";
@ -230,6 +232,8 @@ in {
exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
exec --no-startup-id ${pkgs.swaynotificationcenter}/bin/swaync
include /etc/sway/config.d/* include /etc/sway/config.d/*
''; '';
@ -264,7 +268,7 @@ in {
file.".wallpapers".source = ./wallpapers; file.".wallpapers".source = ./wallpapers;
packages = with pkgs; [ packages = with pkgs; [
dunst # dunst
# swayidle # swayidle
# swaylock-effects # swaylock-effects
]; ];

View file

@ -45,7 +45,7 @@ in {
"clock#date" "clock#date"
"clock#time" "clock#time"
"idle_inhibitor" "idle_inhibitor"
"custom/dunst" # "custom/dunst"
]; ];
modules = { modules = {
"clock#time" = { "clock#time" = {
@ -170,11 +170,11 @@ in {
deactivated = ""; deactivated = "";
}; };
}; };
"custom/dunst" = { # "custom/dunst" = {
exec = "${wb-dunst}/bin/wb-dunst"; # exec = "${wb-dunst}/bin/wb-dunst";
on-click = "${pkgs.dunst}/bin/dunstctl set-paused toggle"; # on-click = "${pkgs.dunst}/bin/dunstctl set-paused toggle";
restart-interval = 1; # restart-interval = 1;
}; # };
}; };
} }
]; ];

View file

@ -52,7 +52,7 @@ in {
alacritty.enable = true; alacritty.enable = true;
bat.enable = true; bat.enable = true;
dropbox.enable = true; dropbox.enable = true;
dunst.enable = true; dunst.enable = false;
emacs = { emacs = {
enable = true; enable = true;
daemon = true; daemon = true;
@ -233,6 +233,7 @@ in {
swaylock-effects swaylock-effects
# swaylock # swaylock
swayidle swayidle
swaynotificationcenter
]; ];
}; };
}; };

View file

@ -9,4 +9,16 @@ final: prev: rec {
}; };
onnx-runtime = prev.pkgs.callPackage ../pkgs/onnx-runtime {inherit (prev.pkgs) stdenv;}; onnx-runtime = prev.pkgs.callPackage ../pkgs/onnx-runtime {inherit (prev.pkgs) stdenv;};
obs-backgroundremoval = prev.pkgs.callPackage ../pkgs/obs-backgroundremoval {inherit (prev.pkgs) stdenv fetchFromGitHub cmake obs-studio opencv onnx-runtime;}; obs-backgroundremoval = prev.pkgs.callPackage ../pkgs/obs-backgroundremoval {inherit (prev.pkgs) stdenv fetchFromGitHub cmake obs-studio opencv onnx-runtime;};
swaynotificationcenter = prev.swaynotificationcenter.overrideAttrs (oldAttrs: rec {
version = "0.5";
src = prev.fetchFromGitHub {
owner = "ErikReider";
repo = "SwayNotificationCenter";
rev = "v${version}";
hash = "sha256-Jjbr6GJ0MHlO+T/simPNYQnB5b7Cr85j4GRjRGa5B6s=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.scdoc ];
});
} }

View file

@ -9,7 +9,8 @@ with pkgs;
repo = "rofi"; repo = "rofi";
rev = "${version}+wayland1"; rev = "${version}+wayland1";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1h6lh4lrkxzs6iy2rzn5g71dnz6qck4j8cxpgy1ja179vrnj1sf7"; # sha256 = "1h6lh4lrkxzs6iy2rzn5g71dnz6qck4j8cxpgy1ja179vrnj1sf7";
sha256 = "qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I=";
}; };
preConfigure = '' preConfigure = ''