merge

home/lilith/git.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.git = {
     enable = true;
     lfs.enable = true;
@@ -6,7 +7,7 @@
     userEmail = "liv@benstem.de";
     difftastic.enable = true;
     signing = {
-      key = "3586D8D6689B9C9ECD598C588712A0F317C37175";
+      key = "B96CE30E7F0B4319DE0025B4272C807BD91F8446";
       signByDefault = true;
     };
     extraConfig = {
@@ -27,6 +28,8 @@
         pruneTags = true;
         all = true;
       };
+
+      init.defaultBranch = "main";
     };
   };
 }

home/lilith/hyprland/default.nix

@@ -70,6 +70,8 @@
         allow_tearing = false;
       };
 
+      ecosystem.no_update_news = true;
+
       decoration = {
         rounding = 10;
 

home/lilith/packages.nix

@@ -5,6 +5,8 @@
     gnumake
     git
 
+    libsecret
+
     pulsemixer
     pavucontrol
     playerctl

home/lilith/sops.nix

@@ -1,9 +1,11 @@
-{ ... }: {
+{ ... }:
+{
   # imports = [
   #   sops-nix.homeManagerModules.default
   # ];
-  
+
   sops = {
-    age.keyFile = /persist/data/home/lilith/.config/sops/age/keys.txt;
+    age.keyFile = "/persist/data/home/lilith/.config/sops/age/keys.txt";
+    defaultSopsFile = ../../secrets/default.yaml;
   };
 }

home/lilith/thunderbird.nix

@@ -1,11 +1,28 @@
-{...}:{
-  programs.thunderbird = {  
+{
+  flake-private,
+  config,
+  sops,
+  ...
+}:
+{
+  programs.thunderbird = {
     enable = true;
     settings = {
-      
+
     };
     profiles."lilith" = {
       isDefault = true;
     };
   };
+
+  sops.secrets = {
+    "email/personal/password" = { };
+    "email/uni/password" = { };
+    "email/work/password" = { };
+    "email/fau/password" = { };
+  };
+
+  # As this contains personal information, this part of the config has been
+  # put in a separate, private repository. Do _not_ use this for actual secrets!
+  accounts.email.accounts = flake-private.home.accounts.email.accounts { inherit config; };
 }