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 ./hardware/bluetooth.nix
./locales/en_GB.nix ./locales/en_GB.nix
./desktop/plasma.nix ./desktop/plasma.nix
./desktop/hyprland.nix
./desktop/steam.nix ./desktop/steam.nix
./syncthing/Vanguard.nix ./syncthing/Vanguard.nix
./server/sshd.nix ./server/sshd.nix

View file

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