docs: add org-roam

tao3k · Oct 9, 2023 · 2bd36be · 2bd36be
1 parent 516c0ca
commit 2bd36be
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 13 deletions.
diff --git a/.dir-locals.el b/.dir-locals.el
@@ -0,0 +1,14 @@
+;;; .dir-locals.el --- description -*- lexical-binding: t; -*-
+;;;
+((nil . ((eval . (setq org-roam-directory (concat (shell-command-to-string
+                                                   "git rev-parse --show-toplevel | tr -d '\n'")
+                                                  "/docs/org")))
+         (eval . (setq org-attach-id-dir (concat (shell-command-to-string
+                                                  "git rev-parse --show-toplevel | tr -d '\n'")
+                                                 "/docs/org/attach/")))
+         (eval . (setq org-roam-db-location (concat (shell-command-to-string
+                                                     "git rev-parse --show-toplevel | tr -d '\n'")
+                                                    "/.cache/org-roam.db")))))
+ (org-mode . ((org-tanglesync-mode . t)))
+ )
+;;;docs/org-mode-locals.el ends here
diff --git a/docs/org/homeModules.org b/docs/org/homeModules.org
@@ -0,0 +1,11 @@
+:PROPERTIES:
+:header-args: :noweb tangle :comments noweb :exports both
+:PRJ-DIR: ../../nixos/homeModules
+:ID:       84d2da32-5e9d-4bf0-9bec-7192415d8fe5
+:END:
+#+TITLE: homeModules
+#+AUTHOR: GuangTao Zhang
+#+EMAIL: gtrunsec@hardenedlinux.org
+#+DATE: 2023-10-08 Sun 21:22
+
+- tags :: [[id:6bb7d46d-7358-4110-a848-f68fffda5b4d][homeProfiles]]
diff --git a/docs/org/homeProfiles.org b/docs/org/homeProfiles.org
@@ -0,0 +1,49 @@
+:PROPERTIES:
+:header-args: :noweb tangle :comments noweb :exports both
+:PRJ-DIR: ../../nixos/homeProfiles
+:ID:       6bb7d46d-7358-4110-a848-f68fffda5b4d
+:END:
+#+TITLE: homeProfiles
+#+AUTHOR: GuangTao Zhang
+#+EMAIL: gtrunsec@hardenedlinux.org
+#+DATE: 2023-10-08 Sun 21:22
+
+- tags :: [[id:84d2da32-5e9d-4bf0-9bec-7192415d8fe5][homeModules]]
+
+** Suites
+*** shell
+
+#+begin_src nix :tangle (concat (org-entry-get nil "PRJ-DIR" t) "/shell.nix")
+{ root }:
+let
+  presets = root.presets;
+in
+with presets; {
+  default = [
+    zoxide
+    fzf
+    direnv
+    dircolors
+  ];
+
+  fileManager = [ yazi ];
+
+  modernTools = [
+    pls
+    # eza
+  ];
+}
+#+end_src
+
+*** audio
+:PROPERTIES:
+:ID:       28ab95ad-1c3f-4bab-b23c-c9c6e18beacc
+:END:
+
+- https://github.com/musnix/musnix
+
+* presets
+:PROPERTIES:
+:ID:       8cb3750b-c465-4674-8d38-7a3b4cf6d1dc
+:END:
+
diff --git a/docs/org/nixosProfiles.org b/docs/org/nixosProfiles.org
@@ -0,0 +1,9 @@
+:PROPERTIES:
+:ID:       55e5de92-922e-4e91-aa8c-c8121545aac8
+:END:
+#+TITLE: nixosProfiles
+#+AUTHOR: GuangTao Zhang
+#+EMAIL: gtrunsec@hardenedlinux.org
+#+DATE: 2023-10-08 Sun 22:00
+
+- tags :: [[id:50ab7f73-4fae-481b-8987-6e206a9d8f95][homeProfiles]]
diff --git a/nixos/homeProfiles/presets/yazi.nix b/nixos/homeProfiles/presets/yazi.nix
@@ -0,0 +1,9 @@
+{
+  programs.yazi = {
+    enable = true;
+    enableBashIntegration = lib.mkIf config.programs.bash.enable true;
+    enableZshIntegration = lib.mkIf config.programs.zsh.enable true;
+    enableFishIntegration = lib.mkIf config.programs.fish.enable true;
+    enableNushellIntegration = lib.mkIf config.programs.nushell.enable true;
+  };
+}
diff --git a/nixos/homeProfiles/shell.nix b/nixos/homeProfiles/shell.nix
@@ -1,11 +1,21 @@
+# [[file:../../docs/org/homeProfiles.org::*shell][shell:1]]
+{ root }:
 let
   presets = root.presets;
 in
-{
+with presets; {
   default = [
-    presets.zoxide
-    presets.fzf
-    presets.direnv
-    presets.dircolors
+    zoxide
+    fzf
+    direnv
+    dircolors
+  ];
+
+  fileManager = [ yazi ];
+
+  modernTools = [
+    pls
+    # eza
   ];
 }
+# shell:1 ends here
diff --git a/tests/nixos/__fixture/pops/nixosModules.nix b/tests/nixos/__fixture/pops/nixosModules.nix
@@ -11,14 +11,21 @@
               { selfModule' }:
               selfModule' (
                 m:
-                dmerge m {
-                  config.boot.contents = update [ 0 ] [ {
-                    content = {
-                      loader.timeout.content = 10;
-                      # loader.efi.canTouchEfiVariables = false;
-                    };
-                  } ];
-                }
+                dmerge
+                  (lib.removeAttrs m
+                    [
+                      # popup the imports, so that we can use own nixosModule
+                      # "imports"
+                    ]
+                  )
+                  {
+                    config.boot.contents = update [ 0 ] [ {
+                      content = {
+                        loader.timeout.content = 10;
+                        # loader.efi.canTouchEfiVariables = false;
+                      };
+                    } ];
+                  }
               );
             path = [ "boot" ];
           }) ];