From 6a3acc26888122b49f43b700895e150545185427 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 15 Aug 2023 16:35:09 +0200 Subject: [PATCH] Update deps --- flake.lock | 30 +++++++++++++++--------------- home/hosts/Styx.nix | 1 + home/programs/nvim/plugins.nix | 18 +++++++++--------- system/nixos/bdfr-browser.nix | 20 +++++++++++--------- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 4fd12cf..d262f85 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1692018327, - "narHash": "sha256-2u2bOGR1D7YUiCkrQ98+o2Y1A+SaqLKeq9IG40ENH9M=", + "lastModified": 1692104626, + "narHash": "sha256-NfsoXKc9OzRzq2j227tnf8tUOl77wW79wSqBqOEWqAg=", "owner": "nifoc", "repo": "bdfr-browser", - "rev": "23a1d6a9d65cfa9c85f279787ddb5b4350fbb68b", + "rev": "5a9ecce1cf10e72070c8c20053f7dd6d734a7ddb", "type": "github" }, "original": { @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1691998815, - "narHash": "sha256-HuFgb+W1Dvd0mjjudpTf0hVg/YKKiMRpX14t7dJeTm8=", + "lastModified": 1692081771, + "narHash": "sha256-LWhyDz3gi1RzTcW6e6iwfs4VuDWFajOexBKygNIqvQM=", "owner": "nix-community", "repo": "home-manager", - "rev": "da6874e8bb82204323b94154585a1471c739f73e", + "rev": "18791781ea86cbec6bce8bcb847444b9c73b8b3b", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1691999605, - "narHash": "sha256-4j4ieCrgjNxaPrshyPSquEpDzhJMOX93MBlyBuNOHnA=", + "lastModified": 1692104068, + "narHash": "sha256-HJD9iNoTaYkx3j3GS5WHmr/Lgh+R0oe9ALjx7GlOrZg=", "owner": "neovim", "repo": "neovim", - "rev": "6d93bdd458a03bd07b1797e43bb11e3be560d340", + "rev": "fc14928719df12826397b46b1765b82f1fc7d1d8", "type": "github" }, "original": { @@ -539,11 +539,11 @@ "weewx-proxy-flake": "weewx-proxy-flake" }, "locked": { - "lastModified": 1692018495, - "narHash": "sha256-GFjT/9FxgYq8Gh5GuBcBt3XyzlV6w2aKKtI1PbWb7nU=", + "lastModified": 1692104701, + "narHash": "sha256-FSqT/wPjfvyKir0xuE/4Y2OYfTh44A/F3bV3yllKNd0=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "2fb150b9d98948add470b4a16345c7e761c14699", + "rev": "895eda929af457581958c0e25b551f2279004207", "type": "github" }, "original": { @@ -606,11 +606,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691976506, - "narHash": "sha256-EqdSK1LBlzQ56oFRYVmk7xdWrqtqZJy9G1xy0cQekjw=", + "lastModified": 1692067901, + "narHash": "sha256-kq8Pf/nmlXECDWMkQSRGQkjWsA6G0pjzZkfUEaTmXJE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "81b970640e56a5c07a336d2c05018b0c9bf57a51", + "rev": "ea95c0917609e5c48023cc7c6141bea2fdf13970", "type": "github" }, "original": { diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index 7f992d4..b3ae26c 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -64,6 +64,7 @@ ouch parallel q + rexit ripgrep socat tokei diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 80013f1..cf788d8 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -118,12 +118,12 @@ in }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-14"; + version = "2023-08-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "93ee00cd9daf8d2e3fbaa2a18b8b9adcb4471b16"; - sha256 = "17wl41myiz80s9sv2lw9lkr5z57wca0qwqlizzrxp9w9pqs4dd4k"; + rev = "11d79aa0f731439f2cd05579a64ac13857002f16"; + sha256 = "15m6f8kv40pinbwh6gnrxrhj0bs86853cg6nvnfy8gamhimmh56s"; fetchSubmodules = false; }; }; @@ -242,12 +242,12 @@ in }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-08-11"; + version = "2023-08-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a981d4447b92c54a4d464eb1a76b799bc3f9a771"; - sha256 = "0bcfrz5r1d5v5iizjirfg3hfzlb415557zhvkdig3ciphbly3ccj"; + rev = "0d29cad8de3b2c654315203fc1fe12fde722a18a"; + sha256 = "1gp6prlg2bvgsnxv8650ywsi05079qwcq7zywh55cnzrvqfspjh0"; fetchSubmodules = false; }; }; @@ -572,12 +572,12 @@ in }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-08-09"; + version = "2023-08-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "bae45ef449d8811061cc940459e70e883a3aa83a"; - sha256 = "0ns6qhw79fjxns6x36474dsl6ihqw2sxxm126bpgi9612cq134gs"; + rev = "55f8fc7b13205d44359080ed00095674c353bd76"; + sha256 = "0idbyfq628ylbbgv4m4p8h72fz0wcblrkamrwjvsryw7vmdb4f4g"; fetchSubmodules = false; }; }; diff --git a/system/nixos/bdfr-browser.nix b/system/nixos/bdfr-browser.nix index c57adaf..1ce4c9a 100644 --- a/system/nixos/bdfr-browser.nix +++ b/system/nixos/bdfr-browser.nix @@ -2,32 +2,32 @@ let baseDirectory = "/mnt/media-scraper/Reddit"; + chatDirectory = "/mnt/media-scraper/RedditChat"; + workingDirectory = "/var/lib/bdfr-browser"; in { systemd.services.bdfr-browser = { description = "A crude BDFR browser UI"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; + path = with pkgs; [ busybox inotify-tools ]; serviceConfig = { DynamicUser = true; StateDirectory = "bdfr-browser"; + WorkingDirectory = workingDirectory; Environment = [ "BDFR_BROWSER_BASE_DIRECTORY=${baseDirectory}" - "BDFR_BROWSER_CHAT_DIRECTORY=/mnt/media-scraper/RedditChat" + "BDFR_BROWSER_CHAT_DIRECTORY=${chatDirectory}" + "BDFR_BROWSER_WATCH_DIRECTORIES=false" "BDFR_BROWSER_REPO_DATABASE=bdfr-browser" "BDFR_BROWSER_REPO_SOCKET_DIR=/run/postgresql" + "RELEASE_TMP=${workingDirectory}" "RELEASE_DISTRIBUTION=none" "RELEASE_COOKIE=no_dist_anyway" ]; ExecStart = "${pkgs.bdfr-browser}/bin/bdfr_browser start"; - ExecStop = "${pkgs.bdfr-browser}/bin/bdfr_browser stop"; - ExecReload = "${pkgs.bdfr-browser}/bin/bdfr_browser restart"; - Type = "notify"; - WatchdogSec = "10s"; + Type = "exec"; Restart = "on-failure"; - RestartSec = 5; - StartLimitBurst = 3; - StartLimitInterval = 10; }; }; @@ -44,5 +44,7 @@ in }; locations."/media/".alias = "${baseDirectory}/"; + + locations."/chat_media/".alias = "${chatDirectory}/images/"; }; }