From 9499aa240e5ad0d040e52bd9732619350fc0b950 Mon Sep 17 00:00:00 2001
From: aristote <quentin.aristote@irif.fr>
Date: Mon, 18 Dec 2023 16:16:28 +0100
Subject: nixos & home: use commmon wallpaper by default

---
 modules/home-manager/personal/environment.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'modules/home-manager/personal/environment.nix')

diff --git a/modules/home-manager/personal/environment.nix b/modules/home-manager/personal/environment.nix
index c97faff..3c674de 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);
 
-  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
   };
-- 
cgit v1.2.3


From 29f64105bca9f528d2b9812cb7d490a27c6a2633 Mon Sep 17 00:00:00 2001
From: aristote <quentin.aristote@irif.fr>
Date: Mon, 18 Dec 2023 17:04:26 +0100
Subject: pkgs: wallpapers: change options

---
 modules/home-manager/personal/environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/home-manager/personal/environment.nix')

diff --git a/modules/home-manager/personal/environment.nix b/modules/home-manager/personal/environment.nix
index 3c674de..867757e 100644
--- a/modules/home-manager/personal/environment.nix
+++ b/modules/home-manager/personal/environment.nix
@@ -6,7 +6,7 @@
 } @ inputs: {
   home.packages = with pkgs; [coreutils moreutils];
   personal.home.wallpaper =
-    lib.mkDefault (inputs.osConfig.stylix.image or 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;};
 
-- 
cgit v1.2.3