From 5dd1d2b29691fa78f59fca657cfc9031b14e9396 Mon Sep 17 00:00:00 2001 From: Jelle Spreeuwenberg Date: Wed, 9 Sep 2026 17:32:08 +0200 Subject: [PATCH] feat: align workspace navigation with relocated projects Use ~/yookr/projects for company repositories and ~/projects for personal groups. Add the company-root Walker entry, apply work Git identity below ~/yookr, and remove Bruno synchronization. Filesystem relocation was previously completed on Zenith only; other hosts require their own relocation before adopting these shared paths. --- modules/capabilities/desktop-defaults.nix | 2 +- modules/capabilities/git.nix | 2 +- modules/capabilities/syncthing.nix | 9 --------- modules/capabilities/walker.nix | 22 +++++++++++++++++----- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/capabilities/desktop-defaults.nix b/modules/capabilities/desktop-defaults.nix index a36f027..0f01e9d 100644 --- a/modules/capabilities/desktop-defaults.nix +++ b/modules/capabilities/desktop-defaults.nix @@ -175,7 +175,7 @@ download = "${homeDir}/downloads"; documents = "${homeDir}/documents"; - projects = "${homeDir}/dev"; + projects = "${homeDir}/projects"; music = "${mediaDir}/music"; pictures = "${mediaDir}/images"; videos = "${mediaDir}/videos"; diff --git a/modules/capabilities/git.nix b/modules/capabilities/git.nix index a96140e..28d7eb7 100644 --- a/modules/capabilities/git.nix +++ b/modules/capabilities/git.nix @@ -79,7 +79,7 @@ in contents = personal.git; } { - condition = "gitdir:${config.xdg.userDirs.projects}/work/"; + condition = "gitdir:${config.home.homeDirectory}/yookr/"; contents = work.git; } { diff --git a/modules/capabilities/syncthing.nix b/modules/capabilities/syncthing.nix index b2eaba4..49064d8 100644 --- a/modules/capabilities/syncthing.nix +++ b/modules/capabilities/syncthing.nix @@ -41,15 +41,6 @@ in devices = builtins.attrNames syncDevices; ignorePatterns = [ "**/.zk" ]; }; - bruno = { - path = - if config.facts.machine.name == "orion" then - "${config.home.homeDirectory}/bruno" - else - "${config.xdg.userDirs.projects}/bruno"; - label = "bruno"; - devices = builtins.attrNames syncDevices; - }; }; devices = syncDevices; }; diff --git a/modules/capabilities/walker.nix b/modules/capabilities/walker.nix index 9613d46..db5d15c 100644 --- a/modules/capabilities/walker.nix +++ b/modules/capabilities/walker.nix @@ -24,14 +24,19 @@ }: let homeDir = config.home.homeDirectory; - projectRoots = + projectRoots = [ + { + scope = "work"; + path = "${homeDir}/yookr/projects"; + } + ] + ++ map (scope: { inherit scope; - path = "${homeDir}/dev/${scope}"; + path = "${config.xdg.userDirs.projects}/${scope}"; }) [ - "work" "own" "ext" "forks" @@ -67,7 +72,7 @@ xdg.configFile."elephant/menus/projects.lua".text = '' Name = "projects" NamePretty = "Projects" - Description = "Git repositories" + Description = "Projects and workspaces" Icon = "folder" Action = "${lib.getExe openProject}" SearchName = true @@ -90,7 +95,14 @@ end function GetEntries() - local entries = {} + local entries = { + { + Text = "Yookr", + Subtext = "Company workspace", + Value = "${homeDir}/yookr", + Keywords = { "work", "company", "workbench" }, + }, + } for _, root in ipairs(roots) do local handle = repositories(root.path)