From 776c8063f38c9634c7a59fec91f1b2546a383be3 Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Wed, 29 May 2024 15:38:50 -0500 Subject: [PATCH] Make the switch to tuigreet and fix fonts --- hosts/familypc/config.nix | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/hosts/familypc/config.nix b/hosts/familypc/config.nix index c87d9f7..56a7048 100644 --- a/hosts/familypc/config.nix +++ b/hosts/familypc/config.nix @@ -155,12 +155,7 @@ mutableUsers = true; }; - environment.systemPackages = - let - sugar = pkgs.callPackage ../../pkgs/sddm-sugar-dark.nix { }; - tokyo-night = pkgs.libsForQt5.callPackage ../../pkgs/sddm-tokyo-night.nix { }; - in - with pkgs; + environment.systemPackages = with pkgs; [ vim wget @@ -221,17 +216,16 @@ protonup-qt spotify neovide - sugar.sddm-sugar-dark # Name: sugar-dark - tokyo-night # Name: tokyo-night-sddm - pkgs.libsForQt5.qt5.qtgraphicaleffects + greetd.tuigreet ]; fonts = { packages = with pkgs; [ - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + (nerdfonts.override { fonts = [ "JetBrainsMono" "CaskaydiaMono" ]; }) + noto-fonts-emoji + noto-fonts-cjk font-awesome symbola - noto-fonts-color-emoji material-icons ]; }; @@ -260,10 +254,10 @@ services = { xserver = { enable = false; - }; - xkb = { - layout = "us"; - variant = ""; + xkb = { + layout = "us"; + variant = ""; + }; }; greetd = { enable = true; @@ -273,8 +267,8 @@ user = username; # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others). # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here. - command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd $HOME/.wayland-session"; # start wayland session with a TUI login manager + # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager }; }; };