1
0
Fork 0

attic: nginx+attic cli

This commit is contained in:
Daniel Kempkens 2023-04-05 10:10:31 +02:00
parent 2d56d35892
commit a4e71f9825
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
8 changed files with 52 additions and 28 deletions

View file

@ -1,16 +1,21 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE10R3A2ZyBMTEJS YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE10R3A2ZyBBS0pw
VlZKUHpKODJTWWo4d2kvZVFUQmcvZ2pBcHZ2cVhEcTRkQVhTZ1gwCmxHREdibjBh KytWYmJDN1phZUsrdXFvYVRtVktSdFduK0N0NDJLVVZjV3d1TjBRCk95Zld3ZDdw
dXkzQXVWdU5zSXdleVZZWXI3QWF2NnMzd2h3TXRKZ2tOb2MKLT4gc3NoLWVkMjU1 Mm41c0M5ZjBvNm5YZ3hOa3NOOUxieTV5M3g2bk1nL29ONkEKLT4gc3NoLWVkMjU1
MTkgc1ZmNkNBIEIyb21xU3dwWHRKNFRFaHJ0S2tTTzYrZW5NYkYrVXlhczc5REV2 MTkgc1ZmNkNBICtmUjVTblVyTVAxaTZUbXRPUHg2N1hudXNMcy9LMWpXOXVPWlBV
Vjd0Q3cKcVozUzdvakZCM0h4QTgvU2ZScDZWbGYzWGFGQStkMmdVaG80T1FWU0lO cXdJeEEKL3pldlRuaU9qb0N4ZS9KMnJVZWExK1VmT0NUZS9zRkNTcyt5ZDlQSjlO
VQotPiBcTlVaYS1ncmVhc2UgM3toQTFGTyB1IE5jJ3RfMlBHIE9TV219YnFhCklQ MAotPiBuRS1ncmVhc2UgPXlTTDJlJiB7cCsmXkIgdTA6bwovYXlyeWhCYzFCa3ZR
dWZUMVBFTWhDZgotLS0gYlZKZUl1SVZiemMxZnVVamRuQjZTNnY4azJRRS91QmhM M01BcTI1MzRQTHZ0UWorbW9rNXVRZkR1cmxxQlE0eUUveEpVa2hpWVExVm1UOFVE
ZUs5UTg4SG81MArjrMCURh6yHWzvioUQpgOvKqzL0zq+jFCdy0W4HCUnQGipes36 YmVQCmZsM0VOTk0vM3haNHBVS0RUajJJRXg5ZUd1ZE1HdFprUnVLLzcxcG9NNWRF
D8nJgDtvlZpQNPGT4n3NjWv8xQtg94k1qJ1XcTy+aK8lWvbpFnhJaOME5fQtDNPf RVBwWEtqOGpQV0EKLS0tIDJCR3FadFNRSUxidURtNzMybFYyMmtDUktnY095SEFO
fH52kmKQ4kvAkHqAJ4EAa4J5dc2Oq3V2da0ch4/qPESbY4MO2+RF+6KiATYL5WU/ MCtFTmMwVFgvVnMK0Fe7h1nOY+V7gP3V4gWwMJ/EXC9a0Jc1lFwH1gKFAw71epul
kEqFVk6dOfWDYJ2Fzjw7+5m2TaI9W+hUnVPKNKIVC+8i0RuwreBK6FXbO725D/yd 1PMsdO2T8lTn43r9A8B6Q2P53w37JKGheIUo58OfuQDuBNE7tliNMyQ28Lw4B4a4
d3neXqil0n3S+sPoE/wq7IbjE0TTz63G1IUPYhG1B1eJSZI1glMtFaUu1AJpX3gY NaIa980GSUE/mycowS5pn1G/Yw78iLyzpVaMlqQN+0p9JljvydOV4z7Qnjawyx8o
pPJIGTHx/y1dZtM8OAgyXd3AZaJc55Za5JVN4p3rkxHyuwKyYPltLnNSNkr6aPkc MdLEg6dtCrutPW3DW9hd1gwJxkFevFZcOW98y8EbVOrtwQwkhT+2yyM8w4fq60CK
GG/p79MaQO/Ns9RLrhpPwCXT4jcsrwZD3mDs rurgybWFsj943YZwPD/FT9Tt64CLpO62Z6P1I/nQZjTSpkCiVwFJD0gP2xwTvGMj
fmEtlHg83lzEaO0X40m8PKAce7b0GVbLW/UjGkQ4QFvsRjkJCKXW7xKXHCXGDm85
PWa3XWS7I/mtvBJuYS2uR4CposhZ8XSsluk0xRVOgZw7Mwq4aZlAN67gdsEQzuqR
v2+TWg26MWe9Kqinraj7zy20L81bkWovDGApcVI5QNPIP6v9wQipLQVtsQbEN6p8
Int8Y/gI+YJJWhr13sD1KVwqvXAioI155SvyXlcLip2tNbjEip/HF7bJUhxo/fEc
H6QZ4am3o6sv2F0yzzUuQtwakS1pAY2VmT/zXb/Yd4B8KyKGnVh51Xx6rPo=
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

View file

@ -33,11 +33,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1679445945, "lastModified": 1680646146,
"narHash": "sha256-UadTIRRA/okmLmdM+OzhCwSoovr72Pq0+3Tt7CAyYcg=", "narHash": "sha256-NH+EhLFYDwLQ01BqfTwGvZAjfmZynnP1xxPjqH0XJss=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "4d92e69fc1b279676f997e6b99d2cacc4d0a3e87", "rev": "efa15b9788add910f6e8409dddfb7bb69c2ad201",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +285,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680577567, "lastModified": 1680637761,
"narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=", "narHash": "sha256-VuXWnGU4g88Rs4njfZ0hxVJGHSyEmnQCsO+i58LXFNo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4", "rev": "74c56f2e51d08f0196ed48d32e01d5d408e64451",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -50,8 +50,7 @@
mod.filename mod.file-flags)) mod.filename mod.file-flags))
;; Tabpages ;; Tabpages
(set mod.tabpage (set mod.tabpage
{:provider (fn [self] {:provider #(.. "%" $1.tabnr "T " $1.tabnr " %T")
(.. "%" self.tabnr "T " self.tabnr " %T"))
:hl (fn [self] :hl (fn [self]
(if self.is_active :TabLineSel :TabLine))}) (if self.is_active :TabLineSel :TabLine))})
;; Buttons ;; Buttons

View file

@ -102,12 +102,12 @@ rec {
}; };
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-04-04"; version = "2023-04-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "871f5665d92d59a369cf916e9aa4d321d466f1e3"; rev = "411e771d511442ab81670701f5c830f6c74aadd7";
sha256 = "1psdawbsrp68qqpsbdmpnl9xp0p3y08s470vc4yaajrcn35mdb9l"; sha256 = "19843p5chl4lr7lza6bzz3xrgbmgjqs0v6q8zgqk6pd9q23gbwbx";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -215,12 +215,12 @@ rec {
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-04-02"; version = "2023-04-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "0bc0c38e1b11dfb6b5f1794d53869f89ccf9e78f"; rev = "8dc63a44bfe3188708f0b968c17a5260bdf75650";
sha256 = "0ivr4iyq85gb2ddv6dzarp9wjfydi0ynvwa0vabziv4wxd55w9c3"; sha256 = "0d37qs8jf9130134mp4yqj9xf54b0r5ga9zj3s6lk2f0hpxvxvaw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

View file

@ -0,0 +1,8 @@
#!/bin/sh
set -eu
set -f # disable globbing
export IFS=' '
echo "Uploading $OUT_PATHS ..."
exec /run/current-system/sw/bin/attic push nifoc-systems $OUT_PATHS

5
system/darwin/attic.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.attic-client ];
}

View file

@ -15,6 +15,7 @@ let
overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; };
overlay-agenix = inputs.ragenix.overlays.default; overlay-agenix = inputs.ragenix.overlays.default;
overlay-attic = inputs.attic.overlays.default;
overlay-neovim = inputs.neovim-nightly-overlay.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay;
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
@ -22,6 +23,7 @@ let
overlays = [ overlays = [
overlay-x86 overlay-x86
overlay-agenix overlay-agenix
overlay-attic
overlay-neovim overlay-neovim
overlay-nifoc overlay-nifoc
]; ];

View file

@ -4,6 +4,7 @@
../darwin/fonts.nix ../darwin/fonts.nix
../darwin/sudo.nix ../darwin/sudo.nix
../darwin/fish.nix ../darwin/fish.nix
../darwin/attic.nix
]; ];
nix = { nix = {
@ -30,6 +31,10 @@
trusted-users = [ "@admin" ]; trusted-users = [ "@admin" ];
}; };
extraOptions = ''
post-build-hook = /Users/daniel/.config/nixpkgs/home/programs/scripts/attic-system-cache
'';
configureBuildUsers = true; configureBuildUsers = true;
distributedBuilds = true; distributedBuilds = true;