diff --git a/configuration.nix b/configuration.nix index 5029856..9e7aded 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/home.nix b/home.nix index a334e3b..5e260f4 100644 --- a/home.nix +++ b/home.nix @@ -12,16 +12,16 @@ let zenStartup = pkgs.makeDesktopItem { name = "zen-startup"; desktopName = "Zen Startup"; - comment = "Launch Zen Browser"; - exec = "${config.programs.zen-browser.package}/bin/zen-beta"; + comment = "Launch Zen in fullscreen"; + exec = "${config.programs.zen-browser.package}/bin/zen --fullscreen"; terminal = false; categories = [ "Network" ]; }; kittyZellijStartup = pkgs.makeDesktopItem { name = "kitty-zellij-startup"; desktopName = "Kitty Zellij Startup"; - comment = "Open Kitty and attach to the main Zellij session"; - exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijPersistentSession}/bin/zellij-persistent-session"; + comment = "Open Kitty, pick a directory, and launch Zellij"; + exec = "${pkgs.kitty}/bin/kitty --start-as=fullscreen ${zellijNewTabZoxide}/bin/zellij-new-tab-zoxide"; terminal = false; categories = [ "TerminalEmulator" @@ -59,20 +59,6 @@ let terminal = false; 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 { name = "nasa-apod-wallpaper"; runtimeInputs = [ @@ -224,15 +210,6 @@ let 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 { name = "zellij-sync-tab-name"; runtimeInputs = [ @@ -313,7 +290,6 @@ in "system-monitor@paradoxxx.zero.gmail.com" "clipboard-indicator@tudmotu.com" "emoji-copy@felipeftn" - "tailscale-gnome-qs@tailscale-qs.github.io" ]; }; }; @@ -489,11 +465,9 @@ in show_startup_tips = false; show_release_notes = false; - attach_to_session = true; - session_name = "main"; - on_force_close = "detach"; - session_serialization = true; - serialize_pane_viewport = true; + attach_to_session = false; + on_force_close = "quit"; + session_serialization = false; ui = { pane_frames = { @@ -710,7 +684,7 @@ in xdg.desktopEntries.kitty = { name = "Kitty"; 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"; type = "Application"; categories = [ @@ -764,20 +738,15 @@ in xdg.autostart = { enable = true; entries = [ - "${zenStartup}/share/applications/zen-startup.desktop" - "${kittyZellijStartup}/share/applications/kitty-zellij-startup.desktop" - "${signalStartup}/share/applications/signal-startup.desktop" - "${betterbirdStartup}/share/applications/betterbird-startup.desktop" - "${vesktopStartup}/share/applications/vesktop-startup.desktop" - "${zulipStartup}/share/applications/zulip-startup.desktop" + zenStartup + kittyZellijStartup + signalStartup + betterbirdStartup + vesktopStartup + 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 = { Unit = { Description = "Fetch NASA APOD wallpaper";