1
0
Fork 0

Update deps

This commit is contained in:
Daniel Kempkens 2023-08-14 15:37:36 +02:00
parent 401edbbeb7
commit 7fe2f1536f
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
4 changed files with 236 additions and 53 deletions

View file

@ -35,11 +35,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1689457600, "lastModified": 1691972610,
"narHash": "sha256-1XLn2ZZMaqQx+Ys3eel5hQRkgUn3DeHcVb2JT8WYU0A=", "narHash": "sha256-01X6GZ7nGZIvqzjM7zfnRemNXwgx5kneMldbTqRnPTU=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "4902d57f5dae8ec660ee9ee14c45c2192f9fe8b1", "rev": "f4cf5704d64303ad11cc6918fbc6ab3cab6ca333",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,17 +54,22 @@
"nifoc-overlay", "nifoc-overlay",
"flake-parts" "flake-parts"
], ],
"flake-root": "flake-root_2",
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay", "nifoc-overlay",
"nixpkgs" "nixpkgs"
] ],
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"process-compose-flake": "process-compose-flake",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1685045248, "lastModified": 1692018327,
"narHash": "sha256-vM0oSGwW2TxlA4JnTSFRyHX994ajIunk4hIE5EvzltI=", "narHash": "sha256-2u2bOGR1D7YUiCkrQ98+o2Y1A+SaqLKeq9IG40ENH9M=",
"owner": "nifoc", "owner": "nifoc",
"repo": "bdfr-browser", "repo": "bdfr-browser",
"rev": "c819ff2f203c8390f2a1f46c3fb23375281d6e77", "rev": "23a1d6a9d65cfa9c85f279787ddb5b4350fbb68b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691743546, "lastModified": 1691999995,
"narHash": "sha256-nS2uWOeEmMgUBEMDCvwLlXBBCLkW7agDcMtOXuf9PDc=", "narHash": "sha256-8DyiH3zEdouwNhW68BkHrfoDYX9Cf1So6u8mCWN0iIo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "241c878d4b542fea7c61ed4421e9224af054ff56", "rev": "6388d2859c91adab847b4922b726f61920074494",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,6 +214,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@ -275,6 +296,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-root_3": {
"locked": {
"lastModified": 1680964220,
"narHash": "sha256-dIdTYcf+KW9a4pKHsEbddvLVSfR1yiAJynzg2x0nfWg=",
"owner": "srid",
"repo": "flake-root",
"rev": "f1c0b93d05bdbea6c011136ba1a135c80c5b326c",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -344,7 +380,47 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": {
"nixpkgs": [
"nifoc-overlay",
"bdfr-browser-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay", "nifoc-overlay",
@ -366,7 +442,7 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": { "gitignore_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"pre-commit-hooks-nix", "pre-commit-hooks-nix",
@ -415,11 +491,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691882297, "lastModified": 1691998815,
"narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", "narHash": "sha256-HuFgb+W1Dvd0mjjudpTf0hVg/YKKiMRpX14t7dJeTm8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c3ab5ea047e6dc73df530948f7367455749d8906", "rev": "da6874e8bb82204323b94154585a1471c739f73e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,7 +506,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay", "nifoc-overlay",
"nixpkgs" "nixpkgs"
@ -438,11 +514,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1691907248, "lastModified": 1691999605,
"narHash": "sha256-Is8WVxLtxENVu3m7UQRz6sZYZ0/GhrPMfsvOQRQq59Y=", "narHash": "sha256-4j4ieCrgjNxaPrshyPSquEpDzhJMOX93MBlyBuNOHnA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "7b0123dd6a06a032516cce66d82c064b1d942013", "rev": "6d93bdd458a03bd07b1797e43bb11e3be560d340",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +539,11 @@
"weewx-proxy-flake": "weewx-proxy-flake" "weewx-proxy-flake": "weewx-proxy-flake"
}, },
"locked": { "locked": {
"lastModified": 1691914610, "lastModified": 1692018495,
"narHash": "sha256-0fB5U1sCg8jV2Ej7Jm/zyQBH8g938y0DvbCGeOxUrg0=", "narHash": "sha256-GFjT/9FxgYq8Gh5GuBcBt3XyzlV6w2aKKtI1PbWb7nU=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "c55b6aaee03661054d18cb3acf9d593740007121", "rev": "2fb150b9d98948add470b4a16345c7e761c14699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +559,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691640097, "lastModified": 1691963303,
"narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -514,11 +590,11 @@
}, },
"nixos-stable": { "nixos-stable": {
"locked": { "locked": {
"lastModified": 1691831739, "lastModified": 1691950488,
"narHash": "sha256-6e12VCvA7jOjhzJ1adLiUV1GTPXGBcCfhggsDwiuNB4=", "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3fe694c4156b84dac12627685c7ae592a71e2206", "rev": "720e61ed8de116eec48d6baea1d54469b536b985",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +606,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691853136, "lastModified": 1691976506,
"narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", "narHash": "sha256-EqdSK1LBlzQ56oFRYVmk7xdWrqtqZJy9G1xy0cQekjw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f0451844bbdf545f696f029d1448de4906c7f753", "rev": "81b970640e56a5c07a336d2c05018b0c9bf57a51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,10 +704,56 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"gitignore": [
"nifoc-overlay",
"bdfr-browser-flake",
"gitignore"
],
"nixpkgs": [
"nifoc-overlay",
"bdfr-browser-flake",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1691747570,
"narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks-nix_2": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4",
"gitignore": [ "gitignore": [
"nifoc-overlay", "nifoc-overlay",
"weewx-proxy-flake", "weewx-proxy-flake",
@ -642,7 +764,7 @@
"weewx-proxy-flake", "weewx-proxy-flake",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1690743255, "lastModified": 1690743255,
@ -658,15 +780,15 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks-nix_2": { "pre-commit-hooks-nix_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"gitignore": "gitignore_2", "gitignore": "gitignore_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1691747570, "lastModified": 1691747570,
@ -682,6 +804,21 @@
"type": "github" "type": "github"
} }
}, },
"process-compose-flake": {
"locked": {
"lastModified": 1691182187,
"narHash": "sha256-dmHKgFXstdfX7nfnpbzR5H4DWGdWo610zsW9BCtI2WQ=",
"owner": "Platonic-Systems",
"repo": "process-compose-flake",
"rev": "bacdaf54ffe3a2c1734fd973a95e6b39b1560c2e",
"type": "github"
},
"original": {
"owner": "Platonic-Systems",
"repo": "process-compose-flake",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -696,8 +833,8 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-stable": "nixos-stable", "nixos-stable": "nixos-stable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_3"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -772,7 +909,44 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nifoc-overlay",
"bdfr-browser-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1691833704,
"narHash": "sha256-ASGhgGduEgcD3gQZhGr8xtmZ3PlVY+m2HuPnIZDbu78=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "19dee4bf6001849006a63f3435247316b0488e99",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay", "nifoc-overlay",
@ -794,7 +968,7 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix_2": { "treefmt-nix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -835,14 +1009,14 @@
"nifoc-overlay", "nifoc-overlay",
"flake-parts" "flake-parts"
], ],
"flake-root": "flake-root_2", "flake-root": "flake-root_3",
"gitignore": "gitignore", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay", "nifoc-overlay",
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1691607477, "lastModified": 1691607477,

View file

@ -118,12 +118,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-08-13"; version = "2023-08-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "bc52938ddde0ff6b3d51ff215d2c66f2e39b7099"; rev = "93ee00cd9daf8d2e3fbaa2a18b8b9adcb4471b16";
sha256 = "14rqwbcbw7zya4f6k6pmgq4h42bvbcbnaizj0xr4nih1jbllbsgk"; sha256 = "17wl41myiz80s9sv2lw9lkr5z57wca0qwqlizzrxp9w9pqs4dd4k";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -319,23 +319,23 @@ in
}; };
LuaSnip = buildVimPluginFrom2Nix { LuaSnip = buildVimPluginFrom2Nix {
pname = "LuaSnip"; pname = "LuaSnip";
version = "2023-08-04"; version = "2023-08-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "L3MON4D3"; owner = "L3MON4D3";
repo = "LuaSnip"; repo = "LuaSnip";
rev = "99a94cc35ec99bf06263d0346128e908a204575c"; rev = "409535b8fc54c650eb845b0c35e0cc7f08810284";
sha256 = "0b4c0kgm1dcngyfhh5dk875sjkagqvj8aqz5hb7hxvqpipkv6vy7"; sha256 = "0w898yhw1r263xz9ih20cs1amdkjhmbmi5lgnzwfamwvgdqf5nf3";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-07-24"; version = "2023-08-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "bc38057e513458cb2486b6cd82d365fa294ee398"; rev = "377d45475b49e37460a902d6d569d2093d4037d0";
sha256 = "1l2czwjsskcywjvayx1wcg5538fs2pfp88shx14c9s5q4h0v247m"; sha256 = "0yk612n3ayn0kv1smv945hz8rl395ask4wp45iqymvzia6jp6k4a";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

View file

@ -15,6 +15,7 @@ in
../nixos/acme-mediaserver.nix ../nixos/acme-mediaserver.nix
../nixos/nginx.nix ../nixos/nginx.nix
../nixos/postgresql.nix
(import ../nixos/adguardhome.nix (args // { inherit secret; })) (import ../nixos/adguardhome.nix (args // { inherit secret; }))

View file

@ -13,13 +13,21 @@ in
StateDirectory = "bdfr-browser"; StateDirectory = "bdfr-browser";
Environment = [ Environment = [
"BDFR_BROWSER_BASE_DIRECTORY=${baseDirectory}" "BDFR_BROWSER_BASE_DIRECTORY=${baseDirectory}"
"BDFR_BROWSER_CHAT_DIRECTORY=/mnt/media-scraper/RedditChat"
"BDFR_BROWSER_REPO_DATABASE=bdfr-browser"
"BDFR_BROWSER_REPO_SOCKET_DIR=/run/postgresql"
"RELEASE_DISTRIBUTION=none" "RELEASE_DISTRIBUTION=none"
"RELEASE_COOKIE=no_dist_anyway" "RELEASE_COOKIE=no_dist_anyway"
]; ];
ExecStart = "${pkgs.bdfr-browser}/bin/bdfr_browser start"; 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"; Type = "notify";
WatchdogSec = "10s"; WatchdogSec = "10s";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 5;
StartLimitBurst = 3;
StartLimitInterval = 10;
}; };
}; };