diff --git a/devices/pi/configuration.nix b/devices/pi/configuration.nix index 5d1115b..dd1441a 100644 --- a/devices/pi/configuration.nix +++ b/devices/pi/configuration.nix @@ -21,21 +21,29 @@ in { }; }; - sops.defaultSopsFile = ../../secrets/secrets.yaml; - sops.defaultSopsFormat = "yaml"; - sops.age.keyFile = "/home/polen/.config/sops/age/keys.txt"; - - sops.secrets.pi_user_pass.neededForUsers = true; + #sops.defaultSopsFile = ../../secrets/secrets.yaml; + #sops.defaultSopsFormat = "yaml"; + #sops.age.keyFile = "/home/polen/.config/sops/age/keys.txt"; + #sops.secrets.pi_user_pass.neededForUsers = true; networking = { networkmanager.enable = true; wireless.enable = false; hostName = hostname; + firewall.allowedTCPPorts = [ 80 443 ]; }; - nix.settings.trusted-users = [ "polen" ]; + services.caddy = { + enable = true; + virtualHosts."mealie.polensky.me".extraConfig = '' + reverse_proxy https://localhost:9925 + ''; + }; + + nix.settings.trusted-users = [ user ]; environment.systemPackages = with pkgs; [ + htop-vim neovim tmux curl @@ -52,7 +60,7 @@ in { mutableUsers = false; users."${user}" = { isNormalUser = true; - hashedPasswordFile = config.sops.secrets.pi_user_pass.path; + #hashedPasswordFile = config.sops.secrets.pi_user_pass.path; extraGroups = [ "wheel" "docker" ]; }; }; diff --git a/devices/xps13/configuration.nix b/devices/xps13/configuration.nix index c36265a..e6df394 100644 --- a/devices/xps13/configuration.nix +++ b/devices/xps13/configuration.nix @@ -23,6 +23,7 @@ # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.trusted-users = [ "polen" ]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; boot.binfmt.emulatedSystems = ["aarch64-linux"]; diff --git a/flake.lock b/flake.lock index 09d782c..3a40333 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": {