From 84849d5b2db0f8bb2662c5e432fc98cc19005fd7 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Tue, 28 Jan 2025 19:55:21 +1100 Subject: [PATCH] userDirs: Summit init --- modules/home/base/userDirs.nix | 15 +++++++++------ .../home/workstation/productivity/obsidian.nix | 2 +- outputs/pkgs/ook-vim/config/plugins/notes.nix | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/home/base/userDirs.nix b/modules/home/base/userDirs.nix index 000a2f2..87bb54a 100644 --- a/modules/home/base/userDirs.nix +++ b/modules/home/base/userDirs.nix @@ -6,18 +6,21 @@ dataHome = "${config.home.homeDirectory}/.local/share"; stateHome = "${config.home.homeDirectory}/.local/state"; - userDirs = { + userDirs = let + summit = "${config.home.homeDirectory}/Summit"; + in { enable = true; createDirectories = true; desktop = "${config.home.homeDirectory}/Desktop"; - documents = "${config.home.homeDirectory}/Documents"; - music = "${config.home.homeDirectory}/Media/Music"; - videos = "${config.home.homeDirectory}/Media/Videos"; - pictures = "${config.home.homeDirectory}/Media/Pictures"; + documents = "${summit}/Documents"; + music = "${summit}/Media/Music"; + videos = "${summit}/Media/Videos"; + pictures = "${summit}/Media/Pictures"; extraConfig = { XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots"; - XDG_CODE_DIR = "${config.home.homeDirectory}/Code"; + XDG_CODE_DIR = "${summit}/code"; XDG_RECORDINGS_DIR = "${config.xdg.userDirs.videos}/Recordings"; + XDG_NOTES_DIR = "${summit}/notes"; }; }; }; diff --git a/modules/home/workstation/productivity/obsidian.nix b/modules/home/workstation/productivity/obsidian.nix index 8a6bc4f..b9a68b2 100644 --- a/modules/home/workstation/productivity/obsidian.nix +++ b/modules/home/workstation/productivity/obsidian.nix @@ -10,7 +10,7 @@ # admin = osConfig.ooknet.host.admin; # TODO: use admin.githubUsername notesRepo = "git@github.com:ooks-io/notes.git"; - notesPath = "${config.xdg.userDirs.documents}/notes"; + notesPath = "${config.xdg.userDirs.extraConfig.XDG_NOTES_DIR}"; in { config = mkIf (elem "productivity" profiles) { home.packages = [pkgs.obsidian]; diff --git a/outputs/pkgs/ook-vim/config/plugins/notes.nix b/outputs/pkgs/ook-vim/config/plugins/notes.nix index ef417de..1f0767a 100644 --- a/outputs/pkgs/ook-vim/config/plugins/notes.nix +++ b/outputs/pkgs/ook-vim/config/plugins/notes.nix @@ -4,12 +4,12 @@ obsidianExtended = { enable = true; setupOpts = { - dir = "~/Documents/notes"; + dir = "~/Summit/notes"; daily_notes = { - folder = "~/Documents/notes/dailies"; + folder = "~/Summit/notes/dailies"; }; templates = { - folder = "~/Documents/notes/templates"; + folder = "~/Summit/notes/templates"; }; ui.enable = false; };