colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sway: replace gnome-control-center with wdisplays

Browse Source 
mostly this is driven to reduce my desktop's dependencies (particularly
on webkitgtk), but it also looks a little nicer than gnome's displays
panel.
This commit is contained in:
Colin 2023-06-29 10:56:56 +00:00
parent 4c5333c9ed
commit fa5d4c467c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/modules/gui/phosh.nix
View File

@ -43,7 +43,7 @@ in
}) })
phosh-mobile-settings phosh-mobile-settings
"plasma5Packages.konsole" "plasma5Packages.konsole"
# "gnome.gnome-bluetooth" "gnome.gnome-bluetooth"
"gnome.gnome-terminal" "gnome.gnome-terminal"
; ;
}; };

18
hosts/modules/gui/sway/default.nix
View File

@ -66,16 +66,17 @@ in
"mako" # notification daemon "mako" # notification daemon
# # "pavucontrol" # # "pavucontrol"
# "gnome.gnome-bluetooth" # XXX(2023/05/14): broken # "gnome.gnome-bluetooth" # XXX(2023/05/14): broken
"gnome.gnome-control-center" # "gnome.gnome-control-center" # XXX(2023/06/28): depends on webkitgtk4_1
"sway-contrib.grimshot" "sway-contrib.grimshot"
"wdisplays" # like xrandr
]; ];
}; };
} }
{ {
sane.programs = { sane.programs = {
inherit (pkgs // { inherit (pkgs // {
"gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth; # "gnome.gnome-bluetooth" = pkgs.gnome.gnome-bluetooth;
"gnome.gnome-control-center" = pkgs.gnome.gnome-control-center; # "gnome.gnome-control-center" = pkgs.gnome.gnome-control-center;
"sway-contrib.grimshot" = pkgs.sway-contrib.grimshot; "sway-contrib.grimshot" = pkgs.sway-contrib.grimshot;
}) })
swaylock swaylock
@ -83,9 +84,10 @@ in
wl-clipboard wl-clipboard
blueberry blueberry
mako mako
"gnome.gnome-bluetooth" # "gnome.gnome-bluetooth"
"gnome.gnome-control-center" # "gnome.gnome-control-center"
"sway-contrib.grimshot" "sway-contrib.grimshot"
wdisplays
; ;
}; };
} }
@ -126,13 +128,13 @@ in
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
# gsd provides Rfkill, which is required for the bluetooth pane in gnome-control-center to work # gsd provides Rfkill, which is required for the bluetooth pane in gnome-control-center to work
services.gnome.gnome-settings-daemon.enable = true; # services.gnome.gnome-settings-daemon.enable = true;
# start the components of gsd we need at login # start the components of gsd we need at login
systemd.user.targets."org.gnome.SettingsDaemon.Rfkill".wantedBy = [ "graphical-session.target" ]; # systemd.user.targets."org.gnome.SettingsDaemon.Rfkill".wantedBy = [ "graphical-session.target" ];
# go ahead and `systemctl --user cat gnome-session-initialized.target`. i dare you. # go ahead and `systemctl --user cat gnome-session-initialized.target`. i dare you.
# the only way i can figure out how to get Rfkill to actually load is to just disable all the shit it depends on. # the only way i can figure out how to get Rfkill to actually load is to just disable all the shit it depends on.
# it doesn't actually seem to need ANY of them in the first place T_T # it doesn't actually seem to need ANY of them in the first place T_T
systemd.user.targets."gnome-session-initialized".enable = false; # systemd.user.targets."gnome-session-initialized".enable = false;
# bluez can't connect to audio devices unless pipewire is running. # bluez can't connect to audio devices unless pipewire is running.
# a system service can't depend on a user service, so just launch it at graphical-session # a system service can't depend on a user service, so just launch it at graphical-session
systemd.user.services."pipewire".wantedBy = [ "graphical-session.target" ]; systemd.user.services."pipewire".wantedBy = [ "graphical-session.target" ];