Merge branch 'main' of github.com:anotherhadi/nixy

add secrets
Signed-off-by: Hadi <hadi@example.com>
2026-05-20 13:22:34 +02:00 · 2026-04-22 10:38:12 +02:00 · 2026-04-22 10:33:19 +02:00 · 2026-04-22 10:33:10 +02:00
6 changed files with 44 additions and 17 deletions
@@ -49,10 +49,20 @@
            isCards = true;
            items = acc.pending;
          }
-          ++ [{isCards = false; folder = item;}];
+          ++ [
+            {
+              isCards = false;
+              folder = item;
+            }
+          ];
        pending = [];
      };
-    result = lib.foldl' step {chunks = []; pending = [];} items;
+    result =
+      lib.foldl' step {
+        chunks = [];
+        pending = [];
+      }
+      items;
    chunks =
      result.chunks
      ++ lib.optional (result.pending != []) {
@@ -97,7 +107,12 @@
            isRoot = true;
            items = acc.pending;
          }
-          ++ [{isRoot = false; inherit item;}];
+          ++ [
+            {
+              isRoot = false;
+              inherit item;
+            }
+          ];
        pending = [];
      };
    result =
@@ -125,11 +140,13 @@

  # Recursively collect all leaf bookmarks with their full folder path
  collectBookmarks = prefix: items:
-    lib.concatMapStrings (item:
-      if item ? url
-      then "${item.url} ${prefix}${item.name}\n"
-      else collectBookmarks "${prefix}${item.name}/" item.bookmarks
-    ) items;
+    lib.concatMapStrings (
+      item:
+        if item ? url
+        then "${item.url} ${prefix}${item.name}\n"
+        else collectBookmarks "${prefix}${item.name}/" item.bookmarks
+    )
+    items;

  publicBookmarks =
    pkgs.writeText "qutebrowser-public-bookmarks"
@@ -475,10 +492,16 @@ in {
      </html>
    '';

-    home.activation.qutebrowserBookmarks = lib.hm.dag.entryAfter ["setupSecrets" "writeBoundary"] ''
+    home.activation.qutebrowserBookmarks = lib.hm.dag.entryAfter ["writeBoundary"] ''
      mkdir -p ${config.home.homeDirectory}/.config/qutebrowser/bookmarks
-      cat ${publicBookmarks} ${lib.optionalString (privateBookmarksPath != null) ''"${privateBookmarksPath}"''} \
-        > ${config.home.homeDirectory}/.config/qutebrowser/bookmarks/urls
+      {
+        cat ${publicBookmarks}
+        ${lib.optionalString (privateBookmarksPath != null) ''
+        if [ -f "${privateBookmarksPath}" ]; then
+          cat "${privateBookmarksPath}"
+        fi
+      ''}
+      } > ${config.home.homeDirectory}/.config/qutebrowser/bookmarks/urls
    '';
  };
 }
@@ -19,8 +19,4 @@
    name = "Github";
    url = "https://github.com";
  }
-  {
-    name = "Feedly";
-    url = "https://feedly.com";
-  }
 ]
@@ -29,6 +29,10 @@
        name = "Startpage Config";
        url = "https://www.startpage.com/do/mypage.pl?prfe=45d331deb05471d659dba933e7400df51d952bb103da6f6125c0e769a6be1d65610456a479f495ceeee7e97311cf227d7c1bb198de0ceeb193d8cddf9c455c19a409cc35c3e3f542ee27bd7cecd3";
      }
+      {
+        name = "Feedly";
+        url = "https://feedly.com";
+      }
      {
        name = "MyNixOS";
        url = "https://mynixos.com";
@@ -39,5 +39,7 @@
    stateVersion = "24.05";
  };

+  qutebrowser.privateBookmarksPath = config.sops.secrets.qutebrowser-bookmarks.path;
+
  programs.home-manager.enable = true;
 }
@@ -18,6 +18,7 @@ in {
      netrc = {path = "${home}/.netrc";};
      github-key = {path = "${home}/.ssh/github";};
      gitlab-key = {path = "${home}/.ssh/gitlab";};
+      qutebrowser-bookmarks = {};
    };
  };

@@ -1,3 +1,4 @@
+qutebrowser-bookmarks: ENC[AES256_GCM,data:j+hW6wA9zOe84Qj4ogLCkahknugWppXWa9hTPCvVXeyY9RY+RS9LjgxyrLpKPnbFyo7OI2vUrY4524fqdJo66Cb1nynKRvB8gWukBIT1vhyDY3pfhbq7kp//Dfs8xE+Jp9mP/vx3VvOvm3C2rim/K3i7YfKOWO4GmkLMD3I1tKIsocOvZn3AitUKStZqk6oId6CE,iv:83UuH/+0w3paHMgnuAvCQsbMOILl43lNxx11UEIg5KY=,tag:EXiIE0rcLb5bq8dW0eOwgQ==,type:str]
 ssh-config: ENC[AES256_GCM,data:npBcAOSwHpApUASlZmRo4stwMrOjdrdmhfYwumjbTpcq8aQ2ybV8le7cjNdVqIyxgwxUFV4/tGfmsq4nlrWIO/85spwfC5DyPGaZ848NI3UZJj8k2GKuw5qk/xGsTveNhq+vNZQcHeL4aeXF2TRmFLDHYGTku9anFL7FWkQ75MmGW78XfPUEyZJ52ylXq3gkYeVSrl6cXuwJw/QBlu+XTgFk4MM+E5BTXBFFNJOYkIt4GwWX7wdI+QqPEof8J0ENYdxUAMKMueL4pLNclWP0fu7QC7gwwRJWjauCNElJiDhpVFa6WukJV/Ut+I30FH9cJtj0rSodeu0hq2fWaiQ0wVbQudxi0JcnxJQs+B9nb6kpF+TN0MiD,iv:c7DMZSmlgMMnNlR0/kNRKPYjCzvNQJ46mZzojHppSg8=,tag:ausjsFk0H9nOiiMebHXSUg==,type:str]
 netrc: ENC[AES256_GCM,data:EOpuZhDVXe7Q4P/98C3gtEvkdawI26d4oX/wRNytyp/mAdkHytXiLpFdsuO/3DADOG8h1CCo1UTs9ex+bqoD/LdChdp7INfNDSQ+aDxTiG0rLBgjvy8TIj8=,iv:tc/RbN1Upbjv+3rU5zUR3P//a1Hj1xODInLMShg4i1Y=,tag:7E9G2g4g+eMeJrwI20R/1g==,type:str]
 github-key: ENC[AES256_GCM,data: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,iv:2Mvmz1CFO1112RxjIl6sxyNIDqa/cg00um6RcQaHNY8=,tag:+zygdwQdCBeBXVLvAj/jJQ==,type:str]
@@ -13,7 +14,7 @@ sops:
            RkMrdTYwNkY1Tlc3M3dxTFdkRXJJZUEKUlYU45jXpS9hJO9Z/uAQ6XMj9QWgMMRI
            LbJxvt48+yC+Y0XKOtDE0lHAuGNzUG8R/7FB1tTD8NCamBe46KGCIg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-04-21T08:08:45Z"
-    mac: ENC[AES256_GCM,data:/g8vC1zlfH2MHfGHnl4+o+qS58S9aC15vM3Vc+LNULAgW8AeyqMK6ceWc7ltzxcu9gX0aU08kko+W3Mo7iRE+5T7Gk4CpDkEy7h1RHfa7bXTCB4ycwORwM+LHbdsmnx63oaqRxrxFbHJXP2HPitJFDMwsAhb8wmdmkavwSSSkQs=,iv:ciPAtYWyMQSStMR/O4etv1c3KzDnrT+UlrkxFeoTRrI=,tag:x5owF4G4dKpF7p4Pkt0wpA==,type:str]
+    lastmodified: "2026-04-22T08:26:28Z"
+    mac: ENC[AES256_GCM,data:cengea0QNzwuranhMXH7pXu8518D9dDiDGz8ZY57IXArfkplfdQFaXAAv0t1bAWmQBDDloA/kwE+uq6XuGChhu/F41Sh2SLwmGYW0RSR29S/UfvI07UIhyImhiECUfBSJsSqPcW25vB0WP6kcM4HuYLHlxSrdGTDBIiUJsu09io=,iv:OUk4MBuNqb/wTJtXO1tCFY9aaEg/yzrwxRVvDMAj5E0=,tag:rIjhibls2vXPH67Fnwj6ow==,type:str]
    unencrypted_suffix: _unencrypted
    version: 3.12.2
Author	SHA1	Message	Date
Hadi	f9d5c6ab00	Merge branch 'main' of github.com:anotherhadi/nixy	2026-04-22 10:38:12 +02:00
Hadi	b51a78ac1c	add secrets Signed-off-by: Hadi <hadi@example.com>	2026-04-22 10:33:19 +02:00
Hadi	96b5d5e671	move feedly Signed-off-by: Hadi <hadi@example.com>	2026-04-22 10:33:10 +02:00