Re-enable hyprland alongside plasma

This commit is contained in:
Evie Litherland-Smith 2023-05-24 07:25:31 +01:00
parent 1c66bd9361
commit c1dfa4de99
2 changed files with 40 additions and 37 deletions

View file

@ -6,6 +6,7 @@
./hardware/bluetooth.nix
./locales/en_GB.nix
./desktop/plasma.nix
./desktop/hyprland.nix
./desktop/steam.nix
./syncthing/Vanguard.nix
./server/sshd.nix

View file

@ -8,44 +8,46 @@
nomachine-client
];
# xdg.configFile."hypr/hyprpaper.conf".source = ../desktop/config/hypr/hyprpaper-Vanguard.conf;
# wayland.windowManager.hyprland.extraConfig = ''
# source=./common.conf
xdg.configFile."hypr/hyprpaper.conf".source = ../desktop/config/hypr/hyprpaper-Vanguard.conf;
wayland.windowManager.hyprland.extraConfig = ''
source=./common.conf
# misc {
# vrr = 2
# }
# monitor=DP-1,highrr,auto,1
# monitor=HDMI-A-1,highres,auto,2
# exec-once = hyprpaper
# exec-once = waybar
# '';
# programs.waybar = {
# style = ''
# @import 'common.css';
# '';
# settings = {
# main = {
# "include" = [
# "~/.config/waybar/modules.json"
# "~/.config/waybar/layout.json"
# ];
# "modules-left" = [ "custom/launcher" "cpu" "memory" "temperature" ];
# "modules-center" = [ "wlr/workspaces" ];
# "modules-right" = [
# "pulseaudio"
# "bluetooth"
# "network"
# "backlight"
# "battery"
# "battery#bat2"
# "clock"
# "tray"
# "custom/power"
# ];
# };
# };
# };
misc {
vrr = 2
}
monitor=DP-1,highrr,auto,1
monitor=HDMI-A-1,highres,auto,2
monitor=HDMI-A-2,highrr,auto,1
monitor=,auto,auto,1
exec-once = hyprpaper
exec-once = waybar
'';
programs.waybar = {
style = ''
@import 'common.css';
'';
settings = {
main = {
"include" = [
"~/.config/waybar/modules.json"
"~/.config/waybar/layout.json"
];
"modules-left" = ["custom/launcher" "cpu" "memory" "temperature"];
"modules-center" = ["wlr/workspaces"];
"modules-right" = [
"pulseaudio"
"bluetooth"
"network"
"backlight"
"battery"
"battery#bat2"
"clock"
"tray"
"custom/power"
];
};
};
};
}