From 29c872f5e3c2a72a6e7823eb70e7a68a1cf2aaff Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 4 Sep 2023 08:53:41 +0100 Subject: [PATCH] Rename display.conf to extra.conf Auto start teams on Ronin --- home/accounts/default.nix | 2 +- home/hyprland/config.nix | 2 +- home/hyprland/default.nix | 3 ++- hosts/Ronin/home.nix | 5 ++++- hosts/Vanguard/home.nix | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/home/accounts/default.nix b/home/accounts/default.nix index 845b5c30..8d817844 100644 --- a/home/accounts/default.nix +++ b/home/accounts/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, hostName, ... }: +{ pkgs, hostName, ... }: { # accounts.emails.accounts = {}; # TODO diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 186a62c0..37beddbb 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -7,7 +7,7 @@ let swaylockPackage = pkgs.swaylock-effects; in '' source = ./macchiato.conf - source = ./display.conf + source = ./extra.conf monitor=,preferred,auto,auto env = XDG_CURRENT_DESKTOP=Hyprland diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index ce164e45..c9f351c7 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, hyprland, anyrun, wallpapers, ... }: +{ config, lib, pkgs, hyprland, anyrun, wallpapers, ... }: let configure-gtk = pkgs.writeTextFile { name = "configure-gtk"; @@ -60,5 +60,6 @@ in { wallpaper = ,${wallpapers.outputs.default} ''; "hypr/macchiato.conf".source = ./macchiato.conf; + "hypr/extra.conf".source = lib.mkDefault ""; }; } diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index 29fc58df..9a103fd4 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -202,14 +202,17 @@ in { ]; }; }; - xdg.configFile."hypr/display.conf".text = '' + xdg.configFile."hypr/extra.conf".text = '' misc { disable_hyprland_logo = true disable_splash_rendering = true } + monitor=eDP-1,preferred,auto,1 monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1 monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1 monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1 + + exec-once=${pkgs.teams-for-linux}/bin/teams-for-linux ''; } diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix index 0b01a225..e0793686 100644 --- a/hosts/Vanguard/home.nix +++ b/hosts/Vanguard/home.nix @@ -8,7 +8,7 @@ in { stateVersion = "22.11"; }; programs.home-manager.enable = true; - xdg.configFile."hypr/display.conf".text = '' + xdg.configFile."hypr/extra.conf".text = '' misc { vrr = 2 }