diff --git a/flake.nix b/flake.nix index b5dcda2..af586fa 100644 --- a/flake.nix +++ b/flake.nix @@ -232,7 +232,10 @@ mkShell { sopsPGPKeyDirs = [ "./keys" ]; nativeBuildInputs = [ apacheHttpd sopsPkgs.sops-import-keys-hook ]; - packages = [ self.formatter.${system} ]; + packages = [ + self.formatter.${system} + nixpkgs.legacyPackages.${system}.deadnix + ]; shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook; }) sops-nix.packages; diff --git a/modules/flake-update-service.nix b/modules/flake-update-service.nix index fda4bef..d4ba598 100644 --- a/modules/flake-update-service.nix +++ b/modules/flake-update-service.nix @@ -25,6 +25,7 @@ in { ssh-key = lib.mkOption { type = lib.types.str; + default = ""; description = "ssh-key used to pull the repository"; }; @@ -48,8 +49,6 @@ in { WorkingDirectory = cfg.path; Environment = lib.mkIf (cfg.ssh-key != "") "GIT_SSH_COMMAND=${pkgs.openssh}/bin/ssh -i ${cfg.ssh-key} -o IdentitiesOnly=yes"; ExecStart = "${pkgs.git}/bin/git pull --all"; - Before = "nixos-upgrade.service"; - Wants = "nixos-upgrade.service"; }; }; diff --git a/modules/website.nix b/modules/website.nix index 0aeedfb..d4a426d 100644 --- a/modules/website.nix +++ b/modules/website.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let eachSite = config.services.staticpage.sites; - siteOpts = { lib, name, config, ... }: { + siteOpts = { lib, ... }: { options = { package = lib.mkPackageOption pkgs "page" { }; diff --git a/systems/configuration.nix b/systems/configuration.nix index 8094e2f..71d3ae0 100644 --- a/systems/configuration.nix +++ b/systems/configuration.nix @@ -97,8 +97,8 @@ autopull = { enable = true; - path = /root/dotfiles; ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; + path = /root/dotfiles; }; }; @@ -176,7 +176,7 @@ enable = true; randomizedDelaySec = "1h"; persistent = true; - flake = "git+ssh://git@github.com/RAD-Development/nix-dotfiles"; + flake = "github:RAD-Development/nix-dotfiles"; }; }; } diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index fc6451c..fb7aac3 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -2,6 +2,7 @@ time.timeZone = "America/New_York"; console.keyMap = "us"; systemd.services.hydra-notify.serviceConfig.EnvironmentFile = config.sops.secrets."hydra/environment".path; + programs.git.lfs.enable = false; networking = { hostId = "dc2f9781"; firewall.enable = false; @@ -81,8 +82,6 @@ nfs.server.enable = true; openssh.ports = [ 666 ]; smartd.enable = true; - git.lfs.enable = false; - zfs = { trim.enable = true; autoScrub.enable = true;