alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 02:13:55 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into add-river

Browse source
This commit is contained in:
Aly Raffauf 2024-09-15 10:56:16 -04:00 committed by GitHub
parent 9f268f008b 1a173bb10d
commit 9e301d9513
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeManagerModules/desktop/hyprland/default.nix
View file

@ -10,7 +10,11 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
settings = import ./settings.nix {inherit config lib pkgs;}; settings = import ./settings.nix {inherit config lib pkgs;};
systemd.enable = true;
systemd = {
enable = true;
variables = ["PATH"];
};
extraConfig = let extraConfig = let
moveMonitorBinds = moveMonitorBinds =

2
homeManagerModules/desktop/sway/settings.nix
View file

@ -23,6 +23,8 @@ in {
"systemctl --user stop sway-session.target" "systemctl --user stop sway-session.target"
"systemctl --user start sway-session.target" "systemctl --user start sway-session.target"
]; ];
variables = ["PATH"];
}; };
config = { config = {

53
homeManagerModules/services/waybar/default.nix
View file

@ -7,6 +7,26 @@
cfg = config.ar.home; cfg = config.ar.home;
in { in {
config = lib.mkIf cfg.services.waybar.enable { config = lib.mkIf cfg.services.waybar.enable {
home.packages =
(with pkgs; [
blueberry
bluez
coreutils
getopt
gnugrep
libnotify
mako
networkmanager
networkmanager_dmenu
nwg-drawer
pavucontrol
procps
rofi-power-menu
systemd
])
++ lib.optional (cfg.desktop.hyprland.enable) config.wayland.windowManager.hyprland.package
++ lib.optional (cfg.desktop.sway.enable) config.wayland.windowManager.sway.package;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -331,38 +351,7 @@ in {
systemd.user.services.waybar = { systemd.user.services.waybar = {
Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target" ++ lib.optional (cfg.desktop.river.enable) "river-session.target"); Install.WantedBy = lib.mkForce (lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target" ++ lib.optional (cfg.desktop.river.enable) "river-session.target");
Service.Restart = lib.mkForce "no";
Service = {
Environment = lib.mkForce [
"PATH=${
lib.makeBinPath ([
config.programs.rofi.package
config.wayland.windowManager.hyprland.package
config.wayland.windowManager.sway.package
config.wayland.windowManager.river.package
]
++ (with pkgs; [
blueberry
bluez
coreutils
getopt
gnugrep
libnotify
mako
networkmanager
networkmanager_dmenu
nwg-drawer
pavucontrol
procps
rofi-power-menu
systemd
]))
}"
];
Restart = lib.mkForce "no";
};
Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target" ++ lib.optional (cfg.desktop.river.enable) "river-session.target"; Unit.BindsTo = lib.optional (cfg.desktop.hyprland.enable) "hyprland-session.target" ++ lib.optional (cfg.desktop.sway.enable) "sway-session.target" ++ lib.optional (cfg.desktop.river.enable) "river-session.target";
}; };