Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
nifoc committed Sep 11, 2023
1 parent 7d571dc commit 62bd566
Show file tree
Hide file tree
Showing 11 changed files with 138 additions and 9 deletions.
1 change: 1 addition & 0 deletions agenix/hosts/tanker/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

msmtp-password = {
file = ./msmtp/password.age;
mode = "444";
};

atticd-environment = {
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions hardware/disko/tanker.nix
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@
atime = "off";
};
};

forgejo = {
type = "zfs_fs";
mountpoint = "/var/lib/forgejo";
options = {
compression = "zstd";
atime = "off";
};
};
};
};
};
Expand Down
1 change: 1 addition & 0 deletions home/config/nvim/plugins/lsp.fnl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
:group augroup
:desc "Automatic LSP setup"})
;; Servers
(vim.lsp.set_log_level :OFF)
(let [capabilities (cmp.default_capabilities)
flags {:allow_incremental_sync true :debounce_text_changes 700}
default-config {: capabilities : flags}
Expand Down
21 changes: 21 additions & 0 deletions home/programs/git.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,27 @@

includes = [
# Private
{
condition = "hasconfig:remote.*.url:gitea@git.kempkens.io:*/**";
contents = {
user = {
signingKey = "~/.ssh/GitHub.pub";
};

commit = {
gpgSign = true;
};

tag = {
gpgSign = true;
};

gpg = {
format = "ssh";
};
};
}

{
condition = "hasconfig:remote.*.url:git@github.com:*/**";
contents = {
Expand Down
12 changes: 6 additions & 6 deletions home/programs/nvim/plugins.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ in
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2023-09-09";
version = "2023-09-11";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
rev = "ecdeb4e2a4af34fc873bbfbf1f4c4e447e632255";
sha256 = "085mpnvj9j97rwnn4a91nf90ilclk4gagkgcralpjn6a9i4zvkr2";
rev = "925e2aa30dc9fe9332060199c19f132ec0f3d493";
sha256 = "0i2ixmmapld2j681z606g00ws17vwzmpb0cxvbzsx9bqhap3qgzr";
fetchSubmodules = false;
};
};
Expand Down Expand Up @@ -242,12 +242,12 @@ in
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-09-09";
version = "2023-09-11";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "d177ad277a638f262edb73c75ffe33e377b95dc5";
sha256 = "0sbd3bj0j5blg7998c2mf9pxp8sfj84dsa1rqbmsqz0isjjl0qay";
rev = "0d24eeafb5b531c7fac610a3508207f33c76ce6d";
sha256 = "08yf6sp26yfpfkqds0f5ld6vjbi5km5p6zsv7kr5fyn87r2rl2rf";
fetchSubmodules = false;
};
};
Expand Down
13 changes: 13 additions & 0 deletions home/programs/scripts/mp4concat
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

set -eu

tmpfile="_mp4-concat.tmp"
printf '' >"$tmpfile"

for f in "$@"; do
echo "file '$f'" >>"$tmpfile"
done

ffmpeg -f concat -safe 0 -i "$tmpfile" -c copy mp4concat_output.mp4
rm -f "$tmpfile"
8 changes: 8 additions & 0 deletions home/programs/ssh/shared/private.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
compression = true;
};

"git.kempkens.io" = {
port = 22;
user = "gitea";
identityFile = "~/.ssh/GitHub.pub";
identitiesOnly = true;
compression = true;
};

"router" = {
hostname = "10.0.0.1";
port = 22;
Expand Down
8 changes: 8 additions & 0 deletions system/darwin/yabai.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ in

extraConfig = ''
yabai -m rule --add app='^Dato$' manage=off
yabai -m rule --add app='^Dash$' manage=off
yabai -m rule --add app='^Mona$' manage=off
yabai -m rule --add app='^System.*einstellungen$' manage=off
Expand Down Expand Up @@ -67,10 +68,17 @@ in
meh - f : ${yabai-bin} -m window --toggle zoom-fullscreen
meh - t : ${yabai-bin} -m window --toggle float; ${yabai-bin} -m window --grid 6:6:1:1:4:4
meh - m : ${yabai-bin} -m window --grid 6:6:1:1:4:4
meh - left : ${yabai-bin} -m window --grid 1:2:0:0:1:1
meh - down : ${yabai-bin} -m window --grid 2:2:0:1:2:1
meh - up : ${yabai-bin} -m window --grid 2:2:0:0:2:1
meh - right : ${yabai-bin} -m window --grid 1:2:1:0:1:1
meh - g : ${yabai-bin} -m window --resize bottom:0:40
meh - s : ${yabai-bin} -m window --resize bottom:0:-40
meh - b : ${yabai-bin} -m space --balance
hyper - h : ${yabai-bin} -m window --warp west
hyper - j : ${yabai-bin} -m window --warp south
hyper - k : ${yabai-bin} -m window --warp north
Expand Down
2 changes: 2 additions & 0 deletions system/hosts/tanker.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ in

../nixos/fedifetcher.nix

../nixos/forgejo.nix

(import ../nixos/home-proxy.nix (args // { inherit secret; }))

../nixos/invidious.nix
Expand Down
66 changes: 66 additions & 0 deletions system/nixos/forgejo.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{ pkgs, ... }:

let
fqdn = "git.kempkens.io";
in
{
services.gitea = {
enable = true;
package = pkgs.forgejo;

stateDir = "/var/lib/forgejo";

database = {
type = "postgres";
};

lfs.enable = true;

appName = "kempkens.io Forge";

settings = {
server = {
PROTOCOL = "http+unix";
DOMAIN = fqdn;
ROOT_URL = "https://${fqdn}/";
};

service = {
DISABLE_REGISTRATION = true;
};

mailer = {
ENABLED = true;
PROTOCOL = "sendmail";
FROM = "forgejo@mg.kempkens.io";
SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail";
};

session = {
COOKIE_SECURE = true;
SAME_SITE = "strict";
};

repository = {
DISABLE_HTTP_GIT = true;
};

other = {
SHOW_FOOTER_VERSION = false;
};
};
};

services.nginx.virtualHosts."${fqdn}" = {
quic = true;
http3 = true;

onlySSL = true;
useACMEHost = "kempkens.io";

locations."/" = {
recommendedProxySettings = true;
proxyPass = "http://unix:/run/gitea/gitea.sock";
};
};
}

0 comments on commit 62bd566

Please sign in to comment.