xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-22 16:10:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

nix fmt; justfile adjustments

Browse source
This commit is contained in:
xqtc161 2024-07-01 20:45:31 +02:00
parent 692e3f5ccb
commit b9e4385f0c
9 changed files with 62 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/modules/firefox.nix
View file

@ -19,15 +19,15 @@ with inputs; {
sponsorblock
# dearrow
pronoundb
tabcenter-reborn
firefox-color
tabcenter-reborn
firefox-color
unpaywall
bitwarden
sidebery
leechblock-ng
darkreader
stylus
shinigami-eyes
shinigami-eyes
violentmonkey
vimium-c
noscript

2
home/modules/home-pkgs.nix
View file

@ -65,7 +65,7 @@ in {
pkgs.ghc
pkgs.rizin
(pkgs.cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))
(pkgs.cutter.withPlugins (ps: with ps; [jsdec rz-ghidra sigdb]))
pkgs.imhex
pkgs.ghidra

6
home/modules/yazi.nix
View file

@ -1,5 +1,9 @@
{config, lib, pkgs, ...}:
{
config,
lib,
pkgs,
...
}: {
programs.yazi = {
enable = true;
enableNushellIntegration = true;

22
hosts/x86_64-linux/beleth/borg.nix
View file

@ -1,5 +1,9 @@
{ config, lib, pkgs, ... }: {
{
config,
lib,
pkgs,
...
}: {
#
# BACKUP
# Check via nix-shell -p borgbackup --run "borg info --rsh 'ssh -p 23 -i /home/moe/.ssh/storagebox_nextcloud_data' u409248-sub1@u409248-sub1.your-storagebox.de:nextcloud_data_backups"
@ -34,14 +38,14 @@
nextcloud_data = {
user = "nextcloud";
group = "nextcloud";
paths = [ "${config.services.nextcloud.datadir}" ];
paths = ["${config.services.nextcloud.datadir}"];
preHook = ''
${config.services.nextcloud.occ}/bin/nextcloud-occ maintenance:mode --on
'';
postHook = ''
${config.services.nextcloud.occ}/bin/nextcloud-occ maintenance:mode --off
'';
repo = "u409248-sub1@u409248-sub1.your-storagebox.de:nextcloud_data_backups";
repo = "u409248-sub1@u409248-sub1.your-storagebox.de:nextcloud_data_backups";
encryption = {
mode = "repokey-blake2";
passCommand = "cat ${config.age.secrets.backup_nextcloud_data_passphrase.path}";
@ -64,7 +68,7 @@
postHook = ''
${config.services.nextcloud.occ}/bin/nextcloud-occ maintenance:mode --off
'';
repo = "u409248-sub2@u409248-sub2.your-storagebox.de:nextcloud_database_backups";
repo = "u409248-sub2@u409248-sub2.your-storagebox.de:nextcloud_database_backups";
encryption = {
mode = "repokey-blake2";
passCommand = "cat ${config.age.secrets.backup_nextcloud_database_passphrase.path}";
@ -78,12 +82,12 @@
};
systemd.services."borgbackup-job-nextcloud_data" = {
onFailure = [ "notify-email@%i.service" ];
onSuccess = [ "notify-email@%i.service" ];
onFailure = ["notify-email@%i.service"];
onSuccess = ["notify-email@%i.service"];
};
systemd.services."borgbackup-job-nextcloud_database" = {
onFailure = [ "notify-email@%i.service" ];
onSuccess = [ "notify-email@%i.service" ];
onFailure = ["notify-email@%i.service"];
onSuccess = ["notify-email@%i.service"];
};
}

38
hosts/x86_64-linux/beleth/default.nix
View file

@ -95,29 +95,29 @@ with lib; {
'';
};
"jellyfin.heroin.trade" = {
extraConfig = ''
reverse_proxy http://127.0.0.1:8096
'';
extraConfig = ''
reverse_proxy http://127.0.0.1:8096
'';
};
"calibre.heroin.trade" = {
extraConfig = ''
reverse_proxy http://localhost:3000
'';
extraConfig = ''
reverse_proxy http://localhost:3000
'';
};
"grafana.heroin.trade" = {
extraConfig = ''
reverse_proxy http://127.0.0.1:2342
'';
extraConfig = ''
reverse_proxy http://127.0.0.1:2342
'';
};
"uptime.heroin.trade" = {
extraConfig = ''
reverse_proxy http://127.0.0.1:3001
'';
extraConfig = ''
reverse_proxy http://127.0.0.1:3001
'';
};
"paperless.heroin.trade" = {
extraConfig = ''
reverse_proxy http://127.0.0.1:28981
'';
extraConfig = ''
reverse_proxy http://127.0.0.1:28981
'';
};
};
};
@ -161,10 +161,10 @@ with lib; {
];
};
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf3w5bHAssHthg9SPXVpG4w9v8m16X/0J3bjg08P6EA xqtc@seraphim"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf3w5bHAssHthg9SPXVpG4w9v8m16X/0J3bjg08P6EA xqtc@seraphim"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith"
];
programs.bash.blesh.enable = true;

2
hosts/x86_64-linux/beleth/git.nix
View file

@ -15,7 +15,7 @@
REQUIRE_SIGNIN_VIEW = true;
};
DEFAULT = {
APP_NAME = "Git so good it could be heroin";
APP_NAME = "Git so good it could be heroin";
};
};
};

14
hosts/x86_64-linux/beleth/paperless.nix
View file

@ -1,7 +1,11 @@
{config, lib, inputs, ...}:
{
services.paperless = {
enable = true;
passwordFile = "/etc/paperless_sc";
};
config,
lib,
inputs,
...
}: {
services.paperless = {
enable = true;
passwordFile = "/etc/paperless_sc";
};
}

2
hosts/x86_64-linux/lilith/default.nix
View file

@ -126,7 +126,7 @@
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.xqtc = {
isNormalUser = true;
extraGroups = ["wheel" "docker" "libvirtd" "adbusers" ]; # Enable ‘sudo’ for the user.
extraGroups = ["wheel" "docker" "libvirtd" "adbusers"]; # Enable ‘sudo’ for the user.
packages = with pkgs; [nushell clamtk];
shell = pkgs.nushell;
};

13
justfile
View file

@ -11,9 +11,16 @@ rebuild:
nh os switch . -- -vv --impure -j 4;
exit
fi
nh os switch . -- -vv --impure -j 4;
nh os switch . -- -vv;
beleth:
nixos-rebuild switch --flake '.#beleth' --build-host {{beleth-host}} --target-host {{beleth-host}}
ssh {{beleth-user-host}} "cd; cd nixos-config; git pull; cd; sh build_website.sh"
#!/usr/bin/env bash
arch=$(nix-instantiate --eval -E 'builtins.currentSystem')
arch_sanitized=$(echo $arch | sed 's/^"//;s/"$//')
if [ $arch_sanitized == "x86_64-linux" ]; then
nixos-rebuild switch --flake '.#beleth' --build-host {{beleth-host}} --target-host {{beleth-host}};
ssh {{beleth-user-host}} "cd; cd nixos-config; git pull; cd; sh build_website.sh";
exit
fi
@echo "Host arch needs to be 'x86_64-linux'! Aborting...";