This commit is contained in:
mjallen18
2025-02-07 14:17:02 -06:00
parent 90ba19c057
commit 810f7be32a
5 changed files with 42 additions and 17 deletions

View File

@@ -7,6 +7,7 @@ let
update-flake = "sudo nix flake update ~/nix-config"; update-flake = "sudo nix flake update ~/nix-config";
update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas"; update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
nas-ssh = "kitten ssh admin@10.0.1.18"; nas-ssh = "kitten ssh admin@10.0.1.18";
ducks = "du -cksh * | sort -hr | head -n 15";
}; };
gitAliases = { gitAliases = {

View File

@@ -44,6 +44,9 @@ in
{ {
imports = [ ../../../../share/nvidia ]; imports = [ ../../../../share/nvidia ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
networking.extraHosts = ''
10.0.1.18 host.containers protonmail-bridge
'';
services = { services = {
nextcloud = { nextcloud = {
@@ -196,20 +199,22 @@ in
}; };
}; };
networking.nat = { networking = {
forwardPorts = [ nat = {
{ forwardPorts = [
destination = "10.0.2.18:443"; {
sourcePort = 9943; destination = "10.0.2.18:443";
} sourcePort = 9943;
{ }
destination = "10.0.2.18:80"; {
sourcePort = 9988; destination = "10.0.2.18:80";
} sourcePort = 9988;
{ }
destination = "10.0.2.18:8000"; {
sourcePort = 8000; destination = "10.0.2.18:8000";
} sourcePort = 8000;
]; }
];
};
}; };
} }

View File

@@ -21,6 +21,7 @@
shellAliases = { shellAliases = {
update = "sudo nixos-rebuild switch"; update = "sudo nixos-rebuild switch";
ducks = "du -cksh * | sort -hr | head -n 15";
}; };
oh-my-zsh = { oh-my-zsh = {

View File

@@ -7,6 +7,8 @@ let
2342 # grafana 2342 # grafana
51820 # wireguard 51820 # wireguard
19999 # netdata 19999 # netdata
1025
1143
]; ];
in in
{ {

View File

@@ -213,13 +213,19 @@ in
protonmail-bridge = { protonmail-bridge = {
description = "Protonmail Bridge"; description = "Protonmail Bridge";
enable = true; enable = true;
environment = {
GNUPGHOME = "%h/.gnupg";
PASSWORD_STORE_DIR = "%h/.password-store";
};
script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive"; script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive";
path = [ path = [
pkgs.gnome-keyring
pkgs.gnupg
pkgs.pass pkgs.pass
pkgs.protonmail-bridge pkgs.protonmail-bridge
]; ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "default.target" ];
partOf = [ "multi-user.target" ]; after = [ "gpg-agent.service" ];
}; };
}; };
@@ -297,6 +303,16 @@ in
}; };
}; };
security.pam.services.login.enableGnomeKeyring = true;
# Configure gpg-agent to cache keys
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
# Set how long to cache the passphrase (in seconds)
# defaultCacheTtl = 34560;
# maxCacheTtl = 34560;
};
# Create a timer to run the service periodically # Create a timer to run the service periodically
systemd.timers.system-update-check = { systemd.timers.system-update-check = {
description = "Timer for system configuration updates"; description = "Timer for system configuration updates";