Remove settings no longer necessary
Swaync is in stable, mumble 1.4 is in stable and has pulseaudio enabled by default, the tray target is defined in home-manager upstream and nix-direnv comes with flake support by default.
This commit is contained in:
parent
7361e03630
commit
37f0d3e1fc
|
@ -5,7 +5,7 @@ in
|
||||||
{
|
{
|
||||||
services.nitter = {
|
services.nitter = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.nitter;
|
#package = pkgs.unstable.nitter;
|
||||||
server = {
|
server = {
|
||||||
port = 8081;
|
port = 8081;
|
||||||
hostname = "nitter.sbruder.xyz";
|
hostname = "nitter.sbruder.xyz";
|
||||||
|
|
|
@ -145,15 +145,7 @@ in
|
||||||
# communication
|
# communication
|
||||||
claws-mail # email client that looks ugly but just works
|
claws-mail # email client that looks ugly but just works
|
||||||
firefox-esr # a bad browser
|
firefox-esr # a bad browser
|
||||||
((mumble.override { pulseSupport = true; }).overrideAttrs (o: o // {
|
mumble # VoIP group chat
|
||||||
patches = o.patches ++ [
|
|
||||||
# TODO: remove patch once stable release supports this
|
|
||||||
(pkgs.fetchpatch {
|
|
||||||
url = "https://github.com/mumble-voip/mumble/commit/03dbea56f650bba4f1aa0c54d02b6e8c3639d04f.patch";
|
|
||||||
sha256 = "1zmqb8gl2cp0mcw85x9wn5rjw2mih7d2x96jxxqabjcx1kvgyhh3";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
})) # VoIP group chat
|
|
||||||
|
|
||||||
# creative/design
|
# creative/design
|
||||||
openscad # parametric/procedural 3d modelling
|
openscad # parametric/procedural 3d modelling
|
||||||
|
|
|
@ -170,7 +170,7 @@ in
|
||||||
"--no-repeat --locked ${cfg.modifier}+q" = ''exec 'test $(swaymsg -t get_outputs | ${pkgs.jq}/bin/jq "[.[].dpms] | any") = "true" && swaymsg "output * dpms off" || swaymsg "output * dpms on"'';
|
"--no-repeat --locked ${cfg.modifier}+q" = ''exec 'test $(swaymsg -t get_outputs | ${pkgs.jq}/bin/jq "[.[].dpms] | any") = "true" && swaymsg "output * dpms off" || swaymsg "output * dpms on"'';
|
||||||
|
|
||||||
# Notifications
|
# Notifications
|
||||||
"${cfg.modifier}+n" = "exec ${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -t";
|
"${cfg.modifier}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
|
||||||
};
|
};
|
||||||
|
|
||||||
bars = [ ]; # managed as systemd user unit
|
bars = [ ]; # managed as systemd user unit
|
||||||
|
|
|
@ -8,7 +8,7 @@ in
|
||||||
Install.WantedBy = [ "sway-session.target" ];
|
Install.WantedBy = [ "sway-session.target" ];
|
||||||
|
|
||||||
Service = {
|
Service = {
|
||||||
ExecStart = "${pkgs.unstable.swaynotificationcenter}/bin/swaync";
|
ExecStart = "${pkgs.swaynotificationcenter}/bin/swaync";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -285,9 +285,9 @@ in
|
||||||
dnd-none = "${thinsp}";
|
dnd-none = "${thinsp}";
|
||||||
};
|
};
|
||||||
return-type = "json";
|
return-type = "json";
|
||||||
exec = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -swb";
|
exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";
|
||||||
on-click = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -t -sw";
|
on-click = "${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
|
||||||
on-click-right = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -d -sw";
|
on-click-right = "${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
|
||||||
escape = true;
|
escape = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -314,14 +314,5 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: remove when https://github.com/nix-community/home-manager/issues/2064
|
|
||||||
# is resolved
|
|
||||||
systemd.user.targets.tray = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Home Manager System Tray";
|
|
||||||
Requires = [ "graphical-session-pre.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.blueman-applet.enable = lib.mkIf nixosConfig.sbruder.full true;
|
services.blueman-applet.enable = lib.mkIf nixosConfig.sbruder.full true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv = {
|
nix-direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFlakes = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nix-index.enable = true;
|
nix-index.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue