daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2023-07-07 10:53:05 +02:00
parent 7518cb2b97
commit 946cc0fda1
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 74 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
flake.lock
View file

@ -299,11 +299,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1688626666, "lastModified": 1688694598,
"narHash": "sha256-VGl0v0Edl42gtLSMtTgnjcX+kMwcFN9AJhvJ7+dPvuE=", "narHash": "sha256-AI3k+PwEp/1TCunUNg4mKhbkKEgkA9i0QYEjQlTih3I=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "4e34ca8ae71d7dfac5c93ffe8e4e8d00f915c593", "rev": "811140e276a6312775bfcf9b368de25386f7a356",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
"weewx-proxy-flake": "weewx-proxy-flake" "weewx-proxy-flake": "weewx-proxy-flake"
}, },
"locked": { "locked": {
"lastModified": 1688631852, "lastModified": 1688718161,
"narHash": "sha256-vLtJopCN+6UoWGh+bzrqJ/VKveXw3Kuh0xrAiNrcJm8=", "narHash": "sha256-O3s5asl7M7cm9zOz5p4ImyOFTx01sSzdf+6EQWswnsE=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "590828c358ae90ea3982773b0433d6e309e9b479", "rev": "d7dd851508f52577ca1962e98fc7b389c90f591f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,6 +387,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1688718598,
"narHash": "sha256-brBQ6kgCYQM1Xbtt84um96q5jptvTn+VGFKXNKL5Zkc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "54303b65ef01f701d3a727b0df9feba5ce0a0495",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685004253, "lastModified": 1685004253,
@ -413,7 +429,8 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master"
} }
}, },
"rust-overlay": { "rust-overlay": {

2
flake.nix
View file

@ -2,6 +2,8 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

28
home/programs/nvim/plugins.nix
View file

@ -107,12 +107,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-07-06"; version = "2023-07-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "e1ab5391e5c4820dd1ffc2566d29b01573ab52a9"; rev = "1ef286e5b0cfd17f56586a8445cd83d61647f851";
sha256 = "1j75dlxir91wykm95w7l6df4svd791nwb5qczqr2hzgfm532pmxr"; sha256 = "0ani5vi127zyhznqzjs0ghr5x1xnlpv53443mcry1nj30wslgdia";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -140,12 +140,12 @@ in
}; };
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "2023-07-02"; version = "2023-07-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "0e0600908d1ad5ac4992fa0ab578e23e9d9d6f37"; rev = "276362a8020c6e94c7a76d49aa00d4923b0c02f3";
sha256 = "0nf1pc84mk6cncb120j6dwcynkbxf2s6crji30aq99zs92n3wi0w"; sha256 = "043rrifqhg5bsksqhfdc20f96i2s2xyd6qyga4918fr75sf8hmib";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -220,12 +220,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-07-06"; version = "2023-07-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "a7ecaff3245ba4b9e5ed784ebefbedba54e7f0ad"; rev = "51739a8bc531542079698c58512feb68469f5d27";
sha256 = "0rx2yqdmyyv4pjmswvrarlbhiln323qdpjni6s3jvnm8lrc3lxqn"; sha256 = "05xpc6zysb9ydkvsxjz3s7k0d5fq4ryg6fdgshfx81ns8mdrjqmh";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -312,8 +312,8 @@ in
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "96c02045323a9e0b8936fc4dce42dc249495c4f1"; rev = "a94db1ee6ddfd238e725b0f90163fdd65d382464";
sha256 = "1v4nnkbqa0183nml2ss2ykdq013d6bfzhnb8xjrfraxkfpmg1i97"; sha256 = "0y8lrwnrm3xza6mh329fd3xcnwmiqlvsycksiqr3am8gjmd3ir4z";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -495,12 +495,12 @@ in
}; };
indent-blankline-nvim = buildVimPluginFrom2Nix { indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim"; pname = "indent-blankline.nvim";
version = "2023-07-06"; version = "2023-07-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lukas-reineke"; owner = "lukas-reineke";
repo = "indent-blankline.nvim"; repo = "indent-blankline.nvim";
rev = "73640233cca0da8e01aced8c1f9e63fd892128b7"; rev = "fedad189e6ab1037939b79d32b7acaf05a0d4fb0";
sha256 = "01n7fab1q5zzc64h9x9n9bahwqlpdd6bshshfv9hxnv4s103423c"; sha256 = "0v29jg8hm388r9w537ij1r96n4i8zh1y7yipdr875xdkdfrvia20";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

2
system/flakes/tanker.nix
View file

@ -3,11 +3,13 @@
let let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
overlay-deploy-rs = _: _: { inherit (deploy-rs.packages.${default-system}) deploy-rs; }; overlay-deploy-rs = _: _: { inherit (deploy-rs.packages.${default-system}) deploy-rs; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-master
overlay-deploy-rs overlay-deploy-rs
overlay-nifoc overlay-nifoc
]; ];

50
system/nixos/mastodon.nix
View file

@ -7,6 +7,8 @@ in
services.mastodon = { services.mastodon = {
enable = true; enable = true;
package = pkgs.pkgs-master.mastodon;
configureNginx = false; configureNginx = false;
localDomain = "kempkens.io"; localDomain = "kempkens.io";
@ -120,28 +122,40 @@ in
}; };
}; };
services.nginx.virtualHosts."mastodon-cdn.kempkens.io" = { services.nginx.virtualHosts."mastodon-cdn.kempkens.io" =
quic = true; let
http3 = true; lib-base = "/var/lib/mastodon/public-system";
kTLS = true; in
{
quic = true;
http3 = true;
kTLS = true;
root = "${config.services.mastodon.package}/public/"; root = "${config.services.mastodon.package}/public/";
forceSSL = true; forceSSL = true;
useACMEHost = "kempkens.io"; useACMEHost = "kempkens.io";
extraConfig = '' extraConfig = ''
add_header Access-Control-Allow-Origin https://mastodon.kempkens.io; add_header Access-Control-Allow-Origin https://mastodon.kempkens.io;
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
''; '';
locations."/system/".alias = "/var/lib/mastodon/public-system/"; locations."/system/" = {
alias = "${lib-base}/";
# "Old" CDN paths extraConfig = ''
locations."/accounts/".alias = "/var/lib/mastodon/public-system/accounts/"; add_header Cache-Control "public, max-age=2419200, immutable";
locations."/cache/".alias = "/var/lib/mastodon/public-system/cache/"; add_header X-Content-Type-Options nosniff;
locations."/custom_emojis/".alias = "/var/lib/mastodon/public-system/custom_emojis/"; add_header Content-Security-Policy "default-src 'none'; form-action 'none'";
locations."/media_attachments/".alias = "/var/lib/mastodon/public-system/media_attachments/"; '';
}; };
# "Old" CDN paths
locations."/accounts/".alias = "${lib-base}/accounts/";
locations."/cache/".alias = "${lib-base}/cache/";
locations."/custom_emojis/".alias = "${lib-base}/custom_emojis/";
locations."/media_attachments/".alias = "${lib-base}/media_attachments/";
};
users.groups.mastodon.members = [ config.services.nginx.user ]; users.groups.mastodon.members = [ config.services.nginx.user ];
} }