diff --git a/.zed/settings.json b/.zed/settings.json deleted file mode 100644 index 2c63c08..0000000 --- a/.zed/settings.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/README.md b/README.md index 6b8ac59..d4cd0f9 100644 --- a/README.md +++ b/README.md @@ -14,23 +14,23 @@ Hey, you. This is my nixos configurations. - david@Tytonidae -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | --------- | ----------- | ------ | -------- | --------------- | ------- | -------------- | -| default | niri | fish + bash | helix | ghostty | fuzzel | firefox | gdm | -| cosmic | cosmic de | fish + bash | helix | ghostty | cosmic-launcher | firefox | cosmic-greeter | -| kde | kde | fish + bash | helix | ghostty | - | firefox | sddm | +| Specialisation | DE / WM | Shell | Editor | Termianal | Launcher | Browser | DM | +| -------------- | --------- | ----------- | ------ | --------- | --------------- | ------- | -------------- | +| default | niri | fish + bash | helix | ghostty | fuzzel | firefox | gdm | +| cosmic | cosmic de | fish + bash | helix | ghostty | cosmic-launcher | firefox | cosmic-greeter | +| kde | kde | fish + bash | helix | ghostty | - | firefox | sddm | - david@Akun -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | -------------- | -| default | cosmic | fish + bash | helix | ghostty | - | firefox | cosmic-greeter | +| Specialisation | DE / WM | Shell | Editor | Termianal | Launcher | Browser | DM | +| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | -------------- | +| default | cosmic | fish + bash | helix | ghostty | - | firefox | cosmic-greeter | - alice@Cape -| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM | -| -------------- | ------- | ----------- | ------ | -------- | -------- | ------- | --- | -| default | - | fish + bash | helix | - | - | - | - | +| Specialisation | DE / WM | Shell | Editor | Termianal | Launcher | Browser | DM | +| -------------- | ------- | ----------- | ------ | --------- | -------- | ------- | -- | +| default | - | fish + bash | helix | - | - | - | - | ## FlakE OutputS and StructurE diff --git a/codebook.toml b/codebook.toml deleted file mode 100644 index 8a78c62..0000000 --- a/codebook.toml +++ /dev/null @@ -1,18 +0,0 @@ -words = [ - "akun", - "configuratio", - "fuzzel", - "gdm", - "ghostty", - "kde", - "niri", - "nixo", - "nixos", - "nixpkgs", - "ovelrays", - "pkgs", - "sddm", - "specialisation", - "structur", - "tytonidae", -] diff --git a/flake.lock b/flake.lock index 6e443dd..2474791 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1745971833, - "narHash": "sha256-Hmt7smJEB2aKw3XW02Vzgr0bTULpM1CtSy1MTecmIxs=", + "lastModified": 1745683860, + "narHash": "sha256-WYvZhHXVZuinCiLuYzPvSqMJ96SkATjinC9Ifs/0jfY=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "10919722f131dbac0413cdbd385ff0b634d3d7fe", + "rev": "fd8a43e0cffe6aef96de5c5041cf499ce0e4c67e", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1745812220, - "narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", + "lastModified": 1745502102, + "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", "owner": "nix-community", "repo": "disko", - "rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", + "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745971585, - "narHash": "sha256-v8QVD+V7CCVZ+QHk2mdT2X3U9FIe2vEoOVsgnQBjZ5I=", + "lastModified": 1745607661, + "narHash": "sha256-72OO+/vP4h7uiZ1gdGmFf1z+17NxCt8dhrRD+mltW44=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b3edc88010e38946072a58fe336081ed104c9d44", + "rev": "38445dca2ac2af176c7f3b205d88d697cf8c89c8", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745933300, - "narHash": "sha256-BJpxqZar6vrmv1MtZIjmBa7x+0HEP8kmYeFejz7m2uc=", + "lastModified": 1745684178, + "narHash": "sha256-SnYTNyXGRng1qHmRtbOG9K31c5h6p77hlGPZK5oKgqE=", "owner": "helix-editor", "repo": "helix", - "rev": "1c32fb2d4df3f06f96ca33db7d9f9b15297c7f8d", + "rev": "2ec59f8ff6d43f5ac72e745ec614c26de192aedd", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1745987135, - "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", + "lastModified": 1745627989, + "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", + "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745943971, - "narHash": "sha256-syIS3vBo7DX/cP49bfZPYmw3vhMCmyrnD6HiUlOAvx8=", + "lastModified": 1745634143, + "narHash": "sha256-9MopKYFjE+4URe/ZmBt4i3g9cvdAJ6MJ4LM21DDXqzc=", "owner": "jj-vcs", "repo": "jj", - "rev": "3ab9e098d778969a91d46290615c436ab41d71f9", + "rev": "13477940af42a74a58caaaaeafdbd322cfebb81d", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745965399, - "narHash": "sha256-RxoK/Eo9cWGtGMl3enYu/LH/SAcFGR2PWuAifQm4dUc=", + "lastModified": 1745668007, + "narHash": "sha256-xYf6xz8WOW9ztBi356dHdqLsTCoxVS8Iapfpwosrn7Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc29338ba733e4c1b94c3ed134baabfea587627e", + "rev": "8fdaf610c455d0b5b70374a21392a717be513b0f", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745913113, - "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=", + "lastModified": 1745663376, + "narHash": "sha256-mGQyB+Epl87ZCZZCcBkjUrdR1aJt8Ybiqr4h0yUkgQI=", "owner": "YaLTeR", "repo": "niri", - "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246", + "rev": "78e3daf5f82b5870e998faf0e1efeaa048730976", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1745924915, - "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=", + "lastModified": 1745665695, + "narHash": "sha256-oUFoPmT2/ww1bIU0Vmifx9BdarVqlv9MyEIxUTqYJnM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "329a9d639f0418cce05937a823f43b2b64191653", + "rev": "48280c3737fee2db3a1226c297c86428417f552d", "type": "github" }, "original": { @@ -619,11 +619,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -682,11 +682,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -698,11 +698,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -714,11 +714,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -754,11 +754,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1745752599, - "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=", + "lastModified": 1745419403, + "narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e", + "rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72", "type": "gitlab" }, "original": { @@ -859,11 +859,11 @@ ] }, "locked": { - "lastModified": 1745894113, - "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", + "lastModified": 1745634793, + "narHash": "sha256-8AuOyfLNlcbLy0AqERSNUUoDdY+3THZI7+9VrXUfGqg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", + "rev": "f1aeaeb91ba9c88f235ab82bd23d7a4931fe736c", "type": "github" }, "original": { @@ -920,11 +920,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745962538, - "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=", + "lastModified": 1745618823, + "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", "owner": "danth", "repo": "stylix", - "rev": "764fd32955e79f2742a7975f0150175f93add2fb", + "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1745730655, - "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=", + "lastModified": 1745372360, + "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153", + "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", "type": "github" }, "original": { diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index 709398f..6f96f60 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -7,18 +7,15 @@ }: { youthlic = { xdg-dirs.enable = true; - programs = let - email = config.accounts.email.accounts.ulic-youthlic; - inherit (email) address name; - signKey = email.gpg.key; - in { + programs = { firefox.enable = true; fuzzel.enable = true; helix.enable = true; gpg.enable = true; git = { - inherit name signKey; - email = address; + email = "ulic.youthlic@gmail.com"; + name = "ulic-youthlic"; + signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; encrypt-credential = true; }; zed-editor.enable = true; @@ -26,8 +23,9 @@ bash.enable = true; jujutsu = { enable = true; - inherit name signKey; - email = address; + email = "ulic.youthlic@gmail.com"; + name = "ulic-youthlic"; + signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; }; ghostty.enable = true; starship.enable = true; @@ -36,14 +34,12 @@ 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; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 01f4cb8..0607120 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -8,11 +8,7 @@ }: { youthlic = { xdg-dirs.enable = true; - programs = let - email = config.accounts.email.accounts.ulic-youthlic; - inherit (email) name address; - signKey = email.gpg.key; - in { + programs = { zed-editor.enable = true; rustypaste-cli.enable = true; firefox.enable = true; @@ -21,12 +17,14 @@ gpg.enable = true; jujutsu = { enable = true; - inherit name signKey; - email = address; + email = "ulic.youthlic@gmail.com"; + name = "ulic-youthlic"; + signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; }; git = { - inherit name signKey; - email = address; + email = "ulic.youthlic@gmail.com"; + name = "ulic-youthlic"; + signKey = "C6FCBD7F49E1CBBABD6661F7FC02063F04331A95"; encrypt-credential = true; }; fish.enable = true; @@ -47,7 +45,6 @@ david = { wallpaper.enable = true; - accounts.email.enable = true; programs = { niri.enable = true; openssh.enable = true; diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix index f1ab621..6a20236 100644 --- a/home/david/modules/default.nix +++ b/home/david/modules/default.nix @@ -2,7 +2,6 @@ imports = [ ./wallpaper.nix ./programs - ./emails.nix ]; config = { services.mpris-proxy.enable = true; diff --git a/home/david/modules/emails.nix b/home/david/modules/emails.nix deleted file mode 100644 index 7c0ef73..0000000 --- a/home/david/modules/emails.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - 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; - }; - }; - }; - }; -} diff --git a/home/modules/programs/gpg/default.nix b/home/modules/programs/gpg/default.nix index 060a921..0700ddd 100644 --- a/home/modules/programs/gpg/default.nix +++ b/home/modules/programs/gpg/default.nix @@ -18,9 +18,7 @@ { enable = true; enableSshSupport = true; - pinentry = { - package = outputs.packages."${pkgs.system}".pinentry-selector; - }; + pinentryPackage = outputs.packages."${pkgs.system}".pinentry-selector; # sshKeys = [ # "C817E333BF88F16EA0F7ADE27BDCCC16AD25E5A6" # ]; diff --git a/home/modules/programs/zed.nix b/home/modules/programs/zed.nix index 31dfde0..731d932 100644 --- a/home/modules/programs/zed.nix +++ b/home/modules/programs/zed.nix @@ -16,93 +16,26 @@ in { programs.zed-editor = { enable = true; extensions = [ - "asciidoc" - "basher" - "cargo-tom" - "codebook" - "deno" - "docker-compose" - "dockerfile" - "fish" - "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" + "Nix" + "HTML" + "Java" + "Git Firely" + "Make" + "Deno" + "Java with Eclipse JDTLS" + "NeoCMake" + "Typst" ]; 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 - deno - alejandra - vscode-langservers-extracted - fish-lsp - tailwindcss-language-server - gopls - golangci-lint-langserver - tinymist - delve - lldb - rust-analyzer - # nil - haskell-language-server + nil neocmakelsp + deno 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; diff --git a/nixos/configurations/Cape/default.nix b/nixos/configurations/Cape/default.nix index 5e50bc5..6271f80 100644 --- a/nixos/configurations/Cape/default.nix +++ b/nixos/configurations/Cape/default.nix @@ -25,6 +25,11 @@ }; openssh.enable = true; tailscale.enable = true; + # conduwuit = { + # enable = true; + # serverName = "im.youthlic.fun"; + # }; + mautrix-telegram.enable = true; caddy = { enable = true; baseDomain = "youthlic.fun"; diff --git a/nixos/modules/programs/conduwuit.nix b/nixos/modules/programs/conduwuit.nix new file mode 100644 index 0000000..4a5f1d2 --- /dev/null +++ b/nixos/modules/programs/conduwuit.nix @@ -0,0 +1,61 @@ +{ + 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 + ''; + }; + }; + }) + ]; +} diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index 6e2ddd3..f9901ad 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -19,6 +19,7 @@ ./steam.nix ./tailscale.nix ./transmission.nix + ./conduwuit.nix ./nix-ld.nix ./juicity ./miniflux.nix diff --git a/nixos/modules/programs/mautrix-telegram.nix b/nixos/modules/programs/mautrix-telegram.nix index 175986f..5e90e05 100644 --- a/nixos/modules/programs/mautrix-telegram.nix +++ b/nixos/modules/programs/mautrix-telegram.nix @@ -10,29 +10,54 @@ in { enable = lib.mkEnableOption "mautrix-telegram"; }; }; - config = lib.mkIf cfg.enable { - sops.secrets.matrix-telegram-bot = {}; - services.mautrix-telegram = { - enable = true; - environmentFile = "${config.sops.secrets.matrix-telegram-bot.path}"; - settings = { - bridge = { - permissions = { - "*" = "relaybot"; + config = let + conduwuit-cfg = config.youthlic.programs.conduwuit; + caddy-cfg = config.youthlic.programs.caddy; + in + lib.mkMerge [ + (lib.mkIf cfg.enable { + sops.secrets.matrix-telegram-bot = {}; + services.mautrix-telegram = { + enable = true; + 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"; + }; }; }; - 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 = [ + "olm-3.2.16" + ]; + }) + (lib.mkIf (cfg.enable && conduwuit-cfg.enable) { + services.mautrix-telegram = { + serviceDependencies = [ + "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" + }) ]; - }; } diff --git a/pkgs/helix/default.nix b/pkgs/helix/default.nix index af7e60b..eb9489f 100644 --- a/pkgs/helix/default.nix +++ b/pkgs/helix/default.nix @@ -12,7 +12,6 @@ idris2Packages.idris2Lsp lua-language-server bash-language-server - shfmt hurl cmake-language-server kdlfmt @@ -32,7 +31,6 @@ alejandra vscode-langservers-extracted fish-lsp - tailwindcss-language-server gopls golangci-lint-langserver tinymist @@ -42,8 +40,6 @@ # nil haskell-language-server neocmakelsp - jdt-language-server - zls ] ); in