add some config for helix and zed

.zed/settings.json

@@ -0,0 +1,2 @@
+{
+}

README.md

@@ -14,23 +14,23 @@ Hey, you. This is my nixos configurations.
 
 - david@Tytonidae
 
-| Specialisation | DE / WM   | Shell       | Editor | Termianal | Launcher        | Browser | DM             |
+| Specialisation | DE / WM   | Shell       | Editor | Terminal | Launcher        | Browser | DM             |
-| -------------- | --------- | ----------- | ------ | --------- | --------------- | ------- | -------------- |
+| -------------- | --------- | ----------- | ------ | -------- | --------------- | ------- | -------------- |
-| default        | niri      | fish + bash | helix  | ghostty   | fuzzel          | firefox | gdm            |
+| default        | niri      | fish + bash | helix  | ghostty  | fuzzel          | firefox | gdm            |
-| cosmic         | cosmic de | fish + bash | helix  | ghostty   | cosmic-launcher | firefox | cosmic-greeter |
+| cosmic         | cosmic de | fish + bash | helix  | ghostty  | cosmic-launcher | firefox | cosmic-greeter |
-| kde            | kde       | fish + bash | helix  | ghostty   | -               | firefox | sddm           |
+| kde            | kde       | fish + bash | helix  | ghostty  | -               | firefox | sddm           |
 
 - david@Akun
 
-| Specialisation | DE / WM | Shell       | Editor | Termianal | Launcher | Browser | DM             |
+| Specialisation | DE / WM | Shell       | Editor | Terminal | Launcher | Browser | DM             |
-| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | -------------- |
+| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | -------------- |
-| default        | cosmic  | fish + bash | helix  | ghostty   | -        | firefox | cosmic-greeter |
+| default        | cosmic  | fish + bash | helix  | ghostty  | -        | firefox | cosmic-greeter |
 
 - alice@Cape
 
-| Specialisation | DE / WM | Shell       | Editor | Termianal | Launcher | Browser | DM |
+| Specialisation | DE / WM | Shell       | Editor | Terminal | Launcher | Browser | DM  |
-| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | -- |
+| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | --- |
-| default        | -       | fish + bash | helix  | -         | -        | -       | -  |
+| default        | -       | fish + bash | helix  | -        | -        | -       | -   |
 
 ## FlakE OutputS and StructurE
 

codebook.toml

@@ -0,0 +1,18 @@
+words = [
+    "akun",
+    "configuratio",
+    "fuzzel",
+    "gdm",
+    "ghostty",
+    "kde",
+    "niri",
+    "nixo",
+    "nixos",
+    "nixpkgs",
+    "ovelrays",
+    "pkgs",
+    "sddm",
+    "specialisation",
+    "structur",
+    "tytonidae",
+]

flake.lock

@@ -90,11 +90,11 @@
     "bt-tracker": {
       "flake": false,
       "locked": {
-        "lastModified": 1745683860,
+        "lastModified": 1745971833,
-        "narHash": "sha256-WYvZhHXVZuinCiLuYzPvSqMJ96SkATjinC9Ifs/0jfY=",
+        "narHash": "sha256-Hmt7smJEB2aKw3XW02Vzgr0bTULpM1CtSy1MTecmIxs=",
         "owner": "XIU2",
         "repo": "TrackersListCollection",
-        "rev": "fd8a43e0cffe6aef96de5c5041cf499ce0e4c67e",
+        "rev": "10919722f131dbac0413cdbd385ff0b634d3d7fe",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745502102,
+        "lastModified": 1745812220,
-        "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
+        "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
+        "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
         "type": "github"
       },
       "original": {
@@ -352,11 +352,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1745607661,
+        "lastModified": 1745971585,
-        "narHash": "sha256-72OO+/vP4h7uiZ1gdGmFf1z+17NxCt8dhrRD+mltW44=",
+        "narHash": "sha256-v8QVD+V7CCVZ+QHk2mdT2X3U9FIe2vEoOVsgnQBjZ5I=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "38445dca2ac2af176c7f3b205d88d697cf8c89c8",
+        "rev": "b3edc88010e38946072a58fe336081ed104c9d44",
         "type": "github"
       },
       "original": {
@@ -441,11 +441,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1745684178,
+        "lastModified": 1745933300,
-        "narHash": "sha256-SnYTNyXGRng1qHmRtbOG9K31c5h6p77hlGPZK5oKgqE=",
+        "narHash": "sha256-BJpxqZar6vrmv1MtZIjmBa7x+0HEP8kmYeFejz7m2uc=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "2ec59f8ff6d43f5ac72e745ec614c26de192aedd",
+        "rev": "1c32fb2d4df3f06f96ca33db7d9f9b15297c7f8d",
         "type": "github"
       },
       "original": {
@@ -462,11 +462,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745627989,
+        "lastModified": 1745987135,
-        "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
+        "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
+        "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e",
         "type": "github"
       },
       "original": {
@@ -486,11 +486,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1745634143,
+        "lastModified": 1745943971,
-        "narHash": "sha256-9MopKYFjE+4URe/ZmBt4i3g9cvdAJ6MJ4LM21DDXqzc=",
+        "narHash": "sha256-syIS3vBo7DX/cP49bfZPYmw3vhMCmyrnD6HiUlOAvx8=",
         "owner": "jj-vcs",
         "repo": "jj",
-        "rev": "13477940af42a74a58caaaaeafdbd322cfebb81d",
+        "rev": "3ab9e098d778969a91d46290615c436ab41d71f9",
         "type": "github"
       },
       "original": {
@@ -550,11 +550,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1745668007,
+        "lastModified": 1745965399,
-        "narHash": "sha256-xYf6xz8WOW9ztBi356dHdqLsTCoxVS8Iapfpwosrn7Q=",
+        "narHash": "sha256-RxoK/Eo9cWGtGMl3enYu/LH/SAcFGR2PWuAifQm4dUc=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "8fdaf610c455d0b5b70374a21392a717be513b0f",
+        "rev": "bc29338ba733e4c1b94c3ed134baabfea587627e",
         "type": "github"
       },
       "original": {
@@ -583,11 +583,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1745663376,
+        "lastModified": 1745913113,
-        "narHash": "sha256-mGQyB+Epl87ZCZZCcBkjUrdR1aJt8Ybiqr4h0yUkgQI=",
+        "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "78e3daf5f82b5870e998faf0e1efeaa048730976",
+        "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246",
         "type": "github"
       },
       "original": {
@@ -604,11 +604,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1745665695,
+        "lastModified": 1745924915,
-        "narHash": "sha256-oUFoPmT2/ww1bIU0Vmifx9BdarVqlv9MyEIxUTqYJnM=",
+        "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "48280c3737fee2db3a1226c297c86428417f552d",
+        "rev": "329a9d639f0418cce05937a823f43b2b64191653",
         "type": "github"
       },
       "original": {
@@ -619,11 +619,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1745503349,
+        "lastModified": 1745955289,
-        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
         "type": "github"
       },
       "original": {
@@ -635,11 +635,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745526057,
+        "lastModified": 1745794561,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0",
         "type": "github"
       },
       "original": {
@@ -682,11 +682,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1745487689,
+        "lastModified": 1745868005,
-        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
+        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
+        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
         "type": "github"
       },
       "original": {
@@ -698,11 +698,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1745487689,
+        "lastModified": 1745742390,
-        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
+        "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
+        "rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
         "type": "github"
       },
       "original": {
@@ -714,11 +714,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1745526057,
+        "lastModified": 1745930157,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
@@ -754,11 +754,11 @@
     "nur-rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1745419403,
+        "lastModified": 1745752599,
-        "narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=",
+        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72",
+        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
         "type": "gitlab"
       },
       "original": {
@@ -859,11 +859,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745634793,
+        "lastModified": 1745894113,
-        "narHash": "sha256-8AuOyfLNlcbLy0AqERSNUUoDdY+3THZI7+9VrXUfGqg=",
+        "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f1aeaeb91ba9c88f235ab82bd23d7a4931fe736c",
+        "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed",
         "type": "github"
       },
       "original": {
@@ -920,11 +920,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1745618823,
+        "lastModified": 1745962538,
-        "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=",
+        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126",
+        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
         "type": "github"
       },
       "original": {
@@ -1087,11 +1087,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1745372360,
+        "lastModified": 1745730655,
-        "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=",
+        "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3",
+        "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
         "type": "github"
       },
       "original": {

home/david/configurations/Akun/default.nix

@@ -7,15 +7,18 @@
 }: {
   youthlic = {
     xdg-dirs.enable = true;
-    programs = {
+    programs = let
+      email = config.accounts.email.accounts.ulic-youthlic;
+      inherit (email) address name;
+      signKey = email.gpg.key;
+    in {
       firefox.enable = true;
       fuzzel.enable = true;
       helix.enable = true;
       gpg.enable = true;
       git = {
-        email = "ulic.youthlic@gmail.com";
+        inherit name signKey;
-        name = "ulic-youthlic";
+        email = address;
-        signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
         encrypt-credential = true;
       };
       zed-editor.enable = true;
@@ -23,9 +26,8 @@
       bash.enable = true;
       jujutsu = {
         enable = true;
-        email = "ulic.youthlic@gmail.com";
+        inherit name signKey;
-        name = "ulic-youthlic";
+        email = address;
-        signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
       };
       ghostty.enable = true;
       starship.enable = true;
@@ -34,12 +36,14 @@
       atuin.enable = true;
       obs.enable = true;
       chromium.enable = true;
+      thunderbird.enable = true;
       # espanso.enable = true;
     };
   };
 
   david = {
     wallpaper.enable = true;
+    accounts.email.enable = true;
     programs = {
       openssh.enable = true;
       niri.enable = true;

home/david/configurations/Tytonidae/default.nix

@@ -8,7 +8,11 @@
 }: {
   youthlic = {
     xdg-dirs.enable = true;
-    programs = {
+    programs = let
+      email = config.accounts.email.accounts.ulic-youthlic;
+      inherit (email) name address;
+      signKey = email.gpg.key;
+    in {
       zed-editor.enable = true;
       rustypaste-cli.enable = true;
       firefox.enable = true;
@@ -17,14 +21,12 @@
       gpg.enable = true;
       jujutsu = {
         enable = true;
-        email = "ulic.youthlic@gmail.com";
+        inherit name signKey;
-        name = "ulic-youthlic";
+        email = address;
-        signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
       };
       git = {
-        email = "ulic.youthlic@gmail.com";
+        inherit name signKey;
-        name = "ulic-youthlic";
+        email = address;
-        signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
         encrypt-credential = true;
       };
       fish.enable = true;
@@ -45,6 +47,7 @@
 
   david = {
     wallpaper.enable = true;
+    accounts.email.enable = true;
     programs = {
       niri.enable = true;
       openssh.enable = true;

home/david/modules/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./wallpaper.nix
     ./programs
+    ./emails.nix
   ];
   config = {
     services.mpris-proxy.enable = true;

home/david/modules/emails.nix

@@ -0,0 +1,67 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.david.accounts.email;
+in {
+  options = {
+    david.accounts.email = {
+      enable = lib.mkEnableOption "emails";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    accounts.email.accounts = {
+      "ulic-youthlic" = {
+        address = "ulic.youthlic@gmail.com";
+        aliases = [
+          "ulic.youthlic+nixpkgs@gmail.com"
+        ];
+        flavor = "gmail.com";
+        gpg = {
+          signByDefault = true;
+          key = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95";
+        };
+        primary = true;
+        thunderbird = {
+          enable = true;
+        };
+        realName = "youthlic";
+      };
+      "youthlic146" = {
+        address = "youthlic146@gmail.com";
+        flavor = "gmail.com";
+        thunderbird = {
+          enable = true;
+        };
+        realName = "youthlic";
+      };
+      "moqixianli" = {
+        address = "moqixianli@gmail.com";
+        flavor = "gmail.com";
+        thunderbird = {
+          enable = true;
+        };
+        realName = "youthlic";
+      };
+      "youthlic" = {
+        address = "youthlic@outlook.com";
+        flavor = "outlook.office365.com";
+        thunderbird = {
+          enable = true;
+          settings = id: {
+            "mail.server.server_${id}.type" = "imap";
+            "mail.smtpserver.smtp_${id}.authMethod" = 10; # 10 for OAuth2
+            "mail.server.server_${id}.authMethod" = 10;
+            "mail.server.server_${id}.socketType" = 3; # 3 for SSL/TLS
+          };
+        };
+        realName = "youthlic";
+        imap = {
+          host = "outlook.office365.com";
+          tls.enable = true;
+        };
+      };
+    };
+  };
+}

home/modules/programs/gpg/default.nix

@@ -18,7 +18,9 @@
         {
           enable = true;
           enableSshSupport = true;
-          pinentryPackage = outputs.packages."${pkgs.system}".pinentry-selector;
+          pinentry = {
+            package = outputs.packages."${pkgs.system}".pinentry-selector;
+          };
           # sshKeys = [
           #   "C817E333BF88F16EA0F7ADE27BDCCC16AD25E5A6"
           # ];

home/modules/programs/zed.nix

@@ -16,26 +16,93 @@ in {
     programs.zed-editor = {
       enable = true;
       extensions = [
-        "Nix"
+        "asciidoc"
-        "HTML"
+        "basher"
-        "Java"
+        "cargo-tom"
-        "Git Firely"
+        "codebook"
-        "Make"
+        "deno"
-        "Deno"
+        "docker-compose"
-        "Java with Eclipse JDTLS"
+        "dockerfile"
-        "NeoCMake"
+        "fish"
-        "Typst"
+        "git-firefly"
+        "golangci-lint"
+        "haskell"
+        "html"
+        "hurl"
+        "idris2"
+        "java"
+        "java-eclipse-jdtls"
+        "kdl"
+        "kotlin"
+        "lua"
+        "make"
+        "markdown-oxide"
+        "neocmake"
+        "nix"
+        "python-refactoring"
+        "python-requirements"
+        "scheme"
+        "toml"
+        "typst"
+        "xml"
+        "zig"
       ];
       extraPackages = with pkgs; [
+        idris2Packages.idris2Lsp
+        lua-language-server
+        bash-language-server
+        shfmt
+        hurl
+        cmake-language-server
+        kdlfmt
+        rustfmt
+        clang-tools
+        libxml2
+        typstyle
+        pyright
+        ruff
+        gotools
+        yaml-language-server
+        taplo
+        markdown-oxide
+        marksman
         nixd
-        nil
-        neocmakelsp
         deno
+        alejandra
+        vscode-langservers-extracted
+        fish-lsp
+        tailwindcss-language-server
+        gopls
+        golangci-lint-langserver
+        tinymist
+        delve
+        lldb
+        rust-analyzer
+        # nil
+        haskell-language-server
+        neocmakelsp
         jdt-language-server
+        zls
       ];
       userSettings = {
+        languages = {
+          Nix = {
+            language_servers = ["nixd" "!nil"];
+            formatter = {
+              external = {
+                command = "alejandra";
+                arguments = ["--quiet" "--"];
+              };
+            };
+          };
+        };
+        soft_wrap = "editor_width";
         autosave = "on_focus_change";
         auto_update = false;
+        calls = {
+          mute_on_join = true;
+          share_on_join = false;
+        };
         "format_on_save" = "off";
         ui_font_size = 20;
         buffer_font_size = 20;

nixos/configurations/Cape/default.nix

@@ -25,11 +25,6 @@
       };
       openssh.enable = true;
       tailscale.enable = true;
-      # conduwuit = {
-      #   enable = true;
-      #   serverName = "im.youthlic.fun";
-      # };
-      mautrix-telegram.enable = true;
       caddy = {
         enable = true;
         baseDomain = "youthlic.fun";

nixos/modules/programs/conduwuit.nix

@@ -1,61 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.youthlic.programs.conduwuit;
-in {
-  options = {
-    youthlic.programs.conduwuit = {
-      enable = lib.mkEnableOption "conduwuit";
-      serverName = lib.mkOption {
-        type = lib.types.nonEmptyStr;
-        example = "example.com";
-      };
-    };
-  };
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      sops.secrets."matrix-reg-token" = {
-        owner = "conduwuit";
-      };
-      systemd.services.conduwuit.serviceConfig = {
-        EnvironmentFile = "${config.sops.secrets.matrix-reg-token.path}";
-      };
-      services.conduwuit = {
-        enable = true;
-        settings = {
-          global = {
-            port = [8481];
-            address = [
-              "0.0.0.0"
-              "::"
-            ];
-            trusted_servers = [
-              "matrix.org"
-              "mozilla.org"
-              "nichi.co"
-            ];
-            allow_registration = true;
-            server_name = cfg.serverName;
-            new_user_displayname_suffix = "⚡";
-            allow_public_room_directory_over_federation = true;
-            well_known = {
-              client = "https://${cfg.serverName}";
-              server = "${cfg.serverName}:443";
-            };
-          };
-        };
-      };
-    })
-    (lib.mkIf (cfg.enable && config.youthlic.programs.caddy.enable) {
-      services.caddy.virtualHosts = {
-        "${cfg.serverName}" = {
-          extraConfig = ''
-            reverse_proxy 127.0.0.1:8481
-          '';
-        };
-      };
-    })
-  ];
-}

nixos/modules/programs/default.nix

@@ -19,7 +19,6 @@
     ./steam.nix
     ./tailscale.nix
     ./transmission.nix
-    ./conduwuit.nix
     ./nix-ld.nix
     ./juicity
     ./miniflux.nix

nixos/modules/programs/mautrix-telegram.nix

@@ -10,54 +10,29 @@ in {
       enable = lib.mkEnableOption "mautrix-telegram";
     };
   };
-  config = let
+  config = lib.mkIf cfg.enable {
-    conduwuit-cfg = config.youthlic.programs.conduwuit;
+    sops.secrets.matrix-telegram-bot = {};
-    caddy-cfg = config.youthlic.programs.caddy;
+    services.mautrix-telegram = {
-  in
+      enable = true;
-    lib.mkMerge [
+      environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
-      (lib.mkIf cfg.enable {
+      settings = {
-        sops.secrets.matrix-telegram-bot = {};
+        bridge = {
-        services.mautrix-telegram = {
+          permissions = {
-          enable = true;
+            "*" = "relaybot";
-          environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}";
-          settings = {
-            bridge = {
-              permissions = {
-                "*" = "relaybot";
-              };
-            };
-            appservice = {
-              address = "http://127.0.0.1:8482";
-              hostname = "0.0.0.0";
-              port = 8482;
-              database = "sqlite:////var/lib/mautrix-telegram/database.db";
-              bot_username = "matrix_tg_146bot";
-              bot_displayname = "matrix tg bridge";
-            };
           };
         };
-        nixpkgs.config.permittedInsecurePackages = [
+        appservice = {
-          "olm-3.2.16"
+          address = "http://127.0.0.1:8482";
-        ];
+          hostname = "0.0.0.0";
-      })
+          port = 8482;
-      (lib.mkIf (cfg.enable && conduwuit-cfg.enable) {
+          database = "sqlite:////var/lib/mautrix-telegram/database.db";
-        services.mautrix-telegram = {
+          bot_username = "matrix_tg_146bot";
-          serviceDependencies = [
+          bot_displayname = "matrix tg bridge";
-            "conduwuit.service"
-          ];
-          settings = {
-            bridge = {
-              permissions = {
-                "${conduwuit-cfg.serverName}" = "full";
-                "@youthlic:${conduwuit-cfg.serverName}" = "admin";
-              };
-            };
-            homeserver = {
-              domain = conduwuit-cfg.serverName;
-              address = "http://127.0.0.1:8481";
-            };
-          };
         };
-      })
+      };
+    };
+    nixpkgs.config.permittedInsecurePackages = [
+      "olm-3.2.16"
     ];
+  };
 }

pkgs/helix/default.nix

@@ -12,6 +12,7 @@
       idris2Packages.idris2Lsp
       lua-language-server
       bash-language-server
+      shfmt
       hurl
       cmake-language-server
       kdlfmt
@@ -31,6 +32,7 @@
       alejandra
       vscode-langservers-extracted
       fish-lsp
+      tailwindcss-language-server
       gopls
       golangci-lint-langserver
       tinymist
@@ -40,6 +42,8 @@
       # nil
       haskell-language-server
       neocmakelsp
+      jdt-language-server
+      zls
     ]
   );
 in