diff --git a/flake.lock b/flake.lock index 9d36c5a..42f45c9 100644 --- a/flake.lock +++ b/flake.lock @@ -48,6 +48,31 @@ "type": "github" } }, + "bdfr-browser-flake": { + "inputs": { + "flake-parts": [ + "nifoc-overlay", + "flake-parts" + ], + "nixpkgs": [ + "nifoc-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684407167, + "narHash": "sha256-3q7LCEomvBSu0Rz0jeJ4vLneRarNpUUWumCWNi7tLqk=", + "owner": "nifoc", + "repo": "bdfr-browser", + "rev": "5078b3ec0743756bdfd4fc6c4cc4b558d554dd6e", + "type": "github" + }, + "original": { + "owner": "nifoc", + "repo": "bdfr-browser", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": [ @@ -85,11 +110,11 @@ ] }, "locked": { - "lastModified": 1684148371, - "narHash": "sha256-CEVaArsziqantqU418XXruNDjPZN/HC3x1rqr2D4g+o=", + "lastModified": 1684343812, + "narHash": "sha256-ZTEjiC8PDKeP8JRchuwcFXUNlMcyQ4U+DpyVZ3pB6Q4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0dbf1c2fb1a5a0372a324eff1ba44f9da66febd2", + "rev": "dfbdabbb3e797334172094d4f6c0ffca8c791281", "type": "github" }, "original": { @@ -228,11 +253,11 @@ ] }, "locked": { - "lastModified": 1684189380, - "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", + "lastModified": 1684321175, + "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", + "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", "type": "github" }, "original": { @@ -251,11 +276,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1684251707, - "narHash": "sha256-ldXse+DvrDJnlnCJK2e8+RM5ftvk71u2E1aMeY3o/Fc=", + "lastModified": 1684403521, + "narHash": "sha256-leuZjb24n/u6cKh8hXhInZ2HU/JVI3N7oW4ZHaNMfM8=", "owner": "neovim", "repo": "neovim", - "rev": "6b19170d44ca56cf65542ee184d2bc89c6d622a9", + "rev": "ef64e225f6f6c01280aa8472bebe812016f357bf", "type": "github" }, "original": { @@ -267,6 +292,7 @@ }, "nifoc-overlay": { "inputs": { + "bdfr-browser-flake": "bdfr-browser-flake", "flake-parts": "flake-parts", "neovim-flake": "neovim-flake", "nixpkgs": [ @@ -274,11 +300,11 @@ ] }, "locked": { - "lastModified": 1684311598, - "narHash": "sha256-+9mG2JjbNFEtxehnXzpOEp67Ry9S+ZjK/0W5yqsxgRs=", + "lastModified": 1684407250, + "narHash": "sha256-U2jIuFI31Te+1KSxYe0Ik0F6EbN+iLOe1YPo3qxdIes=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "dcbbc9268496bfed5b79eeaa632b86ffa56e164f", + "rev": "f093936ccc6cb02c25eb3523efdf87d9d5419583", "type": "github" }, "original": { @@ -289,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684242266, - "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=", + "lastModified": 1684363872, + "narHash": "sha256-jkvhzrICFSmj+NBHksKTWzs8Q3+D7RsVK0wLKacbu8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad", + "rev": "1d77f3b72756ca36f16440c59e6b89a957908647", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a995d3..a6088ab 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,5 @@ mediaserver = mediaserver.deployment; adsb-antenna = adsb-antenna.deployment; }; - - checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib; }; } diff --git a/home/config/nvim/plugins/treesitter.fnl b/home/config/nvim/plugins/treesitter.fnl index 367f7a7..31686ae 100644 --- a/home/config/nvim/plugins/treesitter.fnl +++ b/home/config/nvim/plugins/treesitter.fnl @@ -6,6 +6,7 @@ :comment :css :dockerfile + :eex :elixir :erlang :fennel diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index f7828a5..069c0b1 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -61,6 +61,7 @@ in p.comment p.css p.dockerfile + p.eex p.elixir p.erlang p.fennel diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index a4c2645..251a86c 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -85,12 +85,12 @@ in }; leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-04-28"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "6f2912755c9c4ae790abd829f0cf1b07c037b2a4"; - sha256 = "1xakvx3sxg2l23bqm2r08pcybvi7cx79602dxra0iprr05wg3xzk"; + rev = "3144cefc5ec8872c838dc6710707d23b6de5ec02"; + sha256 = "0djg0hbcgd5ngpnv6vibkz3qbnk25m5hw9d5gzkrscn52j4z81mc"; fetchSubmodules = false; }; }; @@ -107,12 +107,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-05-17"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "aa44e5fc5f301eb934698b04c71e65b44c21c4fe"; - sha256 = "1j8w7j13nmbp811airnr5q7p1z7v12p5vh3si1nnpcayygnhplbb"; + rev = "4d0520ee0903eb04c218447b48fa30ffbd4682cc"; + sha256 = "0jcs1dr7aajg1zmanvsnpxbv8bhhaz713fjlipqsfvxxzww6y68a"; fetchSubmodules = false; }; }; @@ -220,12 +220,12 @@ in }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-05-17"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8dc45a5c142f0b5a5dd34e5cdba33217d5dc6a86"; - sha256 = "0f7ip52gkmw45wm857p4ra3l7hl9c9mhafx1gn927zvjjlfv9ksq"; + rev = "32a5543fe3a7f108c1488c265052572abbf6f588"; + sha256 = "1n629whwj6ki9dyhrc2kbsfaqywz8jjp9cj69vwyiiw1ic3p91ml"; fetchSubmodules = false; }; }; @@ -484,12 +484,12 @@ in }; heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-04-20"; + version = "2023-05-17"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "2aed06a3a04c877dc64834e9b9dabf6ad3491bc8"; - sha256 = "1sqhnhc749hm1bpy6s49w8jb3zpzj2azpj2hszn13ml1g1ps5iv7"; + rev = "2a151df2dc870e79b138a59ebaaaddf3d1b0d703"; + sha256 = "1sx2nl6w78m03n0aipv8v9r5w32zivx24ljfa6m00ni39acm0d1a"; fetchSubmodules = false; }; }; @@ -517,12 +517,12 @@ in }; toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-04-24"; + version = "2023-05-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "68fdf851c2b7901a7065ff129b77d3483419ddce"; - sha256 = "04lphxnwzlsacszdikzwipm8wycwzi0zyz1lvpqplpk6vrfbb58v"; + rev = "26f16d3bab1761d0d11117a8e431faba11a1b865"; + sha256 = "0yk1w6fh3misj5hds6wfs4a0yxlijxyppcv9rph5f7nd9dbayin5"; fetchSubmodules = false; }; }; diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index edae37e..7b64507 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -18,6 +18,8 @@ in ../nixos/attic.nix + ../nixos/bdfr-browser.nix + ../nixos/tailscale.nix ../nixos/mediaserver-setup.nix diff --git a/system/nixos/bdfr-browser.nix b/system/nixos/bdfr-browser.nix new file mode 100644 index 0000000..4d909bf --- /dev/null +++ b/system/nixos/bdfr-browser.nix @@ -0,0 +1,40 @@ +{ pkgs, ... }: + +let + baseDirectory = "/mnt/media-scraper/Reddit"; +in +{ + systemd.services.bdfr-browser = { + description = "A crude BDFR browser UI"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + StateDirectory = "bdfr-browser"; + Environment = [ + "BDFR_BROWSER_BASE_DIRECTORY=${baseDirectory}" + "RELEASE_DISTRIBUTION=none" + "RELEASE_COOKIE=no_dist_anyway" + ]; + ExecStart = "${pkgs.bdfr-browser}/bin/bdfr_browser start"; + Type = "notify"; + WatchdogSec = "10s"; + Restart = "on-failure"; + }; + }; + + services.nginx.virtualHosts."bdfr.internal.kempkens.network" = { + quic = true; + http3 = true; + + onlySSL = true; + useACMEHost = "internal.kempkens.network"; + + locations."/" = { + recommendedProxySettings = true; + proxyPass = "http://127.0.0.1:4040"; + }; + + locations."/media/".alias = "${baseDirectory}/"; + }; +}