Replace homeage with sops-nix

configuration.nix

@@ -245,18 +245,19 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs.flake = flake;
+    extraSpecialArgs = { inherit flake inputs; };
 
     users.pim.imports = [
       ./home.nix
-      inputs.homeage.homeManagerModules.homeage
     ];
   };
 
   sops = {
     age.keyFile = "/home/pim/.config/sops/age/keys.txt";
     defaultSopsFile = ./secrets/secrets.yaml;
-    secrets."wireguard/home/presharedKey" = { };
+    secrets = {
-    secrets."wireguard/home/privateKey" = { };
+      "wireguard/home/presharedKey" = { };
+      "wireguard/home/privateKey" = { };
+    };
   };
 }

flake.lock

@@ -335,26 +335,6 @@
         "type": "github"
       }
     },
-    "homeage": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1669234151,
-        "narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=",
-        "owner": "jordanisaacs",
-        "repo": "homeage",
-        "rev": "02bfe4ca06962d222e522fff0240c93946b20278",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jordanisaacs",
-        "repo": "homeage",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -544,7 +524,6 @@
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
-        "homeage": "homeage",
         "lanzaboote": "lanzaboote",
         "nixos-artwork": "nixos-artwork",
         "nixos-hardware": "nixos-hardware",

flake.nix

@@ -13,11 +13,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    homeage = {
-      url = "github:jordanisaacs/homeage";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";

home.nix

@@ -1,12 +1,12 @@
-{ pkgs, lib, config, flake, ... }: {
+{ pkgs, lib, config, flake, inputs, ... }: {
   imports = [
     ./modules/home-manager/neovim
     ./modules/home-manager/firefox
-    ./modules/home-manager/syncthing.nix
+    inputs.sops-nix.homeManagerModules.sops
-    ./modules/home-manager/keepassxc.nix
   ];
 
   xsession.enable = true;
+  services.syncthing.enable = true;
 
   xdg = {
     userDirs.enable = true;
@@ -101,6 +101,7 @@
       hexchat
       impression
       insomnia
+      keepassxc
       krita
       libreoffice
       logseq
@@ -263,16 +264,6 @@
     };
   };
 
-  homeage = {
-    identityPaths = [ "/home/pim/.ssh/age_ed25519" ];
-    installationType = "systemd";
-
-    file."sops-keys.txt" = {
-      source = "${flake}/secrets/sops-keys.txt.age";
-      symlinks = [ "${config.xdg.configHome}/sops/age/keys.txt" ];
-    };
-  };
-
   dconf.settings = with lib.hm.gvariant; {
     "org/gnome/desktop/sound".allow-volume-above-100-percent = true;
     "org/gnome/desktop/wm.preferences".num-workspaces = 4;
@@ -349,4 +340,15 @@
     "org/gnome/shell/extensions/space-iflow-randomwallpaper/sources/general/42".type = 4;
     "org/gnome/shell/extensions/space-iflow-randomwallpaper/sources/localFolder/42".folder = "${flake}/wallpapers";
   };
+
+  sops = {
+    age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt";
+    defaultSopsFile = ./secrets/pim.yaml;
+
+    secrets = {
+      "keepassxc".path = "${config.xdg.configHome}/keepassxc/keepassxc.ini";
+      "syncthing/key".path = "${config.xdg.configHome}/syncthing/key.pem";
+      "syncthing/cert".path = "${config.xdg.configHome}/syncthing/cert.pem";
+    };
+  };
 }

modules/home-manager/keepassxc.nix

@@ -1,10 +0,0 @@
-{ pkgs, config, flake, ... }: {
-  config = {
-    home.packages = [ pkgs.unstable.keepassxc ];
-
-    homeage.file."keepassxc.ini" = {
-      source = "${flake}/secrets/keepassxc.ini.age";
-      symlinks = [ "${config.xdg.configHome}/keepassxc/keepassxc.ini" ];
-    };
-  };
-}

modules/home-manager/syncthing.nix

@@ -1,15 +0,0 @@
-{ config, flake, ... }: {
-  config = {
-    services.syncthing.enable = true;
-
-    homeage.file."syncthing-key.pem" = {
-      source = "${flake}/secrets/syncthing-key.pem.age";
-      symlinks = [ "${config.xdg.configHome}/syncthing/key.pem" ];
-    };
-
-    homeage.file."syncthing-cert.pem" = {
-      source = "${flake}/secrets/syncthing-cert.pem.age";
-      symlinks = [ "${config.xdg.configHome}/syncthing/cert.pem" ];
-    };
-  };
-}

secrets/syncthing-key.pem.age

@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 LAPUww 0YS+10yTGhQwLKj5SZkyHLAOMHScnEXuW8H1LJSJJl8
-fYIEukt41D5s417B6EcCj5DP0JCcqDKIzdUqGeNLguQ
--> ssh-ed25519 vBZj5g ufNv/vQfhTj203S9NhLoTs3AK3v1MQC73oPLhj7TJQ8
-/ExO1bN02B6uJoWiVQDqRQ6yMd4o3qR3sUpN9OHEW50
--> 9f-grease p
-6eUQ4dl855OIlCfN61wQ/7n8
---- WTuEDM+CWDqaep0MlbCL1QXXzDumVR4WCXhyA3b7zm8
-Û,”ùQÎófç¥w—‹>Óœ×ÿ¿g7QÂå×Ú¤2*ð<>„ù0­.Ž3zy‹•DØ#ö1ö<31>4™¹ÀE$Nw7îqAÊp¹
&g;„®
-¢VÊ\oø_^èW¼<>-WÞ‚(k\¬ÝRµb£{h<*ìèÒçظ¤11gKÏâk<C3A2>U,Ñ$>­p®zoÑlÏ5\dSÌ4OOû\¯+yÿúà(–Ä×Çå+»ñëÿçbãj¼Eº)}ì$ÒŽ¬T?»
-ÿ%;Ž¿QFiçº4ŽJH®Ÿ­å<C2AD>™6‹AúSâÑÜЉãˆ<C3A3>k˜Z²?ܸ”MY26ËhÊ]e”µ(¤a¤&[‘ͳ°0‡juSóXKúNd>,Ûçv®ÔŠ¬
-ѳF¾/BnùšgæO©m}~¦‡z™‚i‰Üx£GàÈöb­

secrets/wg-quick-home-preshared-key.age

@@ -1,9 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 LAPUww Wlatyvlg6jc+ISAQu1QEA62IUeWnriQJg+ChseMcyFI
-tRhEc/mkG7FFZO2G5A+0NNCj693Q3dbDhMOBxKmCBjw
--> ssh-ed25519 vBZj5g HdeqB71NJkEFgXb0LPefYl+kwQNUYJQAHBEDxKdPqxk
-6mUCxbBT6PpAf0BwTD6Tv7pDZzWmHxBWw+/IbgLXQZA
--> N-grease
-OKOvPc2zAXju6FzjNzuCZiF9pN2hmmxMMRWxZwXar8MR
---- QR9PJv7R2ASeHrsBO7SuZzAB9s5fD0jT/qEFuJx8CNg
-Š·_AéZñRIWnO†¢'j—̤,ÄØÃ#†ò™ZPjJ©è&Zô˜ôÎÃ…›ÿ°ë…{ÕW…ðÚ˜,°×w›Þˆ %Ó±‰%

secrets/wg-quick-home-privkey.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 LAPUww ST/R4vPro6VMrJgRJqMIYkhaQJ0EV0ss/yX94BAxSWE
-VIWQpIuuf0OS4z1D1QsFRvvWrmbo6LJEdPJ7jmbhv+w
--> ssh-ed25519 vBZj5g GAlVKDrXvlR7FqID4Rbpb64QChS8rwUCyJdxg2PXSw0
-cS8pDXkYvvFsiTt0i6s5r/7cxbf5IcjiNQWQAcgoXFg
--> w-grease s,fAjpd YvL[bWVw $h4j|^ >JU
-EO9ZKdn19mADx6rwhpKftX/QxZ4yNlXgZttyn0rBpSZuVfX8Oj430VppAZ5RYwn9
-zHqBvBs6VEYUt4jOWOGl/idBNg
---- OnaKsFMYoiOP1T2o4GIgME6KQqWqwIQM9WADk28E9qA
-<<16>˜±n-ã¸þ”iìÙ÷bÖRä¿·â;¢©Ö)¸“[G[Õ–„·FÔX°ä<C2B0>?Hne•®ò&’­n¸m#œ$}”¸e]Õ-6ᢾx„