diff --git a/README.md b/README.md index 21a2046..9299803 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Config lives inline in modules/ — as program options or Nix strings — and is delivered through the store: read-only, rollback-able, matching the flake revision. `config/` holds only the out-of-store exceptions, where the app owns the file — it rewrites it, edits it from its UI, or needs a -live edit loop (nvim, Zed, Logseq CSS, agent settings). +live edit loop (nvim, Zed, agent settings). Claude and pi `settings.json` are tracked but locally marked `skip-worktree` because the agents rewrite them during normal use. To diff --git a/config/logseq/custom.css b/config/logseq/custom.css deleted file mode 100644 index 8a73e7b..0000000 --- a/config/logseq/custom.css +++ /dev/null @@ -1,75 +0,0 @@ -/* Nightfox for Logseq: Duskfox (dark) / Dawnfox (light), to match ghostty/nvim. - This build resolves surfaces through radix tokens (--lx-gray-*, --lx-accent-*) - and the shadcn --primary/--accent HSLs; the legacy --ls-* vars are only dead - fallbacks. So the ramps below are the levers, forced with !important to beat - the app's html[data-theme=x][data-color=y] defaults regardless of accent. */ - -html[data-theme="dark"] { - --lx-gray-01: #191726 !important; - --lx-gray-02: #232136 !important; - --lx-gray-03: #2d2a45 !important; - --lx-gray-04: #373354 !important; - --lx-gray-05: #433c59 !important; - --lx-gray-06: #4b4673 !important; - --lx-gray-07: #63577d !important; - --lx-gray-08: #6e6a86 !important; - --lx-gray-09: #817c9c !important; - --lx-gray-10: #938eb0 !important; - --lx-gray-11: #cdcbe0 !important; - --lx-gray-12: #e0def4 !important; - - --lx-accent-03: #2d3a45 !important; - --lx-accent-04: #33454f !important; - --lx-accent-05: #3a4f5a !important; - --lx-accent-09: #569fba !important; - --lx-accent-10: #65b1cd !important; - --lx-accent-11: #9ccfd8 !important; - --lx-accent-12: #c9e5ea !important; - - --primary: 197 40% 53% !important; - --accent: 197 40% 53% !important; - --ring: 197 40% 60% !important; - --primary-foreground: 249 34% 16% !important; - --accent-foreground: 249 34% 16% !important; - - --ls-selection-background-color: #433c59 !important; - --ls-page-inline-code-color: #ea9a97 !important; - --ls-page-mark-color: #232136 !important; - --ls-page-mark-bg-color: #f6c177 !important; - --ls-cloze-text-color: #eb6f92 !important; -} - -html[data-theme="light"] { - --lx-gray-01: #faf4ed !important; - --lx-gray-02: #f4eee7 !important; - --lx-gray-03: #ebe5df !important; - --lx-gray-04: #ebe0df !important; - --lx-gray-05: #ebdfe4 !important; - --lx-gray-06: #ded7cf !important; - --lx-gray-07: #d0d8d8 !important; - --lx-gray-08: #bdbfc9 !important; - --lx-gray-09: #b8cece !important; - --lx-gray-10: #a8a3b3 !important; - --lx-gray-11: #625c87 !important; - --lx-gray-12: #575279 !important; - - --lx-accent-03: #dbe7e9 !important; - --lx-accent-04: #cfe0e3 !important; - --lx-accent-05: #c2d8dc !important; - --lx-accent-09: #56949f !important; - --lx-accent-10: #4a838d !important; - --lx-accent-11: #286983 !important; - --lx-accent-12: #1c4a5e !important; - - --primary: 197 53% 33% !important; - --accent: 197 53% 33% !important; - --ring: 197 40% 45% !important; - --primary-foreground: 37 44% 96% !important; - --accent-foreground: 37 44% 96% !important; - - --ls-selection-background-color: #d0d8d8 !important; - --ls-page-inline-code-color: #d7827e !important; - --ls-page-mark-color: #faf4ed !important; - --ls-page-mark-bg-color: #ea9d34 !important; - --ls-cloze-text-color: #b4637a !important; -} diff --git a/hosts/cm.nix b/hosts/cm.nix index 7a8ecd1..fcecc24 100644 --- a/hosts/cm.nix +++ b/hosts/cm.nix @@ -44,14 +44,12 @@ ../modules/zed.nix ../modules/ssh.nix ../modules/fonts.nix - ../modules/logseq.nix ../modules/macos-defaults.nix ../modules/kubernetes.nix ../modules/vault.nix ../modules/redocly.nix { my.userEmail = "pawel.pacana@chattermill.io"; - my.logseqGraphs = [ "Documents/CM" ]; programs.git.settings.init.defaultBranch = "main"; # work convention } ]; diff --git a/hosts/pro.nix b/hosts/pro.nix index 6a94a55..e90e3ea 100644 --- a/hosts/pro.nix +++ b/hosts/pro.nix @@ -65,16 +65,11 @@ ../modules/zed.nix ../modules/ssh.nix ../modules/fonts.nix - ../modules/logseq.nix ../modules/macos-defaults.nix ../modules/history.nix # iCloud-backed; this account only ../modules/lima.nix { my.limaVms = [ "nixden" ]; # aliased in ssh config; declared in vms below - my.logseqGraphs = [ - "Notes/mostlyobvious" - "Notes/hraba.gs" - ]; } ]; }; @@ -96,7 +91,6 @@ ../modules/zed.nix ../modules/ssh.nix ../modules/fonts.nix - ../modules/logseq.nix ../modules/macos-defaults.nix ../modules/kubernetes.nix ../modules/vault.nix @@ -104,7 +98,6 @@ { my.dotfilesDir = "/Users/cm/dotfiles"; my.userEmail = "pawel.pacana@chattermill.io"; - my.logseqGraphs = [ "Documents/CM" ]; programs.git.settings.init.defaultBranch = "main"; # work convention } ]; diff --git a/modules/core.nix b/modules/core.nix index 73926fa..ce68872 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -31,13 +31,6 @@ description = "Lima VM instance names to alias in SSH config; set by the host file that declares the VMs."; }; - # Logseq loads custom.css per graph, hence a list rather than one path. - options.my.logseqGraphs = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Home-relative Logseq graph directories to theme."; - }; - config = { home.username = username; home.homeDirectory = lib.mkDefault ( diff --git a/modules/logseq.nix b/modules/logseq.nix deleted file mode 100644 index 676c761..0000000 --- a/modules/logseq.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, ... }: - -let - # Out-of-store so the app can rewrite it in place; Logseq has no global - # custom.css, so it is linked into each graph's own logseq/ dir. - css = config.lib.file.mkOutOfStoreSymlink "${config.my.dotfilesDir}/config/logseq/custom.css"; -in -{ - home.file = builtins.listToAttrs ( - map (graph: { - name = "${graph}/logseq/custom.css"; - value.source = css; - }) config.my.logseqGraphs - ); -}