From 3c186055a524c0bb6fcd4ed208773f7a5653a0a5 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 11 Apr 2024 05:34:49 -0400 Subject: [PATCH] chore: Improve formatting --- modules/desktop.nix | 34 +++++++++++++++++----------------- packages/aleo-fonts.nix | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/desktop.nix b/modules/desktop.nix index 4ff0fbd0..ecead7cd 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -86,6 +86,23 @@ in pulse.enable = true; }; + greetd = mkIf (!container) { + enable = true; + restart = false; + + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --time-format '%F %R'"; + user = "greeter"; + }; + + initial_session = { + command = "${pkgs.hyprland}/bin/Hyprland"; + user = username; + }; + }; + }; + tumbler.enable = true; gvfs.enable = true; gnome.gnome-keyring.enable = true; @@ -122,23 +139,6 @@ in }) ]; - services.greetd = mkIf (!container) { - enable = true; - restart = false; - - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --time-format '%F %R'"; - user = "greeter"; - }; - - initial_session = { - command = "${pkgs.hyprland}/bin/Hyprland"; - user = username; - }; - }; - }; - fonts = { enableDefaultPackages = false; diff --git a/packages/aleo-fonts.nix b/packages/aleo-fonts.nix index 2aecf8a6..8d1048af 100644 --- a/packages/aleo-fonts.nix +++ b/packages/aleo-fonts.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-HSxP5/sLHQTujBVt1u93625EXEc42lxpt8W1//6ngWM="; }; - installPhase = '' + installPhase = /* bash */ '' runHook preInstall install -Dm644 fonts/variable/*.ttf -t $out/share/fonts/truetype/AleoFonts