refactor: add zsync and Zen browser tasks, update default applications and configurations
Some checks failed
Nix Format Check / check-format (push) Failing after 1m6s

This commit is contained in:
2025-03-03 14:49:15 +01:00
parent a47b6ea2f2
commit c8944e8ed6
16 changed files with 267 additions and 211 deletions

View File

@ -23,11 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1740743217,
"narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=",
"lastModified": 1740865531,
"narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c",
"rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
"type": "github"
},
"original": {
@ -39,11 +39,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1740695751,
"narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
"lastModified": 1740828860,
"narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
"rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
"type": "github"
},
"original": {

View File

@ -4,6 +4,7 @@ let
files = builtins.removeAttrs (builtins.readDir ./.) [
"default.nix"
"brave-search-engines.sh"
"ulauncher.nix" # Disabled, since we switched to ansible for this
];
# Import all other .nix files as modules

View File

@ -1,163 +0,0 @@
{
config,
pkgs,
lib,
...
}:
let
# Initial configuration files
settingsJson = builtins.toJSON {
blacklisted-desktop-dirs = "/usr/share/locale:/usr/share/app-install:/usr/share/kservices5:/usr/share/fk5:/usr/share/kservicetypes5:/usr/share/applications/screensavers:/usr/share/kde4:/usr/share/mimelnk";
clear-previous-query = true;
disable-desktop-filters = false;
grab-mouse-pointer = false;
hotkey-show-app = "<Control>Space";
render-on-screen = "mouse-pointer-monitor";
show-indicator-icon = true;
show-recent-apps = "4";
terminal-command = "ptyxis";
theme-name = "dark";
};
shortcutsJson = builtins.toJSON {
"0bab9d26-5464-4501-bc95-9995d8fa1405" = {
"id" = "0bab9d26-5464-4501-bc95-9995d8fa1405";
"name" = "Google Search";
"keyword" = "g";
"cmd" = "https://google.com/search?q=%s";
"icon" =
"/nix/store/ifh4wl3j3cv7f6b5rdzqcnhw5sa27pg9-ulauncher-5.15.7/share/ulauncher/media/google-search-icon.png";
"is_default_search" = true;
"run_without_argument" = false;
"added" = 0;
};
"d72834d1-5d81-4f5d-a9f6-386b12110f56" = {
"id" = "d72834d1-5d81-4f5d-a9f6-386b12110f56";
"name" = "Stack Overflow";
"keyword" = "so";
"cmd" = "https://stackoverflow.com/search?q=%s";
"icon" =
"/nix/store/ifh4wl3j3cv7f6b5rdzqcnhw5sa27pg9-ulauncher-5.15.7/share/ulauncher/media/stackoverflow-icon.svg";
"is_default_search" = true;
"run_without_argument" = false;
"added" = 0;
};
"4dfcffeb-879c-49b2-83bb-c16254a7ce75" = {
"id" = "4dfcffeb-879c-49b2-83bb-c16254a7ce75";
"name" = "GoLink";
"keyword" = "go";
"cmd" = "http://go/%s";
"icon" = null;
"is_default_search" = false;
"run_without_argument" = false;
"added" = 0;
};
"40d1ed32-8fd3-4bf8-92f5-cbaa7cd607a1" = {
"id" = "40d1ed32-8fd3-4bf8-92f5-cbaa7cd607a1";
"name" = "NixOS";
"keyword" = "nix";
"cmd" = "https://search.nixos.org/packages?query=%s";
"icon" = null;
"is_default_search" = false;
"run_without_argument" = false;
"added" = 0;
};
"40d1ed32-8fd3-4ff4-92f6-fbaa7cd607a1" = {
"id" = "42d1ed42-8dd3-2bf8-92f5-cbaa7cd607a1";
"name" = "Flathub";
"keyword" = "flat";
"cmd" = "https://flathub.org/apps/search?q=%s";
"icon" = null;
"is_default_search" = false;
"run_without_argument" = false;
"added" = 0;
};
"43d1ed32-8fd3-fbf8-94f5-cffa7cd607a1" = {
"id" = "40d1ed32-8fd3-4bf8-92f5-cbaa7cd607a1";
"name" = "GitHub";
"keyword" = "gh";
"cmd" = "https://github.com/search?q=%s";
"icon" = null;
"is_default_search" = false;
"run_without_argument" = false;
"added" = 0;
};
};
# Create a Python environment with all required packages
pythonWithPackages = pkgs.python3.withPackages (
ps: with ps; [
pytz
thefuzz
tornado
docker
requests
pint
simpleeval
parsedatetime
fuzzywuzzy
]
);
# Desktop file content with GDK_BACKEND=x11
desktopEntry = ''
[Desktop Entry]
Name=Ulauncher
Comment=Application launcher for Linux
Categories=GNOME;Utility;
Exec=env GDK_BACKEND=x11 ${config.home.homeDirectory}/.local/bin/ulauncher-wrapped
Icon=ulauncher
Terminal=false
Type=Application
'';
in
# Extensions
# https://github.com/friday/ulauncher-gnome-settings
# https://ext.ulauncher.io/-/github-ulauncher-ulauncher-emoji
# https://ext.ulauncher.io/-/github-tchar-ulauncher-albert-calculate-anything
# https://ext.ulauncher.io/-/github-isacikgoz-ukill
# https://ext.ulauncher.io/-/github-iboyperson-ulauncher-system
# https://github.com/IgorVaryvoda/ulauncher-perplexity
{
nixpkgs.overlays = [
(final: prev: { ulauncher = prev.ulauncher.override { python3 = pythonWithPackages; }; })
];
home.packages = with pkgs; [
ulauncher
pythonWithPackages # Make Python environment available system-wide
];
# Create a wrapper script to set PYTHONPATH and GDK_BACKEND=x11
home.file.".local/bin/ulauncher-wrapped" = {
executable = true;
text = ''
#!${pkgs.bash}/bin/bash
export GDK_BACKEND=x11
export PYTHONPATH="${pythonWithPackages}/${pythonWithPackages.sitePackages}:$PYTHONPATH"
exec ${pkgs.ulauncher}/bin/ulauncher "$@"
'';
};
# Update both desktop files
xdg.configFile."autostart/ulauncher.desktop".text = desktopEntry;
xdg.dataFile."applications/ulauncher.desktop".text = desktopEntry;
# Enable autostart for Ulauncher
xdg.configFile."autostart/ulauncher.desktop".source =
"${pkgs.ulauncher}/share/applications/ulauncher.desktop";
# Overwrite ulauncher settings and shortcuts
home.activation.ulauncher-config = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
config_dir="$HOME/.config/ulauncher"
mkdir -p "$config_dir"
rm -f "$config_dir/settings.json"
echo '${settingsJson}' > "$config_dir/settings.json"
rm -f "$config_dir/shortcuts.json"
echo '${shortcutsJson}' > "$config_dir/shortcuts.json"
'';
}

View File

@ -51,11 +51,12 @@
# add more by listing them with `dconf read /org/gnome/shell/favorite-apps | sed "s/,//g; s/'/\"/g"` then copy pasting the output here
"org/gnome/shell" = {
favorite-apps = [
"app.zen_browser.zen.desktop"
"ZenBrowser.desktop"
"org.gnome.Nautilus.desktop"
"com.spotify.Client.desktop"
"vesktop.desktop"
"FFPWA-01JN0Y8Z6KR644ZG4CV0QAYPRF.desktop"
"FFPWA-01JN0YCBNR29VRW8GN5YBZSQ7W.desktop"
"vesktop.desktop"
"FFPWA-01JN13AEFTM76WVC6TSBYC5AXN.desktop"
"code.desktop"
"org.gnome.Ptyxis.desktop"

View File

@ -5,10 +5,10 @@
enable = true;
defaultApplications = {
# Brave Browser
"application/xhtml+xml" = [ "app.zen_browser.zen.desktop" ];
"text/html" = [ "app.zen_browser.zen.desktop" ];
"x-scheme-handler/http" = [ "app.zen_browser.zen.desktop" ];
"x-scheme-handler/https" = [ "app.zen_browser.zen.desktop" ];
"application/xhtml+xml" = [ "ZenBrowser.desktop" ];
"text/html" = [ "ZenBrowser.desktop" ];
"x-scheme-handler/http" = [ "ZenBrowser.desktop" ];
"x-scheme-handler/https" = [ "ZenBrowser.desktop" ];
# Geary
"x-scheme-handler/mailto" = [ "org.gnome.Geary.desktop" ];

View File

@ -190,9 +190,21 @@
{
"id": "Landscape Laptop",
"tiles": [
{ "x": 0, "y": 0, "width": 0.33, "height": 0.5, "groups": [1, 2] },
{ "x": 0.33, "y": 0, "width": 0.67, "height": 1, "groups": [1] },
{ "x": 0, "y": 0.5, "width": 0.33, "height": 0.5, "groups": [2, 1] }
{ "x": 0, "y": 0, "width": 0.5, "height": 0.5, "groups": [1, 2] },
{
"x": 0.5,
"y": 0,
"width": 0.5,
"height": 1,
"groups": [1]
},
{
"x": 0,
"y": 0.5,
"width": 0.5,
"height": 0.5,
"groups": [2, 1]
}
]
},
{