ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix autopull (#79)

Browse Source 
* fix autopull

* add deadnix

* fix git
This commit is contained in:
Dennis 2024-02-06 23:58:33 +01:00 committed by GitHub
parent 3b70b4ea60
commit 52c421a45f
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@ -232,7 +232,10 @@
mkShell { mkShell {
sopsPGPKeyDirs = [ "./keys" ]; sopsPGPKeyDirs = [ "./keys" ];
nativeBuildInputs = [ apacheHttpd sopsPkgs.sops-import-keys-hook ]; 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; shellHook = (nix-pre-commit.lib.${system}.mkConfig { inherit pkgs config; }).shellHook;
}) })
sops-nix.packages; sops-nix.packages;

3
modules/flake-update-service.nix
View File

@ -25,6 +25,7 @@ in {
ssh-key = lib.mkOption { ssh-key = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "";
description = "ssh-key used to pull the repository"; description = "ssh-key used to pull the repository";
}; };
@ -48,8 +49,6 @@ in {
WorkingDirectory = cfg.path; WorkingDirectory = cfg.path;
Environment = lib.mkIf (cfg.ssh-key != "") "GIT_SSH_COMMAND=${pkgs.openssh}/bin/ssh -i ${cfg.ssh-key} -o IdentitiesOnly=yes"; 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"; ExecStart = "${pkgs.git}/bin/git pull --all";
Before = "nixos-upgrade.service";
Wants = "nixos-upgrade.service";
}; };
}; };

2
modules/website.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
eachSite = config.services.staticpage.sites; eachSite = config.services.staticpage.sites;
siteOpts = { lib, name, config, ... }: { siteOpts = { lib, ... }: {
options = { options = {
package = lib.mkPackageOption pkgs "page" { }; package = lib.mkPackageOption pkgs "page" { };

4
systems/configuration.nix
View File

@ -97,8 +97,8 @@
autopull = { autopull = {
enable = true; enable = true;
path = /root/dotfiles;
ssh-key = "/root/.ssh/id_ed25519_ghdeploy"; ssh-key = "/root/.ssh/id_ed25519_ghdeploy";
path = /root/dotfiles;
}; };
}; };
@ -176,7 +176,7 @@
enable = true; enable = true;
randomizedDelaySec = "1h"; randomizedDelaySec = "1h";
persistent = true; persistent = true;
flake = "git+ssh://git@github.com/RAD-Development/nix-dotfiles"; flake = "github:RAD-Development/nix-dotfiles";
}; };
}; };
} }

3
systems/palatine-hill/configuration.nix
View File

@ -2,6 +2,7 @@
time.timeZone = "America/New_York"; time.timeZone = "America/New_York";
console.keyMap = "us"; console.keyMap = "us";
systemd.services.hydra-notify.serviceConfig.EnvironmentFile = config.sops.secrets."hydra/environment".path; systemd.services.hydra-notify.serviceConfig.EnvironmentFile = config.sops.secrets."hydra/environment".path;
programs.git.lfs.enable = false;
networking = { networking = {
hostId = "dc2f9781"; hostId = "dc2f9781";
firewall.enable = false; firewall.enable = false;
@ -81,8 +82,6 @@
nfs.server.enable = true; nfs.server.enable = true;
openssh.ports = [ 666 ]; openssh.ports = [ 666 ];
smartd.enable = true; smartd.enable = true;
git.lfs.enable = false;
zfs = { zfs = {
trim.enable = true; trim.enable = true;
autoScrub.enable = true; autoScrub.enable = true;