From 240ef234a41ad813596f5ac36ca64f71ac0de5f6 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 16 Apr 2024 17:19:20 +0200 Subject: [PATCH] add logseq properly --- nixos/components/network/sshd/default.nix | 4 ++-- nixos/homes/palo/packages/default.nix | 3 ++- nixos/homes/palo/packages/logseq.nix | 18 ++++++++++++++++++ nixos/homes/palo/packages/packages.nix | 3 --- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 nixos/homes/palo/packages/logseq.nix diff --git a/nixos/components/network/sshd/default.nix b/nixos/components/network/sshd/default.nix index a7d75b4..5f5779c 100644 --- a/nixos/components/network/sshd/default.nix +++ b/nixos/components/network/sshd/default.nix @@ -5,7 +5,7 @@ let defaultRootKeyFiles = [ (toString ../../../assets/ssh/palo_rsa.pub) ]; cfg = config.components.network.sshd; -# maybe ascii-image-converter is also nice here + # maybe ascii-image-converter is also nice here sshBanner = pkgs.runCommand "ssh-banner" { nativeBuildInputs = [ @@ -89,7 +89,7 @@ in (mkIf cfg.sshguard.enable { environment.systemPackages = [ pkgs.ipset ]; services.sshguard.enable = lib.mkDefault true; - } ) + }) (mkIf (cfg.onlyTincAccess && cfg.enable) { networking.firewall.extraCommands = '' diff --git a/nixos/homes/palo/packages/default.nix b/nixos/homes/palo/packages/default.nix index a5fa0a0..8008478 100644 --- a/nixos/homes/palo/packages/default.nix +++ b/nixos/homes/palo/packages/default.nix @@ -2,8 +2,9 @@ imports = [ ./development.nix ./graphics.nix + ./logseq.nix ./nextcloud.nix - ./social.nix ./packages.nix + ./social.nix ]; } diff --git a/nixos/homes/palo/packages/logseq.nix b/nixos/homes/palo/packages/logseq.nix new file mode 100644 index 0000000..2d6b7d7 --- /dev/null +++ b/nixos/homes/palo/packages/logseq.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +with pkgs; +with lib; +{ + config = mkIf config.gui.enable { + home.packages = [ + unstable.logseq + ]; + home.file.".config/Logseq/Preferences".source = (pkgs.formats.json { }).generate "LogseqPreferences.json" + { + spellcheck = { + dictionaries = [ "en-US" "de-DE" ]; + dictionary = ""; + }; + }; + }; + +} diff --git a/nixos/homes/palo/packages/packages.nix b/nixos/homes/palo/packages/packages.nix index 8524844..bd55ec1 100644 --- a/nixos/homes/palo/packages/packages.nix +++ b/nixos/homes/palo/packages/packages.nix @@ -5,8 +5,6 @@ with lib; config = mkIf config.gui.enable { - - # ¯\_(ツ)_/¯ home.packages = [ @@ -43,7 +41,6 @@ with lib; rbw unstable.trilium-desktop # old (use logseq now) - unstable.logseq nginx-config-formatter