diff --git a/container/proxitok/default.nix b/container/proxitok/default.nix index 7756042..212009f 100644 --- a/container/proxitok/default.nix +++ b/container/proxitok/default.nix @@ -43,6 +43,8 @@ }; }; + systemd.services.redis-proxitok.after = [ "podman-wait-for-host-interface.service" ]; + networking.firewall.interfaces."podman+".allowedTCPPorts = [ 6381 ]; services.nginx.virtualHosts."tictac.daniel.sx" = { diff --git a/flake.lock b/flake.lock index 1fd616d..2cd9da3 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1687290953, - "narHash": "sha256-PF0VGsuLxozDPLEGajGnb5usoO1v7YzzqOcG6k4ndQ4=", + "lastModified": 1687385522, + "narHash": "sha256-GR8mqsqYcdZ67dCcII5SWcwHqPAJRWXPmqsuMl7+KA4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ed275afbbaad9b0670e2aeac3ae542595255d604", + "rev": "bc346a67d34a336ca3c507570875cc88038e6120", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1687134796, - "narHash": "sha256-gjBAkEtNPMQzqK4IHjTQBUv3VhggszOHLJbhXZy0OVQ=", + "lastModified": 1687431792, + "narHash": "sha256-ba5d/XlxQrgNrYeYhriX3FISBMVBF+nKVBMLE0/OC0Q=", "owner": "nix-community", "repo": "disko", - "rev": "4823509bb3b014dc85abefc13efcfa076d36338a", + "rev": "637d87df3fd265a1d1669d897ad9436a87fc5ad8", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1687365523, - "narHash": "sha256-2l/cPXDCDVcLNm+EvCRGJcJ9YxxyLbc2vfTah/t8Qwc=", + "lastModified": 1687444533, + "narHash": "sha256-9IdCN7s7Dr1uKt0uRoYT15cpOjN1qYHpTRPKRHCMc3o=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fefd7bb8da0eec6755747f410fa491411a94296", + "rev": "6c78ba7932567331fb8ebabf34a143b998bb5f23", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1687335032, - "narHash": "sha256-Mcy5o7jnkOjrT0b5haJ2bT+8bqSUoa1z+HW2H7DzaA4=", + "lastModified": 1687421929, + "narHash": "sha256-XMYjDlLTSvI2H4HZjf9jhWXmsCyDq8nujLt6jom89k0=", "owner": "neovim", "repo": "neovim", - "rev": "8d4a53fe6e20652946948170f2436ec520f9bdfe", + "rev": "4d3a04279d32bc97d18ab2883c678c94f80487bc", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1687335565, - "narHash": "sha256-k9cIZ5ZSM2iyuRxPX6fce+qTPegdzu7H+VdgI9mB0l8=", + "lastModified": 1687421950, + "narHash": "sha256-Xjg80TuYSF5CcNJefPExG/lz5y4QQmI/4J7LYUf6z8k=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "7e3f4c1539b2df1c08ad2904802740c42189b6dc", + "rev": "67dbe7962aaecb76d99a286583e64cd56045f616", "type": "github" }, "original": { @@ -355,11 +355,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "lastModified": 1687392660, + "narHash": "sha256-E4bsKvHGFsKYegkfJ/FwR64OMtpjTWHM4CvCyWSTlnM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "rev": "3fb3ce0b6b84d3b4e7b49e142da9c5764b563058", "type": "github" }, "original": { diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index f82c888..ef2fafe 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -11,6 +11,8 @@ bufnr args.buf] (when (client.supports_method :textDocument/documentSymbol) (navic.attach client bufnr)) + (when (client.supports_method :textDocument/inlayHint) + (vim.lsp.buf.inlay_hint bufnr true)) (diagnostic.maybe-enable-lsp client bufnr) (formatting.maybe-enable-lsp client bufnr))) :group augroup diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index d4d8a9a..c596e2d 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -107,23 +107,23 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c9d5812ba358ce9e5ae2df322550cc6bc1678538"; - sha256 = "1s6gxdg0f1wq8kw2x0frjbqq78h7ymdm91jv14ldsasagn7szmjb"; + rev = "ae0415331483bd143f80c186401fb2aa783f33df"; + sha256 = "0wqfnlvjsj61z60i9zgsdkw9vdqwl31k52yjfvbvn6q54v0ahnxm"; fetchSubmodules = false; }; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-06-20"; + version = "2023-06-21"; src = fetchFromGitHub { owner = "HiPhish"; repo = "nvim-ts-rainbow2"; - rev = "a716318361239c9ee5364fc032795679b16762db"; - sha256 = "1k48q777kdxa12l5g47cmrd1lmih3h076jlcsway2anxa7kfjddl"; + rev = "3edad7f978513499651d8b068880948f42c16d79"; + sha256 = "0dlsrzfs3kqkcls5y5zp8sfigazhy821yqbkhz5qln6mzvv7sr43"; fetchSubmodules = false; }; }; @@ -140,12 +140,12 @@ in }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-06-13"; + version = "2023-06-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "00cf15074a2997487813672a75f946d2ead95eb0"; - sha256 = "0zfdcgs67nvhx73nmhv3ppilh9wkf2lv88pniwmf67pnks9x94i3"; + rev = "ffe35cb433192fcb5080b557c1aef14d37092035"; + sha256 = "1kac34kiwnnz3r80pyfx87r730jryqflh3f12hr8z8crzpz262yk"; fetchSubmodules = false; }; }; @@ -220,23 +220,23 @@ in }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-20"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a51892484c2002c083a8b0a9dfcefb3a569be36d"; - sha256 = "02yxlfqlvv8nprk9mbxhw2mh52plcjka5kwbn4h8s4d49dzp396w"; + rev = "11a1be0e5f180b57079db56de10a20b4323111ae"; + sha256 = "0wzf7rk4ff6gkwd40q84as09hxh5w1k4z9nshhz41fgvp9yh46iq"; fetchSubmodules = false; }; }; nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-06-13"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "aebfc22877ab143f907e90889e3903557183a22c"; - sha256 = "0r76y5qz86w55q0sx2jm5ps3j3nm7v5b60w4ln7vk59jz1m01a35"; + rev = "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6"; + sha256 = "0239v4y3hr3g8njd14ii79ndrk56i494nfp1rx4lzj3a2jmx0b4r"; fetchSubmodules = false; }; }; @@ -275,12 +275,12 @@ in }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-06-11"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096"; - sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf"; + rev = "0b99416769e87231ce37aec64b4ed91feb43a98e"; + sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3"; fetchSubmodules = false; }; }; @@ -308,12 +308,12 @@ in }; friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "01f80274100fe3ff6c9183b9c0674a520141be4d"; - sha256 = "1pxbbdjq25ri5jhwl953020xwbzhy564m35xz9vhnv8i2wz8kg2l"; + rev = "5749f093759c29e3694053d048ceb940fe12c3d3"; + sha256 = "1shzw4886qifn90n5kpjhz9iqckqmfgfwmfk9ahkggd6l5844rw9"; fetchSubmodules = false; }; }; @@ -572,12 +572,12 @@ in }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-19"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "39461475d9de676bccc338876689c9e5b44bc932"; - sha256 = "11b4bv0dhy8y478p1gfw2ic47bg0x9v073ljndvcz5qcdh3qpsv9"; + rev = "7d01b45174d0d642302518275ab7cedf73e2690b"; + sha256 = "1712kai7n0cgz1gq9lxka2x83zh647y1gsvp58mh6hbv8cbv9g14"; fetchSubmodules = false; }; }; diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index ea4c348..f713dcd 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -74,7 +74,7 @@ }; }; - documentation.enable = false; + documentation.doc.enable = false; users = { users.daniel = { diff --git a/system/nixos/container.nix b/system/nixos/container.nix index 9e9627f..fa907d4 100644 --- a/system/nixos/container.nix +++ b/system/nixos/container.nix @@ -29,6 +29,18 @@ allowedTCPPorts = [ 53 443 5432 ]; }; + # For services that listen on podman0 + systemd.services.podman-wait-for-host-interface = { + description = "Wait for podman0 to be available"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.bash}/bin/bash -c 'until ${pkgs.iproute2}/bin/ip address show podman0; do sleep 1; done'"; + }; + }; + # It looks like there is no way to activate the "built-in" service and timer ... systemd.services.podman-auto-update-custom = { description = "Run podman auto-update daily"; diff --git a/system/nixos/fedifetcher.nix b/system/nixos/fedifetcher.nix index cb21a4b..56ed03f 100644 --- a/system/nixos/fedifetcher.nix +++ b/system/nixos/fedifetcher.nix @@ -9,7 +9,7 @@ description = "FediFetcher"; wants = [ "mastodon-web.service" ]; after = [ "mastodon-web.service" ]; - wantedBy = [ "multi-user.target" ]; + # wantedBy = [ "multi-user.target" ]; startAt = "*:0/25"; serviceConfig = diff --git a/system/nixos/synapse.nix b/system/nixos/synapse.nix index 914cc05..fff7207 100644 --- a/system/nixos/synapse.nix +++ b/system/nixos/synapse.nix @@ -89,6 +89,8 @@ extraConfigFiles = [ config.age.secrets.synapse-extra-config.path ]; }; + systemd.services.matrix-synapse.after = [ "podman-wait-for-host-interface.service" ]; + networking.firewall.interfaces."podman+".allowedTCPPorts = [ 8008 ]; services.nginx.virtualHosts."matrix.kempkens.io" = {