daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nitter: Extract from webserver config

Browse source
This commit is contained in:
Daniel Kempkens 2023-02-13 19:44:04 +01:00
parent 974c93298d
commit 4223a36be6
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
10 changed files with 65 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
agenix/hosts/sail/config.nix
View file

@ -65,5 +65,9 @@
owner = "freshrss"; owner = "freshrss";
group = "freshrss"; group = "freshrss";
}; };
nitter-config = {
file = ./nitter/config.age;
};
}; };
} }

BIN
agenix/hosts/sail/nitter/config.age Normal file
View file

Binary file not shown.

10
container/webserver/config.nix
View file

@ -4,8 +4,6 @@
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /etc/container-webserver/weewx 0755 421 421" "d /etc/container-webserver/weewx 0755 421 421"
"d /etc/container-webserver/weewx/html 0755 421 421" "d /etc/container-webserver/weewx/html 0755 421 421"
"d /etc/container-webserver/nitter 0755 0 0"
]; ];
# mosquitto # mosquitto
@ -32,12 +30,4 @@
uid = 421; uid = 421;
gid = 421; gid = 421;
}; };
# nitter
environment.etc."container-webserver/nitter/nitter.conf" = {
source = ../../secret/container/webserver/config/nitter.conf;
mode = "0644";
uid = 0;
gid = 0;
};
} }

46
flake.lock
View file

@ -163,11 +163,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1676135764, "lastModified": 1676252776,
"narHash": "sha256-hsvokBMpst2PNY5s4kK5ioLUPgrZCFTmqzlAzWhg2tU=", "narHash": "sha256-6vpNG1aB+DGHTBBpklhmNT1Tky5DM/ZtHN3ctl6aN7I=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "3a5dddf24f9d4d8959194b0cd3c6a7dd0cbd73ae", "rev": "89722ddfac51b0f7cbe5f4b0914e19ee9e8fdfd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,14 +181,16 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1676233127, "lastModified": 1676291237,
"narHash": "sha256-EKLnvQdjoBKkdIpDjEqRALOllHg3AM+RY5huPznYE9U=", "narHash": "sha256-qx3TDAcmMyvyDspuwUwTlx2aIPQTn0WcdYYew4cV0tc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "f015d467df1180e3e2da5e09f5d04271a48899a0", "rev": "62d20126a63eb03bf8184d4730a971fcd155f747",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1676190193, "lastModified": 1676276771,
"narHash": "sha256-+bXn1COcfy/qyHfo6QbqVVThg6aCqdAvfhozvpLJpIE=", "narHash": "sha256-CdVeyMH+8UpIA0lCBtze5qc8Yf5Im0NdeuR2IpZil8c=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "c69dc56c00cf8236491737a958285f94b2d6c256", "rev": "6b7d1020e3c241c7d3c76a70bc1a77e4c9640977",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,27 +221,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1676150441,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-Nfeua9Ua/dGHOQpzOjLtkyMyW/ysQCvZJ9Dd74QQSNk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "rev": "6d87734c880d704f6ee13e5c0fe835b98918c34e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1675940568,
"narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,7 +243,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
} }
}, },
"utils": { "utils": {

2
flake.nix
View file

@ -20,7 +20,7 @@
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836"; inputs.nixpkgs.follows = "nixpkgs";
}; };
arion = { arion = {

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

@ -91,12 +91,12 @@ rec {
}; };
leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "leap.nvim"; pname = "leap.nvim";
version = "2023-02-10"; version = "2023-02-13";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "leap.nvim"; repo = "leap.nvim";
rev = "7140feed70a5911b8c8a7eb9c218d198772f69cf"; rev = "1367a095f336c6c7ccda8c6747b57048fc5e008d";
sha256 = "0k5g95nlawv3r9farc7qgfdbvyvsy3w3rfysjfhrc37jvdz5ykhv"; sha256 = "1h6q53h6cqbbsqyjs70hkqi7bcra8hbrym6iib6bsh1101w4a8h7";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -112,12 +112,12 @@ rec {
}; };
}; };
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = "2023-02-12"; version = "2023-02-13";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "2c2430d42f30d1aef8715aed933272c9a6898f4e"; rev = "ad9ae9e7def54fee446c3e186ed0a0d44cca7b90";
sha256 = "0ypwcgkm1igk5flc5hf1rsf6ckz76pks33c562s8478ppbicnlwy"; sha256 = "14vdlr7wl1389mfmlsy383d5v283h9ak0w1dhba39ll3i2nj731d";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}); });
@ -291,12 +291,12 @@ rec {
}; };
comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "comment.nvim"; pname = "comment.nvim";
version = "2023-01-18"; version = "2023-02-13";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "numtostr"; owner = "numtostr";
repo = "comment.nvim"; repo = "comment.nvim";
rev = "eab2c83a0207369900e92783f56990808082eac2"; rev = "418d3117dab2f54c4340ea73e0070dd78fc81753";
sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; sha256 = "0qmkj4xchl3q26pzf6x8ssm97ax72vav4jcq4410mf7xiahwcl1d";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -478,12 +478,12 @@ rec {
}; };
nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2023-02-10"; version = "2023-02-12";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "13edf91f47c91b390bb00e1df2f7cc1ca250af3a"; rev = "37e3c7b32b653f24d7aa2fa087a9c5a67ef07786";
sha256 = "19c140aw8ksak2k0s6ww2dk7qh3p2rjhwbi56wjaf2282x4g9181"; sha256 = "1xjqzqblw89z6jk3g98bc10yc9xmdr8h1pblv1vg4jsdsdn0iwjd";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -555,12 +555,12 @@ rec {
}; };
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-02-10"; version = "2023-02-13";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "f29f0b22fd66c910b892aae3bc18a4872c002738"; rev = "a5caac26768af80b7c57b919f77b3fed3d7424d0";
sha256 = "0cizfyivvfgv72wxw543l6h2giais7bsgmvxrpcks8zmgmvlq0zq"; sha256 = "1wd6pxkq7pm0mzgns2r04v8m9snxr4va6rfgr8zf4g1ifyfyh8gk";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

BIN
secret/container/webserver/config/nitter.conf
View file

Binary file not shown.

2
secrets.nix
View file

@ -21,4 +21,6 @@ in
"agenix/hosts/sail/freshrss/userPassword.age".publicKeys = sail; "agenix/hosts/sail/freshrss/userPassword.age".publicKeys = sail;
"agenix/hosts/sail/freshrss/databasePassword.age".publicKeys = sail; "agenix/hosts/sail/freshrss/databasePassword.age".publicKeys = sail;
"agenix/hosts/sail/nitter/config.age".publicKeys = sail;
} }

2
system/hosts/sail.nix
View file

@ -22,6 +22,8 @@ in
(import ../nixos/mastodon.nix (args // { inherit secret; })) (import ../nixos/mastodon.nix (args // { inherit secret; }))
../nixos/nitter.nix
../nixos/synapse.nix ../nixos/synapse.nix
../nixos/websites.nix ../nixos/websites.nix

25
system/nixos/nitter.nix Normal file
View file

@ -0,0 +1,25 @@
{ config, ... }:
{
virtualisation.arion.projects.nitter.settings = {
services = {
nitter = {
service = {
image = "zedeus/nitter:latest";
container_name = "nitter";
restart = "unless-stopped";
ports = [ "127.0.0.1:8001:8080" ];
environment = {
"TZ" = "Europe/Berlin";
};
volumes = [
"${config.age.secrets.nitter-config.path}:/src/nitter.conf:ro"
];
labels = {
"com.centurylinklabs.watchtower.enable" = "true";
};
};
};
};
};
}