Desktop Updates Fri May 30 01:41:10 PM CDT 2025
This commit is contained in:
@@ -14,6 +14,17 @@
|
||||
./sops.nix
|
||||
];
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://cache.mjallen.dev"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users = {
|
||||
deck = {
|
||||
|
||||
@@ -82,7 +82,7 @@ let
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://www.ocbase.com/download-bin/edition:Personal/os:Linux";
|
||||
sha256 = "sha256-WCRbB4K0B/h5QC8CVNbJkQn87XmBG6TawFTtfUclhNU=";
|
||||
sha256 = "sha256-AomQNi7ODGaznFaHqxlFUcrV36QeLNC65MoCV2y6HZ8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@@ -111,6 +111,17 @@ in
|
||||
../../share/amd
|
||||
];
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://cache.mjallen.dev"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
chaotic.mesa-git.enable = true;
|
||||
|
||||
# Environment configuration
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -135,5 +136,41 @@
|
||||
libvirtd.enable = true;
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# Enable nix flakes and nix-command tools
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cache.nixos.org/"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
warn-dirty = lib.mkForce false;
|
||||
experimental-features = lib.mkForce [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
trusted-users = [ "@wheel" ];
|
||||
};
|
||||
|
||||
# Garbage collect automatically every week
|
||||
gc.automatic = lib.mkDefault true;
|
||||
gc.options = lib.mkDefault "--delete-older-than 30d";
|
||||
|
||||
optimise.automatic = lib.mkDefault true;
|
||||
};
|
||||
|
||||
# Nixpkgs configuration
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = lib.mkForce true;
|
||||
permittedInsecurePackages = [
|
||||
# ...
|
||||
];
|
||||
};
|
||||
};
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"vscode-extension-github-copilot"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||
services.nix-serve = {
|
||||
enable = true;
|
||||
package = pkgs.nix-serve-ng;
|
||||
secretKeyFile = "/etc/nix/cache-priv-key.pem";
|
||||
port = 5000; # Choose your preferred port
|
||||
openFirewall = true;
|
||||
@@ -11,11 +12,12 @@
|
||||
|
||||
# Improved systemd service with better error handling
|
||||
systemd.services.nix-rebuild-cache = {
|
||||
enable = true;
|
||||
description = "Rebuild all NixOS configurations for cache";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "root";
|
||||
WorkingDirectory = "/etc/nixos"; # Update this path
|
||||
WorkingDirectory = "/etc/nixos";
|
||||
StandardOutput = "journal+console";
|
||||
StandardError = "journal+console";
|
||||
Restart = "no";
|
||||
@@ -38,14 +40,93 @@
|
||||
git pull || echo "Warning: Could not pull latest changes"
|
||||
fi
|
||||
|
||||
# Run the build-all script
|
||||
echo "Starting build of all systems at $(date)"
|
||||
if nix run .#build-all; then
|
||||
echo "All systems built successfully at $(date)"
|
||||
echo "Starting build of matt-nixos at $(date)"
|
||||
if nix flake update desktop-nixpkgs desktop-chaotic desktop-home-manager desktop-impermanence desktop-lanzaboote desktop-nixos-hardware desktop-sops-nix desktop-steam-rom-manager nixpkgs-unstable nixpkgs-stable nixpkgs-darwin; then
|
||||
echo "matt-nixos flake updated successfully at $(date)"
|
||||
else
|
||||
echo "Some systems failed to build at $(date)"
|
||||
echo "matt-nixos failed to build at $(date)"
|
||||
exit 1
|
||||
fi
|
||||
if nix build .\#nixosConfigurations.matt-nixos.config.system.build.toplevel --no-link; then
|
||||
echo "matt-nixos built successfully at $(date)"
|
||||
git add .
|
||||
git commit -m "Desktop Updates $(date)"
|
||||
else
|
||||
echo "matt-nixos failed to build at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Starting build of steamdeck at $(date)"
|
||||
if nix flake update steamdeck-nixpkgs steamdeck-chaotic steamdeck-home-manager steamdeck-impermanence steamdeck-jovian steamdeck-lanzaboote steamdeck-nixos-hardware steamdeck-sops-nix steamdeck-steam-rom-manager; then
|
||||
echo "steamdeck flake updated successfully at $(date)"
|
||||
else
|
||||
echo "steamdeck flake failed to update at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
if nix build .\#nixosConfigurations.steamdeck.config.system.build.toplevel --no-link; then
|
||||
echo "steamdeck built successfully at $(date)"
|
||||
git add .
|
||||
git commit -m "Dteamdeck Updates $(date)"
|
||||
else
|
||||
echo "steamdeck failed to build at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Starting build of jallen-nas at $(date)"
|
||||
if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then
|
||||
echo "jallen-nas flake updated successfully at $(date)"
|
||||
else
|
||||
echo "jallen-nas flake failed to update at $(date)"
|
||||
exit 1
|
||||
fi
|
||||
if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then
|
||||
echo "jallen-nas built successfully at $(date)"
|
||||
git add .
|
||||
git commit -m "Jallen-NAS Updates $(date)"
|
||||
else
|
||||
echo "jallen-nas failed to build at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Starting build of pi4 at $(date)"
|
||||
if nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko; then
|
||||
echo "pi4 flake updated successfully at $(date)"
|
||||
else
|
||||
echo "pif flake failed to update at $(date)"
|
||||
exit 1
|
||||
fi
|
||||
if nix build .\#nixosConfigurations.pi4.config.system.build.toplevel --no-link; then
|
||||
echo "pi4 built successfully at $(date)"
|
||||
git add .
|
||||
git commit -m "Pi4 Updates $(date)"
|
||||
else
|
||||
echo "pi4 failed to build at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Starting build of pi5 at $(date)"
|
||||
if nix flake update pi5-nixpkgs pi5-home-manager pi5-impermanence pi5-nixos-hardware pi5-sops-nix nixos-raspberrypi; then
|
||||
echo "pi5 flake updated successfully at $(date)"
|
||||
else
|
||||
echo "pi5 flake failed to update at $(date)"
|
||||
exit 1
|
||||
fi
|
||||
if nix build .\#nixosConfigurations.pi5.config.system.build.toplevel --no-link; then
|
||||
echo "pi5 built successfully at $(date)"
|
||||
git add .
|
||||
git commit -m "Pi5 Updates $(date)"
|
||||
else
|
||||
echo "pi5 failed to build at $(date)"
|
||||
git reset --hard
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git push
|
||||
'';
|
||||
# # Send an email on failure (optional)
|
||||
# startPost = ''
|
||||
|
||||
@@ -18,6 +18,18 @@ in
|
||||
./sops.nix
|
||||
../default.nix
|
||||
];
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://cache.mjallen.dev"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
programs.zsh.enable = true;
|
||||
hardware.i2c.enable = true;
|
||||
|
||||
|
||||
@@ -25,9 +25,11 @@ in
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://nixos-raspberrypi.cachix.org"
|
||||
"https://cache.mjallen.dev"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
|
||||
"cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user