diff --git a/SwarselSystems.org b/SwarselSystems.org index 83995c7..cf6371f 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -5374,12 +5374,12 @@ Here I disable global completion to prevent redundant compinit calls and cache i id = "default"; }; "Obsidian" = { - path = "${homeDir}/Nextcloud/Obsidian"; + path = "${homeDir}/Obsidian"; inherit devices; id = "yjvni-9eaa7"; }; "Org" = { - path = "${homeDir}/Nextcloud/Org"; + path = "${homeDir}/Org"; inherit devices; id = "a7xnl-zjj3d"; }; @@ -19849,13 +19849,13 @@ This part of the configuration mostly makes some aesthetic changes, enables neat (defun swarsel/org-agenda-done-and-archive () "Mark TODO at point as DONE, archive it, and save all agenda files." (interactive) - (let ((org-archive-location "~/Nextcloud/Org/Archive.org::Archive")) + (let ((org-archive-location "~/Org/Archive.org::Archive")) (org-agenda-todo "DONE") (org-agenda-archive) (dolist (buf (buffer-list)) (with-current-buffer buf (when (and buffer-file-name - (string-prefix-p (expand-file-name "~/Nextcloud/Org/") (file-truename buffer-file-name)) + (string-prefix-p (expand-file-name "~/Org/") (file-truename buffer-file-name)) (derived-mode-p 'org-mode)) (save-buffer)))))) @@ -19884,14 +19884,14 @@ This part of the configuration mostly makes some aesthetic changes, enables neat (setq org-image-actual-width nil) (setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))) - (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org" - "/home/swarsel/Nextcloud/Org/Archive.org" + (setq org-agenda-files '("/home/swarsel/Org/Tasks.org" + "/home/swarsel/Org/Archive.org" )) (setq org-capture-templates - '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox") + '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox") "* TODO %?\n %i\n %a") - ("j" "Journal" entry (file+datetree "~/Nextcloud/Org/Journal.org") + ("j" "Journal" entry (file+datetree "~/Org/Journal.org") "* %?\nEntered on %U\n %i\n %a"))) (setq org-refile-targets diff --git a/files/emacs/init.el b/files/emacs/init.el index 7f8999a..935c1ee 100644 --- a/files/emacs/init.el +++ b/files/emacs/init.el @@ -807,13 +807,13 @@ create a new one." (defun swarsel/org-agenda-done-and-archive () "Mark TODO at point as DONE, archive it, and save all agenda files." (interactive) - (let ((org-archive-location "~/Nextcloud/Org/Archive.org::Archive")) + (let ((org-archive-location "~/Org/Archive.org::Archive")) (org-agenda-todo "DONE") (org-agenda-archive) (dolist (buf (buffer-list)) (with-current-buffer buf (when (and buffer-file-name - (string-prefix-p (expand-file-name "~/Nextcloud/Org/") (file-truename buffer-file-name)) + (string-prefix-p (expand-file-name "~/Org/") (file-truename buffer-file-name)) (derived-mode-p 'org-mode)) (save-buffer)))))) @@ -842,14 +842,14 @@ create a new one." (setq org-image-actual-width nil) (setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\["))) - (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org" - "/home/swarsel/Nextcloud/Org/Archive.org" + (setq org-agenda-files '("/home/swarsel/Org/Tasks.org" + "/home/swarsel/Org/Archive.org" )) (setq org-capture-templates - '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox") + '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox") "* TODO %?\n %i\n %a") - ("j" "Journal" entry (file+datetree "~/Nextcloud/Org/Journal.org") + ("j" "Journal" entry (file+datetree "~/Org/Journal.org") "* %?\nEntered on %U\n %i\n %a"))) (setq org-refile-targets diff --git a/index.html b/index.html index 8e78e79..11c1d62 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configurationo @@ -443,8 +443,8 @@
  • 3.2.5.8. Hibernation
  • 3.2.5.9. BTRFS
  • 3.2.5.10. work
  • -
  • 3.2.5.11. microvm-host
  • -
  • 3.2.5.12. microvm-guest
  • +
  • 3.2.5.11. microvm-host
  • +
  • 3.2.5.12. microvm-guest
  • @@ -494,12 +494,12 @@
  • 3.3.1.30.3. Mako
  • 3.3.1.30.4. SwayOSD
  • 3.3.1.30.5. yubikey-touch-detector
  • -
  • 3.3.1.30.6. blueman-applet
  • -
  • 3.3.1.30.7. network-manager-applet
  • -
  • 3.3.1.30.8. obsidian service for tray
  • -
  • 3.3.1.30.9. anki service for tray
  • -
  • 3.3.1.30.10. element service for tray
  • -
  • 3.3.1.30.11. vesktop service for tray
  • +
  • 3.3.1.30.6. blueman-applet
  • +
  • 3.3.1.30.7. network-manager-applet
  • +
  • 3.3.1.30.8. obsidian service for tray
  • +
  • 3.3.1.30.9. anki service for tray
  • +
  • 3.3.1.30.10. element service for tr
  • +
  • 3.3.1.30.11. vesktop service for tray
  • 3.3.1.31. Sway
  • @@ -508,6 +508,7 @@
  • 3.3.1.34. gpg-agent
  • 3.3.1.35. gammastep
  • 3.3.1.36. Spicetify
  • +
  • 3.3.1.37. Obsidian
  • 3.3.2. Server @@ -572,7 +573,7 @@
  • 3.5.31. swarsel-build
  • 3.5.32. swarsel-instantiate
  • 3.5.33. sshrm
  • -
  • 3.5.34. endme
  • +
  • 3.5.34. endme
  • 3.6. Profiles @@ -581,7 +582,7 @@ @@ -1338,6 +1339,7 @@ This provides devshell support for flake-parts
  • nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; systems.url = "github:nix-systems/default"; swarsel-modules.url = "github:Swarsel/swarsel-modules/main"; + swarsel-nix.url = "github:Swarsel/swarsel-nix/main"; home-manager = { url = "github:nix-community/home-manager"; # url = "github:Swarsel/home-manager/module/pizauth"; @@ -2590,6 +2592,12 @@ in }; }; + swarsel-nix = final: prev: { + swarsel-nix = import inputs.swarsel-nix { + pkgs = prev; + }; + }; + zjstatus = _: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }; @@ -2602,6 +2610,7 @@ in // (nixpkgs-kernel final prev) // (nixpkgs-stable24_05 final prev) // (nixpkgs-stable24_11 final prev) + // (swarsel-nix final prev) // (zjstatus final prev) // (inputs.niri-flake.overlays.niri final prev) // (inputs.vbc-nix.overlays.default final prev) @@ -6212,7 +6221,7 @@ in wifi = { # mac-address-blacklist = ""; mode = "infrastructure"; - band = "a"; + # band = "a"; ssid = wlan1; }; wifi-security = { @@ -6549,12 +6558,12 @@ in id = "default"; }; "Obsidian" = { - path = "${homeDir}/Nextcloud/Obsidian"; + path = "${homeDir}/Obsidian"; inherit devices; id = "yjvni-9eaa7"; }; "Org" = { - path = "${homeDir}/Nextcloud/Org"; + path = "${homeDir}/Org"; inherit devices; id = "a7xnl-zjj3d"; }; @@ -12090,8 +12099,8 @@ in -
    -
    3.2.5.11. microvm-host
    +
    +
    3.2.5.11. microvm-host

    Some standard options that should be set for every microvm host. @@ -12117,8 +12126,8 @@ Some standard options that should be set for every microvm host.

    -
    -
    3.2.5.12. microvm-guest
    +
    +
    3.2.5.12. microvm-guest

    Some standard options that should be set vor every microvm guest. We set the default @@ -12484,7 +12493,7 @@ This holds packages that I can use as provided, or with small modifications (as # nomacs libreoffice-qt xournalpp - obsidian + # obsidian # spotify vesktop # discord client # nextcloud-client # enables a systemd service that I do not want @@ -14815,8 +14824,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi

    -
    -
    3.3.1.30.6. blueman-applet
    +
    +
    3.3.1.30.6. blueman-applet
    { lib, config, ... }:
    @@ -14830,8 +14839,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
     
    -
    -
    3.3.1.30.7. network-manager-applet
    +
    +
    3.3.1.30.7. network-manager-applet
    { lib, config, ... }:
    @@ -14846,8 +14855,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
     
    -
    -
    3.3.1.30.8. obsidian service for tray
    +
    +
    3.3.1.30.8. obsidian service for tray
    { lib, config, pkgs, ... }:
    @@ -14881,8 +14890,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
     
    -
    -
    3.3.1.30.9. anki service for tray
    +
    +
    3.3.1.30.9. anki service for tray
    { lib, config, pkgs, ... }:
    @@ -14916,8 +14925,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
     
    -
    -
    3.3.1.30.10. element service for tray
    +
    +
    3.3.1.30.10. element service for tr
    { lib, config, pkgs, ... }:
    @@ -14951,8 +14960,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
     
    -
    -
    3.3.1.30.11. vesktop service for tray
    +
    +
    3.3.1.30.11. vesktop service for tray
    { lib, config, pkgs, ... }:
    @@ -15862,6 +15871,145 @@ in
     
    +
    +
    3.3.1.37. Obsidian
    +
    +
    +
    { inputs, lib, config, pkgs, nixosConfig ? config, ... }:
    +  let
    +    moduleName = "obsidian";
    +    inherit (nixosConfig.repo.secrets.common.obsidian) userIgnoreFilters;
    +  in
    +  {
    +    options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} with settings";
    +    config = lib.mkIf config.swarselmodules.${moduleName} {
    +      programs.obsidian =
    +        let
    +          name = "Main";
    +        in
    +        {
    +          enable = true;
    +          defaultSettings = {
    +            app = {
    +              attachmentFolderPath = "attachments";
    +              alwaysUpdateLinks = true;
    +              spellcheck = false;
    +              inherit userIgnoreFilters;
    +              vimMode = false;
    +              newFileLocation = "current";
    +            };
    +            corePlugins = [
    +              "backlink"
    +              "bookmarks"
    +              "canvas"
    +              "command-palette"
    +              "daily-notes"
    +              "editor-status"
    +              "file-explorer"
    +              "file-recovery"
    +              "global-search"
    +              "graph"
    +              "note-composer"
    +              "outgoing-link"
    +              "outline"
    +              "page-preview"
    +              "properties"
    +              "slides"
    +              "switcher"
    +              "tag-pane"
    +              "templates"
    +              "word-count"
    +            ];
    +            communityPlugins = with pkgs.swarsel-nix; [
    +              advanced-tables
    +              calendar
    +              file-hider
    +              linter
    +              omnisearch
    +              sort-and-permute-lines
    +              tag-wrangler
    +              tray
    +            ];
    +          };
    +          vaults = {
    +            ${name} = {
    +              target = "./Obsidian/${name}";
    +              settings = {
    +                appearance = {
    +                  baseFontSize = lib.mkForce 19;
    +                };
    +                communityPlugins = with pkgs.swarsel-nix; [
    +                  {
    +                    pkg = advanced-tables;
    +                    enable = true;
    +                  }
    +                  {
    +                    pkg = calendar;
    +                    enable = true;
    +                  }
    +                  {
    +                    pkg = sort-and-permute-lines;
    +                    enable = true;
    +                  }
    +                  {
    +                    pkg = tag-wrangler;
    +                    enable = true;
    +                  }
    +                  {
    +                    pkg = tray;
    +                    enable = true;
    +                    settings = {
    +                      launchOnStartup = false;
    +                      hideOnLaunch = true;
    +                      runInBackground = true;
    +                      hideTaskbarIcon = false;
    +                      createTrayIcon = true;
    +                    };
    +                  }
    +                  {
    +                    pkg = file-hider;
    +                    enable = true;
    +                    settings =
    +                      {
    +                        hidden = true;
    +                        hiddenList = [
    +                          "attachments"
    +                          "images"
    +                          "ltximg"
    +                          "logseq"
    +                        ];
    +                      };
    +                  }
    +                  {
    +                    pkg = linter;
    +                    enable = true;
    +                    settings = {
    +                      auto-correct-common-misspellings = {
    +                        skip-words-with-multiple-capitals = true;
    +                      };
    +                      convert-bullet-list-markers = {
    +                        enabled = true;
    +                      };
    +                    };
    +                  }
    +                  {
    +                    pkg = omnisearch;
    +                    enable = true;
    +                    settings = {
    +                      hideExcluded = true;
    +                    };
    +                  }
    +                ];
    +              };
    +            };
    +          };
    +        };
    +    };
    +  }
    +
    +
    +
    +

    3.3.2. Server

    @@ -18999,8 +19147,8 @@ writeShellApplication {
    -
    -

    3.5.34. endme

    +
    +

    3.5.34. endme

    Sometimes my DE crashes after putting it to suspend - to be precise, it happens when I put it into suspend when I have multiple screens plugged in. I have never taken the time to debug the issue, but instead just switch to a different TTY and then use this script to kill the hanging session. @@ -19160,8 +19308,8 @@ in

    -
    -
    3.6.1.3. Optionals
    +
    +
    3.6.1.3. Optionals
    { lib, config, ... }:
    @@ -19433,6 +19581,7 @@ in
           blueman-applet = lib.mkDefault true;
           nm-applet = lib.mkDefault true;
           obsidian-tray = lib.mkDefault true;
    +      obsidian = lib.mkDefault true;
           anki-tray = lib.mkDefault true;
           element-tray = lib.mkDefault true;
           vesktop-tray = lib.mkDefault true;
    @@ -21487,13 +21636,13 @@ This part of the configuration mostly makes some aesthetic changes, enables neat
     (defun swarsel/org-agenda-done-and-archive ()
       "Mark TODO at point as DONE, archive it, and save all agenda files."
       (interactive)
    -  (let ((org-archive-location "~/Nextcloud/Org/Archive.org::Archive"))
    +  (let ((org-archive-location "~/Org/Archive.org::Archive"))
         (org-agenda-todo "DONE")
         (org-agenda-archive)
         (dolist (buf (buffer-list))
           (with-current-buffer buf
             (when (and buffer-file-name
    -                   (string-prefix-p (expand-file-name "~/Nextcloud/Org/") (file-truename buffer-file-name))
    +                   (string-prefix-p (expand-file-name "~/Org/") (file-truename buffer-file-name))
                        (derived-mode-p 'org-mode))
               (save-buffer))))))
     
    @@ -21522,14 +21671,14 @@ This part of the configuration mostly makes some aesthetic changes, enables neat
       (setq org-image-actual-width nil)
       (setq org-format-latex-options '(:foreground "White" :background default :scale 2.0 :html-foreground "Black" :html-background "Transparent" :html-scale 1.0 :matchers ("begin" "$1" "$" "$$" "\\(" "\\[")))
     
    -  (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org"
    -                           "/home/swarsel/Nextcloud/Org/Archive.org"
    +  (setq org-agenda-files '("/home/swarsel/Org/Tasks.org"
    +                           "/home/swarsel/Org/Archive.org"
                                ))
     
       (setq org-capture-templates
    -        '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox")
    +        '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox")
                "* TODO %?\n  %i\n  %a")
    -          ("j" "Journal" entry (file+datetree "~/Nextcloud/Org/Journal.org")
    +          ("j" "Journal" entry (file+datetree "~/Org/Journal.org")
                "* %?\nEntered on %U\n  %i\n  %a")))
     
       (setq org-refile-targets
    @@ -26218,7 +26367,7 @@ similarly, there exists an version that starts from the right.
     

    Author: Leon Schwarzäugl

    -

    Created: 2025-10-07 Di 21:23

    +

    Created: 2025-10-09 Do 00:17

    Validate

    diff --git a/modules/nixos/client/syncthing.nix b/modules/nixos/client/syncthing.nix index d7ca383..3410f77 100644 --- a/modules/nixos/client/syncthing.nix +++ b/modules/nixos/client/syncthing.nix @@ -27,12 +27,12 @@ in id = "default"; }; "Obsidian" = { - path = "${homeDir}/Nextcloud/Obsidian"; + path = "${homeDir}/Obsidian"; inherit devices; id = "yjvni-9eaa7"; }; "Org" = { - path = "${homeDir}/Nextcloud/Org"; + path = "${homeDir}/Org"; inherit devices; id = "a7xnl-zjj3d"; };