From 5fe8c897aa60bb485495cb3231efe081a6bff19a Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 27 Mar 2026 18:25:58 -0500 Subject: [PATCH] unihj --- .../x86_64-linux/admin@jallen-nas/default.nix | 2 +- .../x86_64-linux/matt@matt-nixos/default.nix | 1 + modules/home/accounts/default.nix | 18 +++++++-- modules/home/home/default.nix | 8 ++++ modules/home/programs/thunderbird/default.nix | 9 ++++- .../services/protonmail-bridge/default.nix | 10 ++++- modules/nixos/services/caddy/default.nix | 22 +++++------ modules/nixos/user/default.nix | 1 + packages/profile-pic/default.nix | 39 +++++++++++++++++++ 9 files changed, 90 insertions(+), 20 deletions(-) create mode 100644 packages/profile-pic/default.nix diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix index 2f02cd8..f19052c 100755 --- a/homes/x86_64-linux/admin@jallen-nas/default.nix +++ b/homes/x86_64-linux/admin@jallen-nas/default.nix @@ -37,7 +37,7 @@ in ${namespace} = { sops.enable = true; programs.opencode = enabled; -# desktop.plasma = enabled; + # desktop.plasma = enabled; }; sops.secrets = { diff --git a/homes/x86_64-linux/matt@matt-nixos/default.nix b/homes/x86_64-linux/matt@matt-nixos/default.nix index 977f861..a8b9ab8 100755 --- a/homes/x86_64-linux/matt@matt-nixos/default.nix +++ b/homes/x86_64-linux/matt@matt-nixos/default.nix @@ -31,6 +31,7 @@ in desktop.plasma = enabled; programs = { + thunderbird = enabled; hyprland = { enable = false; primaryDisplay = "DP-1"; diff --git a/modules/home/accounts/default.nix b/modules/home/accounts/default.nix index 8e8abf1..4bd2d69 100644 --- a/modules/home/accounts/default.nix +++ b/modules/home/accounts/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { accounts = { email.accounts = { @@ -7,8 +12,11 @@ realName = "Matt Jallen"; address = "matt.l.jallen@gmail.com"; userName = "matt.l.jallen@gmail.com"; - passwordCommand = "${pkgs.uutils-coreutils-noprefix}/bin/cat ${config.sops.secrets."gmail-smtp-password".path}"; + passwordCommand = "${pkgs.uutils-coreutils-noprefix}/bin/cat ${ + config.sops.secrets."gmail-smtp-password".path + }"; flavor = "gmail.com"; + thunderbird.enable = true; smtp = { tls = { enable = false; @@ -22,7 +30,9 @@ realName = "Matt Jallen"; address = "jalle008@protonmail.com"; userName = "jalle008@protonmail.com"; - passwordCommand = "${pkgs.uutils-coreutils-noprefix}/bin/cat ${config.sops.secrets."protonmail-password".path}"; + passwordCommand = "${pkgs.uutils-coreutils-noprefix}/bin/cat ${ + config.sops.secrets."protonmail-password".path + }"; smtp = { tls = { enable = false; @@ -34,4 +44,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index bb2945c..d457d11 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -40,6 +40,10 @@ in nix-prefetch-scripts nixfmt pciutils + proton-pass + proton-pass-cli + proton-vpn-cli + protonvpn-gui protonup-ng rsync smartmontools @@ -69,6 +73,10 @@ in ) ); + file = { + ".face".source = "${pkgs.${namespace}.profile-pic}/profile-pic"; + }; + stateVersion = lib.mkDefault "23.11"; }; diff --git a/modules/home/programs/thunderbird/default.nix b/modules/home/programs/thunderbird/default.nix index 2a2f8af..0165ba9 100644 --- a/modules/home/programs/thunderbird/default.nix +++ b/modules/home/programs/thunderbird/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, namespace, ... }: +{ + config, + lib, + namespace, + ... +}: let cfg = config.${namespace}.programs.thunderbird; in @@ -21,4 +26,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/modules/home/services/protonmail-bridge/default.nix b/modules/home/services/protonmail-bridge/default.nix index 3ecc4c5..bdbefb8 100644 --- a/modules/home/services/protonmail-bridge/default.nix +++ b/modules/home/services/protonmail-bridge/default.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, namespace, ... }: +{ + config, + lib, + pkgs, + namespace, + ... +}: let cfg = config.${namespace}.services.protonmail; in @@ -15,4 +21,4 @@ in home.packages = with pkgs; [ protonmail-bridge-gui ]; }; -} \ No newline at end of file +} diff --git a/modules/nixos/services/caddy/default.nix b/modules/nixos/services/caddy/default.nix index 2cc7ad2..3a84bf8 100644 --- a/modules/nixos/services/caddy/default.nix +++ b/modules/nixos/services/caddy/default.nix @@ -51,7 +51,7 @@ let handle @hass { reverse_proxy http://nuc-nixos.local:8123 } - + handle { respond "Forbidden" 403 } @@ -60,18 +60,18 @@ let "sonarr.mjallen.dev" = { extraConfig = '' - @sonarr { - remote_ip 10.0.1.0/24 10.1.1.0/16 - host sonarr.mjallen.dev - } + @sonarr { + remote_ip 10.0.1.0/24 10.1.1.0/16 + host sonarr.mjallen.dev + } - handle @sonarr { - reverse_proxy 10.0.1.3:8989 - } + handle @sonarr { + reverse_proxy 10.0.1.3:8989 + } - handle { - respond "Forbidden" 403 - } + handle { + respond "Forbidden" 403 + } ''; }; }; diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 6864537..d86e504 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -137,6 +137,7 @@ in home = "/home/${cfg.name}"; isNormalUser = true; shell = lib.mkForce pkgs.zsh; + description = cfg.fullName; # SSH keys - combine user-specific and common keys openssh.authorizedKeys.keys = cfg.sshKeys ++ (lib.optionals cfg.enableCommonSshKeys commonSshKeys); diff --git a/packages/profile-pic/default.nix b/packages/profile-pic/default.nix new file mode 100644 index 0000000..94fd66d --- /dev/null +++ b/packages/profile-pic/default.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +let + imageUrl = "https://scontent.ffcm1-2.fna.fbcdn.net/v/t39.30808-6/387733576_7270226619673057_585200616645530081_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=1d70fc&_nc_ohc=KeQIDYtXccwQ7kNvwGkF57h&_nc_oc=AdqzTQBFHCfCUmy1iF-ATon_uMr6n0nMSXFyYTmSbT07kVw3D5nCvgfqp3UNhjkO0AM&_nc_zt=23&_nc_ht=scontent.ffcm1-2.fna&_nc_gid=6gw6tJoXB9eWOy5en5irxg&_nc_ss=7a32e&oh=00_Afwr4AsNifG3vViXZ_x-wNC98bznQ2vFnVrKl2sDPEl9oA&oe=69CCE530"; +in +stdenvNoCC.mkDerivation { + pname = "profile-pic"; + version = "1.0.0"; + + src = fetchurl { + url = imageUrl; + hash = "sha256-n7yayMkNow6IaKVk8mkUWEqa0STR8UKNJD2K1PtPfW8="; + }; + + sourceRoot = "."; + + dontUnpack = true; + + dontBuild = true; + + dontFixup = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out" + cp $src $out/profile-pic + runHook postInstall + ''; + + meta = with lib; { + description = "Profile Pic for Matt"; + homepage = "https://authentik.mjallen.dev"; + platforms = platforms.linux; + maintainers = [ ]; + }; +}