Merge branch 'master' into devenv

1 files changed, 14 insertions, 10 deletions

diff --git a/modules/home-manager/personal/environment.nix b/modules/home-manager/personal/environment.nix
index c97faff..867757e 100644
--- a/modules/home-manager/personal/environment.nix
+++ b/modules/home-manager/personal/environment.nix
@@ -1,11 +1,14 @@
-{ config, lib, pkgs, ... }:
-
 {
-  home.packages = with pkgs; [ coreutils moreutils ];
+  config,
+  lib,
+  pkgs,
+  ...
+} @ inputs: {
+  home.packages = with pkgs; [coreutils moreutils];
   personal.home.wallpaper =
-    lib.mkDefault pkgs.personal.static.wallpapers.nga-1973-68-1;
+    lib.mkDefault (inputs.osConfig.stylix.image or (pkgs.personal.static.wallpapers.nga-1973-68-1.override {gravity = "north";}));
 
-  programs.bash = { enable = lib.mkDefault true; };
+  programs.bash = {enable = lib.mkDefault true;};
 
   home = {
     shellAliases = {
@@ -14,15 +17,16 @@
       ssh = "TERM=xterm-256color ssh";
       edit = "$EDITOR";
     };
-    sessionVariables = { CDPATH = "~"; };
+    sessionVariables = {CDPATH = "~";};
   };
 
   services.gpg-agent = {
     enableBashIntegration = lib.mkDefault config.programs.bash.enable;
-    pinentryFlavor = lib.mkDefault (if config.personal.gui.enable then
-      "qt"
-    else
-      "tty");
+    pinentryFlavor = lib.mkDefault (
+      if config.personal.gui.enable
+      then "qt"
+      else "tty"
+    );
     grabKeyboardAndMouse =
       lib.mkDefault false; # insecure, but necessary with keepass auto-type
   };