merge-nixconfigs #14

Merged
jahanson merged 4 commits from merge-nixconfigs into main 2024-05-31 00:26:21 -05:00
4 changed files with 9 additions and 12 deletions
Showing only changes of commit d820259c32 - Show all commits

View file

@ -4,7 +4,6 @@
./forgejo ./forgejo
./glances ./glances
./monitoring.nix ./monitoring.nix
./nfs
./nginx ./nginx
./nix-serve ./nix-serve
./podman ./podman

View file

@ -32,7 +32,7 @@ in
lazydocker lazydocker
]; ];
config.programs.fish.shellAliases = { programs.fish.shellAliases = {
# lazydocker --> lazypodman # lazydocker --> lazypodman
lazypodman="sudo DOCKER_HOST=unix:///run/podman/podman.sock lazydocker"; lazypodman="sudo DOCKER_HOST=unix:///run/podman/podman.sock lazydocker";
}; };

View file

@ -55,7 +55,7 @@ in
# enable backups # enable backups
services.postgresqlBackup = mkIf cfg.backup { services.postgresqlBackup = mkIf cfg.backup {
enable = lib.mkForce true; enable = lib.mkForce true;
location = backupLocation; location = cfg.backupLocation;
}; };
### firewall config ### firewall config

View file

@ -1,12 +1,10 @@
{ config, lib, pkgs, imports, boot, self, inputs, ... }: { config, lib, pkgs, ... }:
# Role for workstations # Role for workstations
# Covers desktops/laptops, expected to have a GUI and do workloads # Covers desktops/laptops, expected to have a GUI and do workloads
# Will have home-manager installs # Will have home-manager installs
with config; with config;
{ {
mySystem = { mySystem = {
de.gnome.enable = true; de.gnome.enable = true;
@ -15,20 +13,20 @@ with config;
# TODO decide if i drop to bash on pis? # TODO decide if i drop to bash on pis?
shell.fish.enable = true; shell.fish.enable = true;
nfs.nas = { # TODO make nfs server configurable
enable = true; # nfs.nas = {
lazy = true; # enable = true;
}; # lazy = true;
# };
system.resticBackup.local.enable = false; system.resticBackup.local.enable = false;
system.resticBackup.remote.enable = false; system.resticBackup.remote.enable = false;
}; };
boot = { boot = {
binfmt.emulatedSystems = [ "aarch64-linux" ]; # Enabled for raspi4 compilation binfmt.emulatedSystems = [ "aarch64-linux" ]; # Enabled for raspi4 compilation
plymouth.enable = true; # hide console with splash screen plymouth.enable = true; # hide console with splash screen
}; };
nix.settings = { nix.settings = {