diff --git a/SwarselSystems.org b/SwarselSystems.org index cf6371f..93e6425 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -410,7 +410,6 @@ A short overview over each input and what it does: 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"; @@ -1547,12 +1546,6 @@ On the structure of overlays: as you notice, all of the attributes within overla }; }; - swarsel-nix = _: prev: { - swarsel-nix = import inputs.swarsel-nix { - pkgs = prev; - }; - }; - zjstatus = _: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }; @@ -1565,7 +1558,6 @@ On the structure of overlays: as you notice, all of the attributes within overla // (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) @@ -5048,7 +5040,7 @@ Here I only enable =networkmanager= and a few default networks. The rest of the wifi = { # mac-address-blacklist = ""; mode = "infrastructure"; - # band = "a"; + band = "a"; ssid = wlan1; }; wifi-security = { @@ -5374,12 +5366,12 @@ Here I disable global completion to prevent redundant compinit calls and cache i id = "default"; }; "Obsidian" = { - path = "${homeDir}/Obsidian"; + path = "${homeDir}/Nextcloud/Obsidian"; inherit devices; id = "yjvni-9eaa7"; }; "Org" = { - path = "${homeDir}/Org"; + path = "${homeDir}/Nextcloud/Org"; inherit devices; id = "a7xnl-zjj3d"; }; @@ -11162,7 +11154,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 @@ -13478,7 +13470,7 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi } #+end_src -***** element service for tr +***** element service for tray #+begin_src nix-ts :tangle modules/home/common/element-tray.nix { lib, config, pkgs, ... }: @@ -14411,142 +14403,6 @@ This service changes the screen hue at night. I am not sure if that really does } #+end_src -**** Obsidian - -#+begin_src nix-ts :tangle modules/home/common/obsidian.nix - { 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; - }; - } - ]; - }; - }; - }; - }; - }; - } -#+end_src - *** Server :PROPERTIES: :CUSTOM_ID: h:b1a00339-6e9b-4ae4-b5dc-6fd5669a2ddb @@ -18015,7 +17871,6 @@ This holds modules that are to be used on most hosts. These are also the most im 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; @@ -19849,13 +19704,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 "~/Org/Archive.org::Archive")) + (let ((org-archive-location "~/Nextcloud/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 "~/Org/") (file-truename buffer-file-name)) + (string-prefix-p (expand-file-name "~/Nextcloud/Org/") (file-truename buffer-file-name)) (derived-mode-p 'org-mode)) (save-buffer)))))) @@ -19884,14 +19739,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/Org/Tasks.org" - "/home/swarsel/Org/Archive.org" + (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org" + "/home/swarsel/Nextcloud/Org/Archive.org" )) (setq org-capture-templates - '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox") + '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox") "* TODO %?\n %i\n %a") - ("j" "Journal" entry (file+datetree "~/Org/Journal.org") + ("j" "Journal" entry (file+datetree "~/Nextcloud/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 935c1ee..7f8999a 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 "~/Org/Archive.org::Archive")) + (let ((org-archive-location "~/Nextcloud/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 "~/Org/") (file-truename buffer-file-name)) + (string-prefix-p (expand-file-name "~/Nextcloud/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/Org/Tasks.org" - "/home/swarsel/Org/Archive.org" + (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org" + "/home/swarsel/Nextcloud/Org/Archive.org" )) (setq org-capture-templates - '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox") + '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox") "* TODO %?\n %i\n %a") - ("j" "Journal" entry (file+datetree "~/Org/Journal.org") + ("j" "Journal" entry (file+datetree "~/Nextcloud/Org/Journal.org") "* %?\nEntered on %U\n %i\n %a"))) (setq org-refile-targets diff --git a/flake.lock b/flake.lock index 942ab6b..f5b7234 100644 --- a/flake.lock +++ b/flake.lock @@ -2182,24 +2182,6 @@ "type": "github" } }, - "flake-parts_35": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_17" - }, - "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_4": { "inputs": { "nixpkgs-lib": [ @@ -2503,7 +2485,7 @@ }, "flake-utils_19": { "inputs": { - "systems": "systems_46" + "systems": "systems_45" }, "locked": { "lastModified": 1731533236, @@ -5866,21 +5848,6 @@ "type": "github" } }, - "nixpkgs-lib_17": { - "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-lib_2": { "locked": { "lastModified": 1719876945, @@ -7264,22 +7231,6 @@ } }, "nixpkgs_58": { - "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_59": { "locked": { "lastModified": 1754800730, "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", @@ -8665,8 +8616,7 @@ "stylix": "stylix", "swarsel": "swarsel", "swarsel-modules": "swarsel-modules_4", - "swarsel-nix": "swarsel-nix", - "systems": "systems_44", + "systems": "systems_43", "vbc-nix": "vbc-nix_6", "zjstatus": "zjstatus_6" } @@ -9589,27 +9539,6 @@ "type": "github" } }, - "swarsel-nix": { - "inputs": { - "flake-parts": "flake-parts_35", - "nixpkgs": "nixpkgs_58", - "systems": "systems_43" - }, - "locked": { - "lastModified": 1759958031, - "narHash": "sha256-rfwQQ42aQrzXYEzjQrqFA1NKoxgo9bqg/RIc2wKBsEQ=", - "owner": "Swarsel", - "repo": "swarsel-nix", - "rev": "ab8460e796c0694fe612a02817d8c290d0662188", - "type": "github" - }, - "original": { - "owner": "Swarsel", - "ref": "main", - "repo": "swarsel-nix", - "type": "github" - } - }, "swarsel_2": { "inputs": { "devshell": "devshell_5", @@ -10374,21 +10303,6 @@ } }, "systems_44": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_45": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -10403,7 +10317,7 @@ "type": "github" } }, - "systems_46": { + "systems_45": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -11162,7 +11076,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_45" + "systems": "systems_44" }, "locked": { "lastModified": 1742477270, @@ -11420,7 +11334,7 @@ "inputs": { "crane": "crane_12", "flake-utils": "flake-utils_19", - "nixpkgs": "nixpkgs_59", + "nixpkgs": "nixpkgs_58", "rust-overlay": "rust-overlay_12" }, "locked": { diff --git a/flake.nix b/flake.nix index 809843d..ac839db 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ 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"; diff --git a/index.html b/index.html index 11c1d62..8e78e79 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- +-This file has 94403 words spanning 24261 lines and was last revised on 2025-10-09 00:17:29 +0200. +This file has 94167 words spanning 24116 lines and was last revised on 2025-10-07 21:23:03 +0200.
@@ -894,7 +893,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry
-My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-10-09 00:17:29 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-10-07 21:23:03 +0200)
Some standard options that should be set for every microvm host. @@ -12126,8 +12117,8 @@ Some standard options that should be set for every microvm host.
Some standard options that should be set vor every microvm guest. We set the default @@ -12493,7 +12484,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 @@ -14824,8 +14815,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, ... }:
@@ -14839,8 +14830,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, ... }:
@@ -14855,8 +14846,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, pkgs, ... }:
@@ -14890,8 +14881,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, pkgs, ... }:
@@ -14925,8 +14916,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, pkgs, ... }:
@@ -14960,8 +14951,8 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
{ lib, config, pkgs, ... }:
@@ -15871,145 +15862,6 @@ in
{ 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;
- };
- }
- ];
- };
- };
- };
- };
- };
- }
-
-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. @@ -19308,8 +19160,8 @@ in
{ lib, config, ... }:
@@ -19581,7 +19433,6 @@ 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;
@@ -21636,13 +21487,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 "~/Org/Archive.org::Archive"))
+ (let ((org-archive-location "~/Nextcloud/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 "~/Org/") (file-truename buffer-file-name))
+ (string-prefix-p (expand-file-name "~/Nextcloud/Org/") (file-truename buffer-file-name))
(derived-mode-p 'org-mode))
(save-buffer))))))
@@ -21671,14 +21522,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/Org/Tasks.org"
- "/home/swarsel/Org/Archive.org"
+ (setq org-agenda-files '("/home/swarsel/Nextcloud/Org/Tasks.org"
+ "/home/swarsel/Nextcloud/Org/Archive.org"
))
(setq org-capture-templates
- '(("t" "Todo" entry (file+headline "~/Org/Tasks.org" "Inbox")
+ '(("t" "Todo" entry (file+headline "~/Nextcloud/Org/Tasks.org" "Inbox")
"* TODO %?\n %i\n %a")
- ("j" "Journal" entry (file+datetree "~/Org/Journal.org")
+ ("j" "Journal" entry (file+datetree "~/Nextcloud/Org/Journal.org")
"* %?\nEntered on %U\n %i\n %a")))
(setq org-refile-targets
@@ -26367,7 +26218,7 @@ similarly, there exists an version that starts from the right.