splitting things up

This commit is contained in:
ari committed 2024-05-15 19:03:26 -04:00
1 parent cc224f4043
commit 75aba098e9
10 files changed
+86 -74

No files matched your search

-32
View File
@@ -1,58 +1,26 @@
{ user }:
{ pkgs, ... }:
{
# Set your time zone.
time.timeZone = "America/Toronto";
# Select internationalisation properties.
i18n.defaultLocale = "en_CA.UTF-8";
# System Packages
programs.zsh.enable = true;
programs.nix-ld.enable = true;
services.flatpak.enable = true;
environment.systemPackages = with pkgs; [
# nix utils
nix-index
appimage-run
nil
cachix
# shell tools
zsh
git
usbutils
wget
htop
# system utils
nfs-utils
# misc
glib
glibc
glib-networking
# docker
docker-compose
# printer
system-config-printer
];
services.xserver.excludePackages = with pkgs; [
xterm
];
programs.tmux = {
enable = true;
clock24 = true;
};
# Storage Optim
nix.optimise.automatic = true;
services.cron = {
enable = true;
systemCronJobs = [
"* 23 * * * root nix-collect-garbage --delete-older-than 1d"
"* 23 * * * ${user.name} nix-collect-garbage --delete-older-than 1d"
];
};
}
+1 -7
View File
@@ -1,7 +1,6 @@
{ user
, hostName
, firewall
, systemStateVersion
, enableCore ? true
, enableFonts ? true
, enableNetowrking ? true
@@ -12,12 +11,7 @@
}:
{ pkgs, ... }:
{
imports = [
(import ./nix.nix {
user = user;
systemStateVersion = systemStateVersion;
})
] ++ (if enableCore then [
imports = [ ] ++ (if enableCore then [
(import ./core.nix {
user = user;
})
-25
View File
@@ -1,25 +0,0 @@
{ systemStateVersion, user }:
{ pkgs, ... }:
{
nixpkgs.config.allowUnfree = true;
system.stateVersion = systemStateVersion;
services.hydra.useSubstitutes = true;
nix = {
optimise = {
automatic = true;
dates = [ "01:00" ];
};
settings = {
experimental-features = [ "nix-command" "flakes" ];
};
settings.trusted-substituters = [
"https://cache.flox.dev"
"https://devenv.cachix.org"
];
settings.trusted-users = [ "root" user.name ];
settings.trusted-public-keys = [
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
];
};
}