Switch to using SDDM instead of greetd

Switch back to one-light for everything

Only install teams-for-linux on work machines
This commit is contained in:
Evie Litherland-Smith 2025-01-31 08:40:26 +00:00
parent 64904a62f1
commit 06c425341e
3 changed files with 31 additions and 35 deletions

View file

@ -198,7 +198,7 @@
stylix = { stylix = {
enable = true; enable = true;
image = ./wallpapers/default.png; image = ./wallpapers/default.png;
base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/onedark.yaml"; base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/one-light.yaml";
polarity = config.lib.stylix.scheme.variant; polarity = config.lib.stylix.scheme.variant;
opacity = { opacity = {
applications = 1.0; applications = 1.0;

View file

@ -44,7 +44,6 @@
libreoffice libreoffice
webcord webcord
signal-desktop signal-desktop
teams-for-linux
nomachine-client nomachine-client
]; ];
}; };
@ -65,8 +64,6 @@
noisetorch.enable = true; noisetorch.enable = true;
seahorse.enable = true; seahorse.enable = true;
file-roller.enable = true; file-roller.enable = true;
hyprland.enable = true;
xwayland.enable = true;
thunar = { thunar = {
enable = true; enable = true;
plugins = with pkgs.xfce; [ plugins = with pkgs.xfce; [
@ -74,6 +71,10 @@
thunar-volman thunar-volman
]; ];
}; };
hyprland = {
enable = true;
xwayland.enable = true;
};
}; };
gtk.iconCache.enable = true; gtk.iconCache.enable = true;
qt = { qt = {
@ -82,6 +83,7 @@
style = if config.lib.stylix.scheme.variant == "light" then "adwaita" else "adwaita-dark"; style = if config.lib.stylix.scheme.variant == "light" then "adwaita" else "adwaita-dark";
}; };
services = { services = {
xserver.xkb.layout = "gb";
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
flatpak.enable = true; flatpak.enable = true;
printing.enable = true; printing.enable = true;
@ -107,23 +109,16 @@
support32Bit = true; support32Bit = true;
}; };
}; };
greetd = { displayManager = {
enable = true; defaultSession = "hyprland";
settings = autoLogin = {
let enable = false;
default_session.command = "Hyprland"; user = username;
in };
{ sddm = {
inherit default_session; enable = true;
initial_session = { wayland.enable = true;
inherit (default_session) command; };
user = username;
};
};
};
xserver = {
enable = true;
xkb.layout = "gb";
}; };
}; };
xdg.portal = { xdg.portal = {
@ -224,18 +219,6 @@
figure.autolayout: True figure.autolayout: True
savefig.dpi: 300 savefig.dpi: 300
''; '';
# Teams config
"teams-for-linux/config.json" = {
force = true;
text = builtins.toJSON {
awayOnSystemIdle = true;
closeAppOnCross = false;
followSystemTheme = true;
notificationMethod = "electron";
optInTeamsV2 = true;
spellCheckerLanguages = [ "en_GB" ];
};
};
# Autostart some programs # Autostart some programs
"autostart/signal-desktop.desktop".source = "autostart/signal-desktop.desktop".source =
"${pkgs.signal-desktop}/share/applications/signal-desktop.desktop"; "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";

View file

@ -5,9 +5,11 @@
... ...
}: }:
{ {
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
services.samba.enable = true; services.samba.enable = true;
environment.systemPackages = with pkgs; [ twinkle ]; environment.systemPackages = with pkgs; [
teams-for-linux
twinkle
];
home-manager.users.${username} = home-manager.users.${username} =
{ config, ... }: { config, ... }:
{ {
@ -20,5 +22,16 @@
proton.primary = lib.mkForce false; proton.primary = lib.mkForce false;
outlook.primary = lib.mkForce true; outlook.primary = lib.mkForce true;
}; };
xdg.configFile."teams-for-linux/config.json" = {
force = true;
text = builtins.toJSON {
awayOnSystemIdle = true;
closeAppOnCross = false;
followSystemTheme = true;
notificationMethod = "electron";
optInTeamsV2 = true;
spellCheckerLanguages = [ "en_GB" ];
};
};
}; };
} }