diff --git a/SwarselSystems.org b/SwarselSystems.org index 45655af..4b06cc9 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -4912,7 +4912,8 @@ Some programs profit from being installed through dedicated NixOS settings on sy }; #+end_src -Also, we setup zsh. Do not touch this. +**** zsh +Do not touch this. #+begin_src nix :tangle profiles/common/nixos.nix @@ -4921,6 +4922,54 @@ Also, we setup zsh. Do not touch this. environment.shells = with pkgs; [ zsh ]; environment.pathsToLink = [ "/share/zsh" ]; +#+end_src +**** syncthing + +#+begin_src nix :tangle profiles/common/nixos.nix + + services.syncthing = { + enable = true; + user = "swarsel"; + dataDir = "/home/swarsel"; + configDir = "/home/swarsel/.config/syncthing"; + openDefaultPorts = true; + settings = { + devices = { + "magicant" = { + id = "SEH2NMT-IVRQUU5-VPW2HUQ-3GQYDBF-F6H6OY6-X3DZTUZ-LCRE2DJ-QNIXIQ2"; + }; + "sync (@oracle)" = { + id = "ETW6TST-NPK7MKZ-M4LXMHA-QUPQHDT-VTSHH5X-CR5EIN2-YU7E55F-MGT7DQB"; + }; + "server1" = { + id = "ZXWVC4X-IIARITZ-MERZPHN-HD55Y6G-QJM2GTB-6BWYXMR-DTO3TS2-QDBREQQ"; + }; + }; + folders = { + "Default Folder" = { + path = "/home/swarsel/Sync"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "default"; + }; + "Obsidian" = { + path = "/home/swarsel/Nextcloud/Obsidian"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "yjvni-9eaa7"; + }; + "Org" = { + path = "/home/swarsel/Nextcloud/Org"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "a7xnl-zjj3d"; + }; + "Vpn" = { + path = "/home/swarsel/Vpn"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "hgp9s-fyq3p"; + }; + }; + }; + }; + #+end_src *** Services @@ -6688,7 +6737,7 @@ Enables the syncthing service which talks to my syncthing instance on the Oracle #+begin_src nix :tangle profiles/common/home.nix services.syncthing = { - enable = true; + enable = false; tray = { enable = false; # we enable this by installing the syncthingtray package instead, it works better. }; diff --git a/index.html b/index.html index 1149e1e..0e57fc2 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configuration @@ -261,7 +261,7 @@
  • 3.3.6. Linking dotfiles
  • 3.3.7. Sourcing environment variables
  • 3.3.8. Programs
    • -
  • 3.3.9. nix-index
    • +
  • 3.3.9. nix-index
  • 3.3.10. password-store
  • 3.3.11. direnv
  • 3.3.12. eza
    • @@ -329,7 +329,7 @@ @@ -6083,9 +6083,12 @@ programs = { }; - + +
      +
    1. zsh
      +

      -Also, we setup zsh. Do not touch this. +Do not touch this.

      @@ -6098,6 +6101,59 @@ environment.pathsToLink = [ "/share/zsh" ];
      +
      2. +
    2. syncthing
      +
      +
      +
      +services.syncthing = {
+  enable = true;
+  user = "swarsel";
+  dataDir = "/home/swarsel";
+  configDir = "/home/swarsel/.config/syncthing";
+  openDefaultPorts = true;
+  settings = {
+    devices = {
+      "magicant" = {
+        id = "SEH2NMT-IVRQUU5-VPW2HUQ-3GQYDBF-F6H6OY6-X3DZTUZ-LCRE2DJ-QNIXIQ2";
+      };
+      "sync (@oracle)" = {
+        id = "ETW6TST-NPK7MKZ-M4LXMHA-QUPQHDT-VTSHH5X-CR5EIN2-YU7E55F-MGT7DQB";
+      };
+      "server1" = {
+        id = "ZXWVC4X-IIARITZ-MERZPHN-HD55Y6G-QJM2GTB-6BWYXMR-DTO3TS2-QDBREQQ";
+      };
+    };
+    folders = {
+      "Default Folder" = {
+        path = "/home/swarsel/Sync";
+        devices = [ "sync (@oracle)" "magicant" ];
+        id = "default";
+      };
+      "Obsidian" = {
+        path = "/home/swarsel/Nextcloud/Obsidian";
+        devices = [ "sync (@oracle)" "magicant" ];
+        id = "yjvni-9eaa7";
+      };
+      "Org" = {
+        path = "/home/swarsel/Nextcloud/Org";
+        devices = [ "sync (@oracle)" "magicant" ];
+        id = "a7xnl-zjj3d";
+      };
+      "Vpn" = {
+        path = "/home/swarsel/Vpn";
+        devices = [ "sync (@oracle)" "magicant" ];
+        id = "hgp9s-fyq3p";
+      };
+    };
+  };
+};
+
+
      +
      +
      +
      3. +

    3.2.5. Services

    @@ -6993,8 +7049,8 @@ programs = {
    -
    -

    3.3.9. nix-index

    +
    +

    3.3.9. nix-index

    nix-index provides a way to find out which packages are provided by which derivations. By default it also comes with a replacement for command-not-found.sh, however, the implementation is based on a channel based setup. I like consistency, so I replace the command with one that provides a flakes-based output. @@ -7971,7 +8027,7 @@ Enables the syncthing service which talks to my syncthing instance on the Oracle 

     services.syncthing = {
-  enable = true;
+  enable = false;
   tray = {
     enable = false; # we enable this by installing the syncthingtray package instead, it works better.
   };
@@ -9150,6 +9206,9 @@ Lastly, individual messages can be reenabled using the (advice-remove '<
 (advice-add 'org-unlogged-message :around #'suppress-messages)
 (advice-add 'magit-auto-revert-mode--init-kludge  :around #'suppress-messages)
 (advice-add 'push-mark  :around #'suppress-messages)
+(advice-add 'timer-event-handler  :around #'suppress-messages)
+(advice-add 'evil-insert  :around #'suppress-messages)
+(advice-add 'evil-visual-char  :around #'suppress-messages)
 
 ;; to reenable
 ;; (advice-remove 'timer-event-handler #'suppress-messages)
@@ -9391,7 +9450,7 @@ The standard Emacs behaviour for the Python process shell is a bit annoying. Thi
    -
  • Nix common prefix bracketer
    +
  • Nix common prefix bracketer

    This function searches for common delimiters in region and removes them, summarizing all captured lines by it. @@ -9424,7 +9483,7 @@ This function searches for common delimiters in region and removes them, summari

    • -
  • Nix formatters
    +
  • Nix formatters

    This formats the org code block at point in accordance to the nixpkgs-fmt formatter @@ -10997,8 +11056,8 @@ This adds a rudimentary nix-mode to Emacs. I have not really tried this out, as

    • -
    -

    4.4.3. nixpkgs-fmt

    +
    +

    4.4.3. nixpkgs-fmt

    Adds functions for formatting nix code. @@ -13013,7 +13072,7 @@ My laptop, sadly soon to be replaced by a new one, since most basic functions ar

    Author: Leon Schwarzäugl

    -

    Created: 2024-07-20 Sa 00:16

    +

    Created: 2024-07-20 Sa 11:04

    Validate

    diff --git a/profiles/common/home.nix b/profiles/common/home.nix index ef8d40c..5971050 100644 --- a/profiles/common/home.nix +++ b/profiles/common/home.nix @@ -1237,7 +1237,7 @@ }; services.syncthing = { - enable = true; + enable = false; tray = { enable = false; # we enable this by installing the syncthingtray package instead, it works better. }; diff --git a/profiles/common/nixos.nix b/profiles/common/nixos.nix index 1103839..2f46924 100644 --- a/profiles/common/nixos.nix +++ b/profiles/common/nixos.nix @@ -421,6 +421,49 @@ environment.shells = with pkgs; [ zsh ]; environment.pathsToLink = [ "/share/zsh" ]; + services.syncthing = { + enable = true; + user = "swarsel"; + dataDir = "/home/swarsel"; + configDir = "/home/swarsel/.config/syncthing"; + openDefaultPorts = true; + settings = { + devices = { + "magicant" = { + id = "SEH2NMT-IVRQUU5-VPW2HUQ-3GQYDBF-F6H6OY6-X3DZTUZ-LCRE2DJ-QNIXIQ2"; + }; + "sync (@oracle)" = { + id = "ETW6TST-NPK7MKZ-M4LXMHA-QUPQHDT-VTSHH5X-CR5EIN2-YU7E55F-MGT7DQB"; + }; + "server1" = { + id = "ZXWVC4X-IIARITZ-MERZPHN-HD55Y6G-QJM2GTB-6BWYXMR-DTO3TS2-QDBREQQ"; + }; + }; + folders = { + "Default Folder" = { + path = "/home/swarsel/Sync"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "default"; + }; + "Obsidian" = { + path = "/home/swarsel/Nextcloud/Obsidian"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "yjvni-9eaa7"; + }; + "Org" = { + path = "/home/swarsel/Nextcloud/Org"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "a7xnl-zjj3d"; + }; + "Vpn" = { + path = "/home/swarsel/Vpn"; + devices = [ "sync (@oracle)" "magicant" ]; + id = "hgp9s-fyq3p"; + }; + }; + }; + }; + services.blueman.enable = true; # enable scanners over network diff --git a/programs/emacs/init.el b/programs/emacs/init.el index 8d88216..bb475bc 100644 --- a/programs/emacs/init.el +++ b/programs/emacs/init.el @@ -125,6 +125,9 @@ create a new one." (advice-add 'org-unlogged-message :around #'suppress-messages) (advice-add 'magit-auto-revert-mode--init-kludge :around #'suppress-messages) (advice-add 'push-mark :around #'suppress-messages) +(advice-add 'timer-event-handler :around #'suppress-messages) +(advice-add 'evil-insert :around #'suppress-messages) +(advice-add 'evil-visual-char :around #'suppress-messages) ;; to reenable ;; (advice-remove 'timer-event-handler #'suppress-messages)