From 077b3c93370e0d215bb6d3bc4176ea509da8f5f1 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 17 May 2022 22:58:41 -0400
Subject: [PATCH] add wallpaper to lightdm

---
 modules/graphical/xorg.nix     | 1 +
 modules/shell/fish/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/graphical/xorg.nix b/modules/graphical/xorg.nix
index 9ad9040..cf3c070 100644
--- a/modules/graphical/xorg.nix
+++ b/modules/graphical/xorg.nix
@@ -22,6 +22,7 @@ in {
       displayManager = {
         lightdm = {
           enable = config.services.xserver.enable;
+          background = config.gui.wallpaper;
 
           # Make the login screen dark
           greeters.gtk.theme = gtkTheme;
diff --git a/modules/shell/fish/default.nix b/modules/shell/fish/default.nix
index 843cd36..a3a0da0 100644
--- a/modules/shell/fish/default.nix
+++ b/modules/shell/fish/default.nix
@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
+  programs.fish.enable = true; # Needed for LightDM to remember username
 
   home-manager.users.${config.user} = {
 
@@ -38,7 +39,7 @@
           description = "Tidy up JSON using jq";
           body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
         };
-        ls = { body = "${pkgs.exa}/bin/pkgs $argv"; };
+        ls = { body = "${pkgs.exa}/bin/exa $argv"; };
         note = {
           description = "Edit or create a note";
           argumentNames = "filename";