Remove hyprland extra.conf

Move extra settings into home-manager hyprland settings expression
This commit is contained in:
Evie Litherland-Smith 2024-01-27 06:27:31 +00:00
parent d53d3f4dbb
commit eb5082442c
5 changed files with 30 additions and 53 deletions

View file

@ -4,7 +4,6 @@ let
cursorName = config.gtk.cursorTheme.name;
cursorSize = toString config.gtk.cursorTheme.size;
in ''
source = ./extra.conf
monitor=,preferred,auto,auto
env = XDG_CURRENT_DESKTOP=Hyprland

View file

@ -1,7 +1,7 @@
{ ... }: {
xdg.configFile."hypr/extra.conf".text = ''
monitor=eDP-1,preferred,0x0,1.25
monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,-192x-1080,1.00
monitor=desc:Ancor Communications Inc VS278 FALMQS032358,preferred,auto,1.00
'';
wayland.windowManager.hyprland.settings.monitor = [
"monitor=eDP-1,preferred,0x0,1.00"
"monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,-192x-1080,1.00"
"monitor=desc:Ancor Communications Inc VS278 FALMQS032358,preferred,auto,1.00"
];
}

View file

@ -1,26 +1,16 @@
{ lib, ... }: {
{ ... }: {
programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
accounts = {
email.accounts = {
accounts.email.accounts = {
proton.primary = false;
outlook.primary = true;
};
calendar.accounts = {
nextcloud.vdirsyncer.enable = false; # TEMP until fixed
nextcloud.primary = false;
outlook.primary = true;
wayland.windowManager.hyprland.settings = {
misc.force_default_wallpaper = 0;
monitor = [
"monitor=eDP-1,1920x1080,1152x1080,1.00"
"monitor=desc:Dell Inc. DELL P3223QE CCG8YN3,highres,auto,1.5"
"monitor=desc:Dell Inc. DELL U2422H 1KSPF83,preferred,0x0,1.0"
"monitor=desc:Dell Inc. DELL U2422H H9SPF83,preferred,1920x0,1.0"
];
};
};
services.syncthing.enable = lib.mkForce false;
xdg.configFile."hypr/extra.conf".text = ''
misc {
force_default_wallpaper = 0
}
monitor=eDP-1,1920x1080,1152x1080,1.25
monitor=desc:Dell Inc. DELL P3223QE CCG8YN3,highres,auto,1.5
monitor=desc:Dell Inc. DELL U2422H 1KSPF83,preferred,0x0,1.0
monitor=desc:Dell Inc. DELL U2422H H9SPF83,preferred,1920x0,1.0
'';
}

View file

@ -1,23 +1,11 @@
{ lib, ... }: {
{ ... }: {
programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
accounts = {
email.accounts = {
accounts.email.accounts = {
proton.primary = false;
outlook.primary = true;
};
calendar.accounts = {
nextcloud.vdirsyncer.enable = false; # TEMP until fixed
nextcloud.primary = false;
outlook.primary = true;
wayland.windowManager.hyprland.settings = {
misc.force_default_wallpaper = 0;
monitor = [ "monitor=desc:Dell Inc. DELL P3223QE CCG8YN3,highres,0x0,1.5" ];
};
};
services.syncthing.enable = lib.mkForce false;
xdg.configFile."hypr/extra.conf".text = ''
misc {
force_default_wallpaper = 0
}
monitor=desc:Dell Inc. DELL P3223QE CCG8YN3,highres,0x0,1.5
'';
}

View file

@ -1,6 +1,6 @@
{ ... }: {
xdg.configFile."hypr/extra.conf".text = ''
monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1.00,vrr,2
monitor=desc:Ancor Communications Inc VS278 FALMQS032358,preferred,-1920x325,1.00,vrr,0
'';
wayland.windowManager.hyprland.settings.monitor = [
"monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1.00,vrr,2"
"monitor=desc:Ancor Communications Inc VS278 FALMQS032358,preferred,-1920x325,1.00,vrr,0"
];
}