From 0ddf9cd1ce0e2e08efd21ce8ba82cc28f881c531 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 29 May 2025 21:44:37 -0500 Subject: [PATCH] feat: need a quick push --- flake.lock | 50 ++++++++++++++++++- flake.nix | 4 ++ modules/home/default.nix | 1 + .../home/gui/apps/browsers/zen/default.nix | 12 +++++ .../home/gui/apps/tools/espanso/default.nix | 8 +++ .../gui/desktop/hypr/land/config/bind.nix | 6 +-- .../nixos/services/glance/config/pages.nix | 3 +- .../glance/config/widgets/monitor.nix | 0 .../services/glance/config/widgets/reddit.nix | 2 +- .../services/glance/config/widgets/repos.nix | 15 ++++++ .../config/widgets/steam/config/default.nix | 2 +- .../services/glance/config/widgets/videos.nix | 0 12 files changed, 96 insertions(+), 7 deletions(-) create mode 100755 modules/home/gui/apps/browsers/zen/default.nix mode change 100644 => 100755 modules/nixos/services/glance/config/widgets/monitor.nix mode change 100644 => 100755 modules/nixos/services/glance/config/widgets/reddit.nix create mode 100755 modules/nixos/services/glance/config/widgets/repos.nix mode change 100644 => 100755 modules/nixos/services/glance/config/widgets/videos.nix diff --git a/flake.lock b/flake.lock index c0a40ad..fd02d5e 100755 --- a/flake.lock +++ b/flake.lock @@ -72,6 +72,18 @@ "type": "github" } }, + "darwin-src": { + "flake": false, + "locked": { + "narHash": "sha256-9Juqg0xHqv5XpY1FBapaqsOv9GUMYUyNdzM4gCYTFpI=", + "type": "file", + "url": "https://github.com/zen-browser/desktop/releases/download/1.12.8b/zen.macos-universal.dmg" + }, + "original": { + "type": "file", + "url": "https://github.com/zen-browser/desktop/releases/download/1.12.8b/zen.macos-universal.dmg" + } + }, "dream2nix": { "inputs": { "nixpkgs": [ @@ -921,6 +933,19 @@ "type": "github" } }, + "linux-src": { + "flake": false, + "locked": { + "lastModified": 1747948295, + "narHash": "sha256-exEj4FL1KYtyGiJHAycm5oIzsWE5FcXVzqYlZOIUDqo=", + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.12.8b/zen.linux-x86_64.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/zen-browser/desktop/releases/download/1.12.8b/zen.linux-x86_64.tar.xz" + } + }, "lix": { "flake": false, "locked": { @@ -1354,7 +1379,8 @@ "systems": "systems_6", "waybar": "waybar", "yazi": "yazi", - "zed-editor": "zed-editor" + "zed-editor": "zed-editor", + "zen-browser": "zen-browser" } }, "rust-overlay": { @@ -1791,6 +1817,28 @@ "type": "github" } }, + "zen-browser": { + "inputs": { + "darwin-src": "darwin-src", + "linux-src": "linux-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748066818, + "narHash": "sha256-eu5fJ2w0LnY0RQQ0BQ4GcE4B8gQJXWPaGqTsRHu4jEU=", + "owner": "InvraNet", + "repo": "zen-flake", + "rev": "b293d1439fa82f7ef771e69371bd0cbd24f8ec6d", + "type": "gitlab" + }, + "original": { + "owner": "InvraNet", + "repo": "zen-flake", + "type": "gitlab" + } + }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index dae414d..e388c55 100755 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,10 @@ url = "github:zed-industries/zed"; inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "gitlab:InvraNet/zen-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: diff --git a/modules/home/default.nix b/modules/home/default.nix index f85cd43..561d74a 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -72,6 +72,7 @@ in finamp lingot keymapp + zen ; }; }; diff --git a/modules/home/gui/apps/browsers/zen/default.nix b/modules/home/gui/apps/browsers/zen/default.nix new file mode 100755 index 0000000..163976f --- /dev/null +++ b/modules/home/gui/apps/browsers/zen/default.nix @@ -0,0 +1,12 @@ +{ + flake, + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (flake.inputs.zen-browser.packages."${pkgs.system}") + default + ; + }; +} diff --git a/modules/home/gui/apps/tools/espanso/default.nix b/modules/home/gui/apps/tools/espanso/default.nix index 5c91049..ed5a246 100755 --- a/modules/home/gui/apps/tools/espanso/default.nix +++ b/modules/home/gui/apps/tools/espanso/default.nix @@ -76,6 +76,14 @@ in trigger = ":emdash"; replace = "—"; } + { + trigger = ":dag1"; + replace = "†"; + } + { + trigger = ":dag2"; + replace = "‡"; + } { trigger = ":glp"; replace = "GLP-1RA"; diff --git a/modules/home/gui/desktop/hypr/land/config/bind.nix b/modules/home/gui/desktop/hypr/land/config/bind.nix index c9d5a45..82d2bd7 100755 --- a/modules/home/gui/desktop/hypr/land/config/bind.nix +++ b/modules/home/gui/desktop/hypr/land/config/bind.nix @@ -59,9 +59,6 @@ let "Home, exec, playerctl play-pause" "Space, exec, fuzzel" # Utility - "End, exec, shutdown now" - "Insert, exec, systemctl reboot" - "Home, exec, swaylock" ]; superShiftBinds = builtins.map (x: "SUPER SHIFT, " + x) [ @@ -70,6 +67,9 @@ let "period, exec, emote" "T, fullscreen, 0" # "Print, exec, grim -g \"$(slurp)\"" + "End, exec, shutdown now" + "Insert, exec, systemctl reboot" + "Home, exec, swaylock" ]; superCtrlBinds = builtins.map (x: "SUPER CTRL, " + x) [ # Super+shift binds diff --git a/modules/nixos/services/glance/config/pages.nix b/modules/nixos/services/glance/config/pages.nix index 171b77e..00bda0a 100755 --- a/modules/nixos/services/glance/config/pages.nix +++ b/modules/nixos/services/glance/config/pages.nix @@ -10,6 +10,7 @@ let weather = import (widgetsPath + /weather.nix); reddit = import (widgetsPath + /reddit.nix); videos = import (widgetsPath + /videos.nix); + repos = import (widgetsPath + /repos.nix); }; in [ @@ -31,8 +32,8 @@ in { size = "small"; widgets = [ - # widgets.jellyfin widgets.steam + widgets.repos ]; } { diff --git a/modules/nixos/services/glance/config/widgets/monitor.nix b/modules/nixos/services/glance/config/widgets/monitor.nix old mode 100644 new mode 100755 diff --git a/modules/nixos/services/glance/config/widgets/reddit.nix b/modules/nixos/services/glance/config/widgets/reddit.nix old mode 100644 new mode 100755 index 07d7360..0ee8565 --- a/modules/nixos/services/glance/config/widgets/reddit.nix +++ b/modules/nixos/services/glance/config/widgets/reddit.nix @@ -8,7 +8,7 @@ let subredditEntries = builtins.map (sub: { type = "reddit"; subreddit = sub; - collapse-after = 4; + collapse-after = 5; show-thumbnails = true; sort-by = "top"; top-period = "day"; diff --git a/modules/nixos/services/glance/config/widgets/repos.nix b/modules/nixos/services/glance/config/widgets/repos.nix new file mode 100755 index 0000000..8f1dbc6 --- /dev/null +++ b/modules/nixos/services/glance/config/widgets/repos.nix @@ -0,0 +1,15 @@ +{ + type = "releases"; + show-source-icon = true; + collapse-after = 7; + repositories = [ + "jmshrv/finamp" + "futo-org/android-keyboard" + "hyprwm/Hyprland" + "mollyim/mollyim-android" + "jarnedemeulemeester/findroid" + "brandonp2412/Flexify" + "accrescent/accrescent" + "ImranR98/Obtainium" + ]; +} diff --git a/modules/nixos/services/glance/config/widgets/steam/config/default.nix b/modules/nixos/services/glance/config/widgets/steam/config/default.nix index ca815e3..1271d2f 100755 --- a/modules/nixos/services/glance/config/widgets/steam/config/default.nix +++ b/modules/nixos/services/glance/config/widgets/steam/config/default.nix @@ -6,7 +6,7 @@ {{ end }} diff --git a/modules/nixos/services/glance/config/widgets/videos.nix b/modules/nixos/services/glance/config/widgets/videos.nix old mode 100644 new mode 100755