Compare commits

..

No commits in common. "cf18c87bff4541c1500bd50df23b1fdb162a9c50" and "8cbaf5805528f9f06133c6677ba3722c0f5da029" have entirely different histories.

2 changed files with 14 additions and 57 deletions

View file

@ -39,18 +39,6 @@
]; ];
}; };
systemd.services.tailscale-set-operator = {
description = "Set Tailscale operator user";
after = [ "tailscaled.service" ];
requires = [ "tailscaled.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "oneshot";
path = [ pkgs.tailscale ];
script = ''
tailscale set --operator=jet
'';
};
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

View file

@ -12,16 +12,16 @@ let
zenStartup = pkgs.makeDesktopItem { zenStartup = pkgs.makeDesktopItem {
name = "zen-startup"; name = "zen-startup";
desktopName = "Zen Startup"; desktopName = "Zen Startup";
comment = "Launch Zen Browser"; comment = "Launch Zen in fullscreen";
exec = "${config.programs.zen-browser.package}/bin/zen-beta"; exec = "${config.programs.zen-browser.package}/bin/zen --fullscreen";
terminal = false; terminal = false;
categories = [ "Network" ]; categories = [ "Network" ];
}; };
kittyZellijStartup = pkgs.makeDesktopItem { kittyZellijStartup = pkgs.makeDesktopItem {
name = "kitty-zellij-startup"; name = "kitty-zellij-startup";
desktopName = "Kitty Zellij Startup"; desktopName = "Kitty Zellij Startup";
comment = "Open Kitty and attach to the main Zellij session"; comment = "Open Kitty, pick a directory, and launch Zellij";
exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijPersistentSession}/bin/zellij-persistent-session"; exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijNewTabZoxide}/bin/zellij-new-tab-zoxide";
terminal = false; terminal = false;
categories = [ categories = [
"TerminalEmulator" "TerminalEmulator"
@ -59,20 +59,6 @@ let
terminal = false; terminal = false;
categories = [ "Network" ]; categories = [ "Network" ];
}; };
tailscaleQsExtension = pkgs.stdenvNoCC.mkDerivation {
pname = "tailscale-gnome-qs";
version = "5";
src = pkgs.fetchzip {
url = "https://github.com/tailscale-qs/tailscale-gnome-qs/archive/refs/tags/v5.tar.gz";
sha256 = "0b9jy8pyxvpkxf3adlwq42kii14jn5g7xyxggjzg87pb5jg4zfg2";
};
dontBuild = true;
installPhase = ''
mkdir -p "$out/share/gnome-shell/extensions"
cp -r "$src/tailscale-gnome-qs@tailscale-qs.github.io" \
"$out/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io"
'';
};
nasaApodWallpaper = pkgs.writeShellApplication { nasaApodWallpaper = pkgs.writeShellApplication {
name = "nasa-apod-wallpaper"; name = "nasa-apod-wallpaper";
runtimeInputs = [ runtimeInputs = [
@ -224,15 +210,6 @@ let
exec ${pkgs.zellij}/bin/zellij -l "$layout_file" exec ${pkgs.zellij}/bin/zellij -l "$layout_file"
''; '';
}; };
zellijPersistentSession = pkgs.writeShellApplication {
name = "zellij-persistent-session";
runtimeInputs = [ pkgs.zellij ];
text = ''
set -euo pipefail
exec ${pkgs.zellij}/bin/zellij attach --create main --force-run-commands
'';
};
zellijSyncTabName = pkgs.writeShellApplication { zellijSyncTabName = pkgs.writeShellApplication {
name = "zellij-sync-tab-name"; name = "zellij-sync-tab-name";
runtimeInputs = [ runtimeInputs = [
@ -313,7 +290,6 @@ in
"system-monitor@paradoxxx.zero.gmail.com" "system-monitor@paradoxxx.zero.gmail.com"
"clipboard-indicator@tudmotu.com" "clipboard-indicator@tudmotu.com"
"emoji-copy@felipeftn" "emoji-copy@felipeftn"
"tailscale-gnome-qs@tailscale-qs.github.io"
]; ];
}; };
}; };
@ -489,11 +465,9 @@ in
show_startup_tips = false; show_startup_tips = false;
show_release_notes = false; show_release_notes = false;
attach_to_session = true; attach_to_session = false;
session_name = "main"; on_force_close = "quit";
on_force_close = "detach"; session_serialization = false;
session_serialization = true;
serialize_pane_viewport = true;
ui = { ui = {
pane_frames = { pane_frames = {
@ -710,7 +684,7 @@ in
xdg.desktopEntries.kitty = { xdg.desktopEntries.kitty = {
name = "Kitty"; name = "Kitty";
genericName = "Terminal Emulator"; genericName = "Terminal Emulator";
exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijPersistentSession}/bin/zellij-persistent-session"; exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijNewTabZoxide}/bin/zellij-new-tab-zoxide";
icon = "kitty"; icon = "kitty";
type = "Application"; type = "Application";
categories = [ categories = [
@ -764,20 +738,15 @@ in
xdg.autostart = { xdg.autostart = {
enable = true; enable = true;
entries = [ entries = [
"${zenStartup}/share/applications/zen-startup.desktop" zenStartup
"${kittyZellijStartup}/share/applications/kitty-zellij-startup.desktop" kittyZellijStartup
"${signalStartup}/share/applications/signal-startup.desktop" signalStartup
"${betterbirdStartup}/share/applications/betterbird-startup.desktop" betterbirdStartup
"${vesktopStartup}/share/applications/vesktop-startup.desktop" vesktopStartup
"${zulipStartup}/share/applications/zulip-startup.desktop" zulipStartup
]; ];
}; };
home.file.".local/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io" = {
source = "${tailscaleQsExtension}/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io";
recursive = true;
};
systemd.user.services.nasa-apod-wallpaper = { systemd.user.services.nasa-apod-wallpaper = {
Unit = { Unit = {
Description = "Fetch NASA APOD wallpaper"; Description = "Fetch NASA APOD wallpaper";