This commit is contained in:
John Lancaster
2024-12-29 13:31:55 -06:00
parent 26307a04d1
commit a8c4b75eb1

View File

@@ -1,17 +1,11 @@
{ inputs, pkgs, lib, userSettings, systemSettings, ... }: { pkgs, userSettings, systemSettings, ... }:
let
stateVersion = systemSettings.stateVersion;
# adHome = "/srv/appdaemon";
# adNixPath = "${adHome}/ad-nix";
# adPath = "/usr/src/app";
in
{ {
imports = [ imports = [
(import ./home-manager/home.nix {inherit systemSettings userSettings;}) (import ./home-manager/home.nix {inherit systemSettings userSettings;})
./nixos ./nixos
./scripts ./scripts
]; ];
system.stateVersion = stateVersion; system.stateVersion = systemSettings.stateVersion;
time.timeZone = "${systemSettings.timeZone}"; time.timeZone = "${systemSettings.timeZone}";
nix.settings.trusted-users = [ "root" "@wheel" ]; nix.settings.trusted-users = [ "root" "@wheel" ];
@@ -21,31 +15,8 @@ in
sops.defaultSopsFile = ./secrets/secrets.yaml; sops.defaultSopsFile = ./secrets/secrets.yaml;
sops.defaultSopsFormat = "yaml"; sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "${userSettings.adHome}/.config/sops/age/keys.txt";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# (pkgs.writeShellScriptBin "nrbs" "sudo nixos-rebuild switch")
# (pkgs.writeShellScriptBin "nrbsu" "sudo nix-channel --update && sudo nixos-rebuild switch")
# (pkgs.writeShellScriptBin "nfs" ''
# sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName}
# '')
# (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)")
# (pkgs.writeShellScriptBin "link-nix" ''
# set -e
# if [ "$#" -eq 0 ]; then
# echo "Error: No arguments provided."
# echo "Usage: $0 <path>"
# exit 1
# fi
# CURRENT=$(readlink -f /etc/nixos)
# sudo rm /etc/nixos
# echo "Unlinked $CURRENT"
# sudo ln -s $1 /etc/nixos
# echo "Linked $(readlink -f /etc/nixos)"
# '')
bash bash
git git
eza eza
@@ -59,12 +30,4 @@ in
services.vscode-server.enable = true; services.vscode-server.enable = true;
services.openssh.enable = true; services.openssh.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
# system.activationScripts.ensureDirectory = ''
# if [ ! -d /conf ]; then
# mkdir /conf
# chmod 0755 /conf
# chown 1000:100 /conf
# fi
# '';
} }