From 2179dbf1d85dc685bdb8899438e78cbcf18f0c92 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Sat, 4 Jan 2025 13:52:21 +0100
Subject: [PATCH 1/3] calendar

---
 git-crypt/secrets.nix     | Bin 3313 -> 3512 bytes
 home-modules/calendar.nix |  81 ++++++++++++++++++++++++++++++++++++++
 home.nix                  |   2 +-
 3 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 home-modules/calendar.nix

diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix
index 1dfe29274fd144cc6f24790a413048dc41c9be67..d500f2ebb8888408f3b786a9c620ec0d9463a538 100755
GIT binary patch
literal 3512
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
RkF5z6R8u>*`}+2yM*szd+tmO7

literal 3313
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
PwEr##ht13)$8Y`sdR~7U

diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix
new file mode 100644
index 0000000..aa168c1
--- /dev/null
+++ b/home-modules/calendar.nix
@@ -0,0 +1,81 @@
+{ config, lib, user, secrets, domain, ... }: let 
+  calendars = [
+    {
+      name = "Preservation";
+      primary = true;
+      url = "https://dav.${domain}/nx2/preservation/";
+      color = "#dddddd";
+    }
+    {
+      name = "Effort";
+      primary = false;
+      url = "https://dav.${domain}/nx2/effort/";
+      color = "#dd2222";
+    }
+    {
+      name = "Experience";
+      primary = false;
+      url = "https://dav.${domain}/nx2/experience/";
+      color = "#2222dd";
+    }
+    {
+      name = "Exposure";
+      primary = false;
+      url = "https://dav.${domain}/nx2/exposure/";
+      color = "#22aa22";
+    }
+    {
+      name = "Engagement";
+      primary = false;
+      url = "https://dav.${domain}/nx2/engagement/";
+      color = "#8800CC";
+    }
+  ];
+in {
+  accounts.calendar.accounts = let
+    makeCalendar = url: primary: color: {
+      inherit primary;
+      remote = {
+        type = "caldav";
+        userName = user;
+        inherit url;
+      };
+    };
+    m = cc: lib.attrsets.mergeAttrsList ( map (c: { "${c.name}" = makeCalendar c.url c.primary c.color;}) cc );
+  in m calendars;
+
+
+  # TODO: Replace this once https://github.com/nix-community/home-manager/pull/5484 is merged.
+  # Make sure it works, though, including the order of calendars.
+  programs.thunderbird.settings = let
+
+    makeThunderbirdCalendar = cal: let
+      calendarAccountSafeName = (builtins.replaceStrings ["."] ["-"]) cal.name;
+    in {
+      "calendar.registry.${calendarAccountSafeName}.cache.enabled" = true;
+      "calendar.registry.${calendarAccountSafeName}.calendar-main-default" = cal.primary;
+      "calendar.registry.${calendarAccountSafeName}.calendar-main-in-composite" = true;
+      "calendar.registry.${calendarAccountSafeName}.color" = cal.color;
+      "calendar.registry.${calendarAccountSafeName}.name" = cal.name;
+      "calendar.registry.${calendarAccountSafeName}.type" = "caldav";
+      "calendar.registry.${calendarAccountSafeName}.uri" = config.accounts.calendar.accounts.${cal.name}.remote.url;
+      "calendar.registry.${calendarAccountSafeName}.username" = config.accounts.calendar.accounts.${cal.name}.remote.userName;
+    };
+  in lib.attrsets.mergeAttrsList (
+    map (cal: makeThunderbirdCalendar cal) calendars
+  ) // {
+
+    "calendar.registry.sleep-as-android.cache.enabled" = true;
+    "calendar.registry.sleep-as-android.calendar-main-in-composite" = true;
+    "calendar.registry.sleep-as-android.color" = "#222233";
+    "calendar.registry.sleep-as-android.name" = "Sleep As Android";
+    "calendar.registry.sleep-as-android.type" = "ics";
+    "calendar.registry.sleep-as-android.readOnly" = true;
+    "calendar.registry.sleep-as-android.uri" = secrets.calendar.sleep-as-android-url;
+  
+    "calendar.list.sortOrder" = lib.fold (cal: acc: cal.name + " " + acc) "" calendars;
+
+    # Keep these after removing the above.
+    "calendar.week.start" = 1;
+  };
+}
diff --git a/home.nix b/home.nix
index ff7b659..45f0168 100644
--- a/home.nix
+++ b/home.nix
@@ -4,6 +4,7 @@
     ./home-modules/auto-mount.nix
     ./home-modules/bash.nix
     ./home-modules/bitwarden.nix
+    ./home-modules/calendar.nix
     ./home-modules/chatterino.nix
     ./home-modules/color-pallete.nix
     ./home-modules/direnv.nix
@@ -99,7 +100,6 @@
     ghostscript
     
     inputs.zen-browser.packages."${system}".default
-    gnome-calendar
     
   ] ++ (with pkgs-unstable; [
     obsidian

From aea641cd9cb7ef34eb2305b323d45831af4d0eae Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Sat, 4 Jan 2025 13:52:34 +0100
Subject: [PATCH 2/3] no helix bg

---
 home-modules/helix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-modules/helix.nix b/home-modules/helix.nix
index 6f9ca76..70ee40f 100644
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -235,7 +235,7 @@
         };
 
         "ui.background" = { # general background of the editor window
-          "bg" = background;
+          # "bg" = background;
         };
         "ui.bufferline" = { # the top line ("tab"-line)
           "fg" = accent.base;

From c381580cca1a98e2548e20f79f6c6223c196e822 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Sat, 4 Jan 2025 13:53:06 +0100
Subject: [PATCH 3/3] fix hyprland-autoname-workspaces

---
 home-modules/hyprland-autoname-workspaces.nix | 143 +++++++++---------
 home-modules/hyprland.nix                     |   8 +-
 2 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/home-modules/hyprland-autoname-workspaces.nix b/home-modules/hyprland-autoname-workspaces.nix
index 4621dd2..c7bf7c0 100755
--- a/home-modules/hyprland-autoname-workspaces.nix
+++ b/home-modules/hyprland-autoname-workspaces.nix
@@ -2,61 +2,78 @@
 {
   home = {
     packages = with pkgs; [ hyprland-autoname-workspaces ];
-    file.".config/hyprland-autoname-workspaces/config.toml".text = ''
-      version = "1.1.14"
+    file.".config/hyprland-autoname-workspaces/config.toml".text = let 
+      icons = /* toml */ ''
+        DEFAULT = "{class}"
+        "Alacritty"             = ""
+        "Bitwarden"             = ""
+        "blueman-manager"       = "󰂯"
+        "chatterino"            = ""
+        "Chromium"              = ""
+        "code"                  = "󰨞"
+        "code-oss"              = "󰨞"
+        "codium"                = "󰨞"
+        "codium-url-handler"    = "󰨞"
+        "com.mitchellh.ghostty" = "󰊠"
+        "com.obsproject.Studio" = ""
+        "discord"               = "󰙯"
+        "Element"               = "󰘨"
+        "epicgameslauncher.exe" = "󰯷"
+        ".*.exe"                = ""
+        "firefox"               = "󰈹"
+        "galaxyclient.exe"      = "󰮡"
+        "Gimp-.*"               = ""
+        "KiCad"                 = ""
+        "kitty"                 = ""
+        "libreoffice-calc"      = ""
+        "libreoffice-writer"    = ""
+        "lutris"                = "󰊗"
+        "mpv"                   = ""
+        "obsidian"              = "󰠮"
+        "org.inkscape.Inkscape" = "󰕙"
+        "org.remmina.Remmina"   = "󰢹"
+        "pavucontrol"           = "󰕾"
+        "pcbnew"                = ""
+        "Signal"                = "󱅵"
+        "spotify"               = ""
+        "Spotify"               = ""
+        "steam"                 = "󰓓"
+        "thunar"                = ""
+        "thunderbird"           = ""
+        "Tor Browser"           = "󰾔"
+        "vesktop"               = "󰙯"
+        "virt-manager"          = ""
+        "VirtualBox"            = ""
+        "VirtualBox Machine"    = ""
+        "VirtualBox Manager"    = ""
+        "VSCodium"              = "󰨞"
+        "zathura"               = "󰈦"
+        "zoom"                  = "󰬡"
+      '';
+    in /* toml */ ''
+      version = "1.1.15"
+
+      [format]
+      dedup                     = false
+      dedup_inactive_fullscreen = false
+      delim                     = " "
+      workspace                 = "{id}:{clients}"
+      workspace_empty           = "{id}"
+      client                    = "{icon}"
+      client_fullscreen         = "F{icon}"
+      client_active             = "<u>{icon}</u>"
+      client_dup                = "{icon}x{counter}"
+      client_dup_active         = "<u>{icon}</u>{delim}{icon}x{counter_unfocused}"
+      client_dup_fullscreen     = "F{icon}{delim}{icon}x{counter_unfocused}"
+
+      [exclude]
+      "steam" = "^(Friends List.*)?$"
+      "fcitx" = ".*"
 
       [class]
-      VirtualBox = ""
-      steam = "󰓓"
-      "VirtualBox Manager" = ""
-      "com.obsproject.Studio" = ""
-      "[Ff]irefox" = "󰈹"
-      "[Tt]hunderbird" = ""
-      pcbnew = ""
-      ".*.exe" = ""
-      Element = "󰘨"
-      Signal = "󱅵"
-      Gimp = ""
-      VSCodium = "󰨞"
-      "[sS]potify" = ""
-      virt-manager = ""
-      lutris = "󰊗"
-      DEFAULT = "{class}"
-      "epicgameslauncher.exe" = "󰯷"
-      "[Cc]ode" = "󰨞"
-      "galaxyclient.exe" = "󰮡"
-      pavucontrol = "󰕾"
-      "Tor Browser" = "󰾔"
-      mpv = ""
-      chatterino = ""
-      libreoffice-writer = ""
-      kitty = ""
-      "com.michellh.ghostty" = "󰊠"
-      "cyberpunk2077.exe" = "󰾲"
-      KiCad = ""
-      "[tT]hunar" = ""
-      "riotclientux.exe" = "󰰌"
-      libreoffice-calc = ""
-      "org.remmina.Remmina" = "󰢹"
-      "org.inkscape.Inkscape" = "󰕙"
-      "VirtualBox Machine" = ""
-      Bitwarden = ""
-      "[gG]imp-.*" = ""
-      Chromium = ""
-      obsidian = "󰠮"
-      "leagueclientux.exe" = "󰰌"
-      zathura = "󰈦"
-      code-oss = "󰨞"
-      codium-url-handler = "󰨞"
-      discord = "󰙯"
-      vesktop = "󰙯"
-      blueman-manager = "󰂯"
-      Alacritty = ""
-      zoom = "󰬡"
-      spotify = ""
+      ${icons}
 
       [class_active]
-      "(?i)ExampleOneTerm" = "icon"
 
       [initial_class]
 
@@ -74,35 +91,11 @@
 
       [initial_title_in_class]
 
-      [initial_title]
-      "Spotify Premium" = ""
-
       [initial_title_in_class_active]
 
       [initial_title_in_initial_class]
 
       [initial_title_in_initial_class_active]
-
-      [exclude]
-      aProgram = "^$"
-      "" = "^$"
-      "(?i)fcitx" = ".*"
-      "[Ss]team" = "^(Friends List.*)?$"
-      "explorer.exe" = ".*"
-      "(?i)TestApp" = ""
-
-      [format]
-      dedup = false
-      dedup_inactive_fullscreen = false
-      delim = " "
-      workspace = "{id}:{clients}"
-      workspace_empty = "{id}"
-      client = "{icon}"
-      client_fullscreen = "{icon}"
-      client_active = "{icon}"
-      client_dup = "{icon}{counter_sup}"
-      client_dup_active = "*{icon}*{delim}{icon}{counter_unfocused_sup}"
-      client_dup_fullscreen = "[{icon}]{delim}{icon}{counter_unfocused_sup}"
     '';
   };
 }
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index f587c57..9cd41eb 100755
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -343,8 +343,8 @@ in {
         # "SUPER,       F4,"
         "SUPER,       F5, exec, nx_gcal_event force-lookup"
         "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate"
-        "SUPER,       F6, exec, ${terminal} -e 'htop'"
-        "SUPER,       F7, exec, ${terminal} -e 'nmtui'"
+        "SUPER,       F6, exec, ${terminal-exec}'htop'"
+        "SUPER,       F7, exec, ${terminal-exec}'nmtui'"
         ''SUPER,       F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs -d '\n' swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 --transition-duration 2''
         "SUPER,       F9, execr, waybar_mode set '󰸉 '"
         "SUPER,       F9, submap, color"
@@ -352,7 +352,7 @@ in {
         "SUPER,       F11, exec, waybar"
         "SUPER SHIFT, F11, exec, pkill waybar "
         "SUPER,       F12, exec, hyprland-autoname-workspaces"
-        "SUPER SHIFT, F12, exec, pkill -9 hyprland-autoname-workspaces  "
+        "SUPER SHIFT, F12, exec, pkill -9 hyprland-aut"
 
         ###########################################################################
         ## ROW 1:
@@ -399,7 +399,7 @@ in {
         # "SUPER,       T, exec, alacritty"
         # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
         "SUPER,       T, exec, SESSION_FROM_DE=TRUE ${terminal}"
-        "SUPER SHIFT, T, exec, ${terminal-exec} sh -c 'ssh nxace'"
+        "SUPER SHIFT, T, exec, ${terminal-exec}'ssh nxace'"
         "SUPER,       Z, exec, waybar_mode set ' '"
         "SUPER,       Z, submap, tuda"
         "SUPER,       U, exec, thunderbird "