-----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY
oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQAQPcukyEXa2CWcHdUfF1ybI8hT9hQupbCxdJRxyYVjse1++kxMIOmRk6GNf/r+EC9
2z3yO7Fvk0NYpMr5OqhAs=
-----END SSH SIGNATURE-----
diff --git a/apps/gui/firefox.nix b/apps/gui/firefox.nix
index aa2737a09558c192a9226dccd7ad1cdb84ba3012..b052488c324a7acb806813f0b7055b8043e57f76 100644
--- a/apps/gui/firefox.nix
+++ b/apps/gui/firefox.nix
@@ -5,10 +5,10 @@ enable = true;
profiles.default = {
search = {
default = "Kagi";
- privateDefault = "DuckDuckGo";
+ privateDefault = "ddg";
order = [
"Kagi"
- "DuckDuckGo"
+ "ddg"
];
force = true;
engines = {
@@ -26,7 +26,7 @@ ];
}
];
};
- "DuckDuckGo" = {
+ "ddg" = {
definedAliases = [ "@d" ];
urls = [
{
@@ -42,7 +42,7 @@ ];
};
};
};
- extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
bitwarden
clearurls
mailvelope
@@ -81,196 +81,199 @@ "browser.fixup.domainwhitelist.files" = true;
"browser.fixup.domainwhitelist.pubserve" = true;
"browser.fixup.domainwhitelist.privserve" = true;
};
- bookmarks = [
- {
- name = "Toolbar";
- toolbar = true;
- bookmarks = [
- {
- name = "Gitea";
- bookmarks = [
- {
- name = "jojodev";
- tags = [ "gitea" ];
- keyword = "jojodev";
- url = "https://git.jojodev.com";
- }
- {
- name = "gist";
- tags = [
- "gitea"
- "gist"
- ];
- keyword = "gist";
- url = "https://gist.jojodev.com";
- }
- {
- name = "gitea";
- tags = [ "gitea" ];
- keyword = "gitea";
- url = "https://gitea.com";
- }
- ];
- }
- {
- name = "Tailnet";
- bookmarks = [
- {
- name = "golink";
- tags = [ "tailscale" ];
- keyword = "go";
- url = "http://go";
- }
- {
- name = "tclip";
- tags = [ "tailscale" ];
- keyword = "paste";
- url = "http://paste";
- }
- {
- name = "ugit";
- tags = [
- "tailscale"
- "git"
- ];
- keyword = "git";
- url = "https://git";
- }
- {
- name = "cfg";
- tags = [
- "cfg"
- "tailscale"
- ];
- keyword = "cfg";
- url = "https://cfg";
- }
- {
- name = "media";
- bookmarks = [
- {
- name = "jellyfin";
- tags = [
- "jellyfin"
- "tailscale"
- ];
- keyword = "jellyfin";
- url = "http://jellyfin";
- }
- {
- name = "sonarr";
- tags = [
- "sonarr"
- "tailscale"
- "shows"
- ];
- keyword = "sonarr";
- url = "http://sonarr";
- }
- {
- name = "radarr";
- tags = [
- "radarr"
- "tailscale"
- "movies"
- ];
- keyword = "radarr";
- url = "http://radarr";
- }
- {
- name = "bazarr";
- tags = [
- "bazarr"
- "tailscale"
- "translations"
- ];
- keyword = "bazarr";
- url = "http://bazarr";
- }
- {
- name = "prowlarr";
- tags = [
- "prowlarr"
- "tailscale"
- "indexers"
- ];
- keyword = "prowlarr";
- url = "http://prowlarr";
- }
- ];
- }
- {
- name = "Files";
- bookmarks = [
- {
- name = "files";
- tags = [
- "files"
- "miniserve"
- ];
- keyword = "files";
- url = "http://files";
- }
- {
- name = "privserve";
- tags = [
- "privserve"
- "miniserve"
- ];
- keyword = "privserve";
- url = "http://privserve";
- }
- {
- name = "pubserve";
- tags = [
- "pubserve"
- "miniserve"
- ];
- keyword = "pubserve";
- url = "http://pubserve";
- }
- ];
- }
- ];
- }
- {
- name = "ugit";
- tags = [
- "git"
- "ugit"
- ];
- keyword = "ugit";
- url = "https://git.jolheiser.com";
- }
- {
- name = "git-pr";
- tags = [
- "git"
- "pr"
- ];
- keyword = "git-pr";
- url = "https://pr.jolheiser.com";
- }
+ bookmarks = {
+ force = true;
+ settings = [
+ {
+ name = "Toolbar";
+ toolbar = true;
+ bookmarks = [
+ {
+ name = "Gitea";
+ bookmarks = [
+ {
+ name = "jojodev";
+ tags = [ "gitea" ];
+ keyword = "jojodev";
+ url = "https://git.jojodev.com";
+ }
+ {
+ name = "gist";
+ tags = [
+ "gitea"
+ "gist"
+ ];
+ keyword = "gist";
+ url = "https://gist.jojodev.com";
+ }
+ {
+ name = "gitea";
+ tags = [ "gitea" ];
+ keyword = "gitea";
+ url = "https://gitea.com";
+ }
+ ];
+ }
+ {
+ name = "Tailnet";
+ bookmarks = [
+ {
+ name = "golink";
+ tags = [ "tailscale" ];
+ keyword = "go";
+ url = "http://go";
+ }
+ {
+ name = "tclip";
+ tags = [ "tailscale" ];
+ keyword = "paste";
+ url = "http://paste";
+ }
+ {
+ name = "ugit";
+ tags = [
+ "tailscale"
+ "git"
+ ];
+ keyword = "git";
+ url = "https://git";
+ }
+ {
+ name = "cfg";
+ tags = [
+ "cfg"
+ "tailscale"
+ ];
+ keyword = "cfg";
+ url = "https://cfg";
+ }
+ {
+ name = "media";
+ bookmarks = [
+ {
+ name = "jellyfin";
+ tags = [
+ "jellyfin"
+ "tailscale"
+ ];
+ keyword = "jellyfin";
+ url = "http://jellyfin";
+ }
+ {
+ name = "sonarr";
+ tags = [
+ "sonarr"
+ "tailscale"
+ "shows"
+ ];
+ keyword = "sonarr";
+ url = "http://sonarr";
+ }
+ {
+ name = "radarr";
+ tags = [
+ "radarr"
+ "tailscale"
+ "movies"
+ ];
+ keyword = "radarr";
+ url = "http://radarr";
+ }
+ {
+ name = "bazarr";
+ tags = [
+ "bazarr"
+ "tailscale"
+ "translations"
+ ];
+ keyword = "bazarr";
+ url = "http://bazarr";
+ }
+ {
+ name = "prowlarr";
+ tags = [
+ "prowlarr"
+ "tailscale"
+ "indexers"
+ ];
+ keyword = "prowlarr";
+ url = "http://prowlarr";
+ }
+ ];
+ }
+ {
+ name = "Files";
+ bookmarks = [
+ {
+ name = "files";
+ tags = [
+ "files"
+ "miniserve"
+ ];
+ keyword = "files";
+ url = "http://files";
+ }
+ {
+ name = "privserve";
+ tags = [
+ "privserve"
+ "miniserve"
+ ];
+ keyword = "privserve";
+ url = "http://privserve";
+ }
+ {
+ name = "pubserve";
+ tags = [
+ "pubserve"
+ "miniserve"
+ ];
+ keyword = "pubserve";
+ url = "http://pubserve";
+ }
+ ];
+ }
+ ];
+ }
+ {
+ name = "ugit";
+ tags = [
+ "git"
+ "ugit"
+ ];
+ keyword = "ugit";
+ url = "https://git.jolheiser.com";
+ }
+ {
+ name = "git-pr";
+ tags = [
+ "git"
+ "pr"
+ ];
+ keyword = "git-pr";
+ url = "https://pr.jolheiser.com";
+ }
- {
- name = "todo";
- tags = [
- "vikunja"
- "todo"
- ];
- keyword = "todo";
- url = "https://todo.jolheiser.com";
- }
- ];
- }
- # Not in the toolbar, but still usable via keyword/searching
- {
- name = "Go Playground";
- tags = [ "golang" ];
- keyword = "play";
- url = "https://go.dev/play/";
- }
- ];
+ {
+ name = "todo";
+ tags = [
+ "vikunja"
+ "todo"
+ ];
+ keyword = "todo";
+ url = "https://todo.jolheiser.com";
+ }
+ ];
+ }
+ # Not in the toolbar, but still usable via keyword/searching
+ {
+ name = "Go Playground";
+ tags = [ "golang" ];
+ keyword = "play";
+ url = "https://go.dev/play/";
+ }
+ ];
+ };
};
};
}
diff --git a/apps/gui/zed.nix b/apps/gui/zed.nix
index 5ee43bdc23656876eaff8a40ac3c95081c44327b..e50623bb68518e06013f84592a3fad837193eeec 100644
--- a/apps/gui/zed.nix
+++ b/apps/gui/zed.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }:
let
- zed-fhs = pkgs.buildFHSUserEnv {
+ zed-fhs = pkgs.buildFHSEnv {
name = "zed";
targetPkgs =
pkgs: with pkgs; [