1
0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00

unify profiles

This commit is contained in:
2025-12-29 12:22:30 +01:00
parent 4188968ee1
commit c3dc7b9e51
8 changed files with 39 additions and 81 deletions

View File

@@ -193,7 +193,6 @@ in
}; };
} }
./android.nix ./android.nix
./admin-essentials.nix
./stylix.nix ./stylix.nix
./alacritty.nix ./alacritty.nix
./backup.nix ./backup.nix
@@ -216,14 +215,12 @@ in
./i3.nix ./i3.nix
./i3status-rust.nix ./i3status-rust.nix
./keyboard ./keyboard
./mycelium.nix
./kdeconnect.nix ./kdeconnect.nix
{ services.upower.enable = true; } { services.upower.enable = true; }
./lb.nix ./lb.nix
./mpv.nix ./mpv.nix
./mime.nix ./mime.nix
./neovim.nix ./neovim.nix
./nix.nix
./newsboat.nix ./newsboat.nix
./flameshot.nix ./flameshot.nix
./packages.nix ./packages.nix
@@ -232,17 +229,13 @@ in
./polkit.nix ./polkit.nix
./printing.nix ./printing.nix
./redshift.nix ./redshift.nix
./retiolum.nix
./rofi.nix ./rofi.nix
./spacetime.nix
./ssh.nix ./ssh.nix
./sshd.nix
./sound.nix ./sound.nix
./sudo.nix ./sudo.nix
./tmux.nix ./tmux.nix
./unclutter.nix ./unclutter.nix
./vscode.nix ./vscode.nix
./watson.nix
./wallpaper.nix ./wallpaper.nix
./zsh.nix ./zsh.nix
{ {
@@ -250,8 +243,6 @@ in
# nothing to see here # nothing to see here
''; '';
} }
./tor.nix
./mastodon-bot.nix
{ {
home-manager.users.me = { home-manager.users.me = {
xdg.userDirs = xdg.userDirs =

View File

@@ -1,20 +0,0 @@
{ pkgs, ... }:
{
systemd.services.imaginary-illuminations = {
enable = false;
wants = [ "network-online.target" ];
serviceConfig = {
User = "kfm";
Group = "users";
WorkingDirectory = "/home/kfm/cloud/Seafile/Documents/Media/imaginary-illuminations";
Restart = "on-failure";
RestartSec = "15s";
};
startAt = "7:00";
script = ''
${pkgs.deno}/bin/deno run -A post.ts
'';
};
systemd.timers.imaginary-illuminations.timerConfig.RandomizedDelaySec = "14h";
}

View File

@@ -1,10 +0,0 @@
{
config,
pkgs,
...
}:
{
environment.systemPackages = [ pkgs.watson ];
environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson";
}

View File

@@ -340,13 +340,20 @@
nixosConfigurations = nixosConfigurations =
let let
defaultModules = [ profiles.default = [
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
{ nixpkgs.overlays = [ self.overlays.default ]; } { nixpkgs.overlays = [ self.overlays.default ]; }
agenix.nixosModules.default agenix.nixosModules.default
retiolum.nixosModules.retiolum retiolum.nixosModules.retiolum
configs/mycelium.nix
configs/tor.nix
configs/retiolum.nix
configs/spacetime.nix
configs/nix.nix
configs/sshd.nix
configs/admin-essentials.nix
]; ];
desktopModules = [ profiles.desktop = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
nix-index-database.nixosModules.default nix-index-database.nixosModules.default
nur.modules.nixos.default nur.modules.nixos.default
@@ -354,13 +361,28 @@
self.nixosModules.system-dependent self.nixosModules.system-dependent
self.nixosModules.power-action self.nixosModules.power-action
]; ];
profiles.server = [
configs/save-space.nix
configs/monitoring.nix
self.nixosModules.passport
{
system.autoUpgrade = {
enable = true;
flake = self.outPath;
flags = [
"--print-build-logs"
];
dates = "02:00";
randomizedDelaySec = "45min";
};
}
];
in in
{ {
ful = nixpkgs.lib.nixosSystem { ful = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = defaultModules ++ [ modules = profiles.default ++ profiles.server ++ [
systems/ful/configuration.nix systems/ful/configuration.nix
self.nixosModules.passport
self.nixosModules.panoptikon self.nixosModules.panoptikon
self.nixosModules.go-webring self.nixosModules.go-webring
stockholm.nixosModules.reaktor2 stockholm.nixosModules.reaktor2
@@ -370,45 +392,44 @@
}; };
zaatar = nixpkgs.lib.nixosSystem { zaatar = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = profiles.default ++ profiles.server ++ [
systems/zaatar/configuration.nix systems/zaatar/configuration.nix
]; ];
}; };
kibbeh = nixpkgs.lib.nixosSystem { kibbeh = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
defaultModules profiles.default
++ desktopModules ++ profiles.desktop
++ [ ++ [
systems/kibbeh/configuration.nix systems/kibbeh/configuration.nix
]; ];
}; };
makanek = nixpkgs.lib.nixosSystem { makanek = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = profiles.default ++ profiles.server ++ [
systems/makanek/configuration.nix systems/makanek/configuration.nix
self.nixosModules.telegram-bot self.nixosModules.telegram-bot
self.nixosModules.passport
nur.modules.nixos.default nur.modules.nixos.default
]; ];
}; };
tahina = nixpkgs.lib.nixosSystem { tahina = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = profiles.default ++ [
systems/tahina/configuration.nix systems/tahina/configuration.nix
]; ];
}; };
tabula = nixpkgs.lib.nixosSystem { tabula = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = defaultModules ++ [ modules = profiles.default ++ [
systems/tabula/configuration.nix systems/tabula/configuration.nix
]; ];
}; };
manakish = nixpkgs.lib.nixosSystem { manakish = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
defaultModules profiles.default
++ desktopModules ++ profiles.desktop
++ [ ++ [
systems/manakish/configuration.nix systems/manakish/configuration.nix
]; ];
@@ -416,8 +437,8 @@
kabsa = nixpkgs.lib.nixosSystem { kabsa = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
defaultModules profiles.default
++ desktopModules ++ profiles.desktop
++ [ ++ [
systems/kabsa/configuration.nix systems/kabsa/configuration.nix
]; ];
@@ -425,8 +446,8 @@
fatteh = nixpkgs.lib.nixosSystem { fatteh = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
defaultModules profiles.default
++ desktopModules ++ profiles.desktop
++ [ ++ [
systems/fatteh/configuration.nix systems/fatteh/configuration.nix
]; ];
@@ -491,6 +512,7 @@
mpv-tuner mpv-tuner
mpv-tv mpv-tv
new-mac new-mac
niveum-ssh
nix-git nix-git
noise-waves noise-waves
notemenu notemenu

View File

@@ -16,15 +16,6 @@
./gemini.nix ./gemini.nix
./wallabag.nix ./wallabag.nix
./nethack.nix ./nethack.nix
../../configs/monitoring.nix
../../configs/mycelium.nix
../../configs/tor.nix
../../configs/save-space.nix
../../configs/spacetime.nix
../../configs/retiolum.nix
../../configs/sshd.nix
../../configs/nix.nix
../../configs/admin-essentials.nix
]; ];
niveum.passport = { niveum.passport = {

View File

@@ -19,7 +19,6 @@
../../configs/sshd.nix ../../configs/sshd.nix
../../configs/sudo.nix ../../configs/sudo.nix
../../configs/zsh.nix ../../configs/zsh.nix
../../configs/tor.nix
]; ];
age.secrets = { age.secrets = {

View File

@@ -14,7 +14,6 @@
./monitoring ./monitoring
# ./names.nix # ./names.nix
./nextcloud.nix ./nextcloud.nix
../../configs/mycelium.nix
./radio-news.nix ./radio-news.nix
./scrabble.nix ./scrabble.nix
# ./onlyoffice.nix # ./onlyoffice.nix
@@ -22,15 +21,8 @@
./oracle ./oracle
./tt-rss.nix ./tt-rss.nix
./weechat.nix ./weechat.nix
../../configs/monitoring.nix
../../configs/nix.nix
../../configs/tor.nix ../../configs/tor.nix
../../configs/save-space.nix
../../configs/retiolum.nix
../../configs/spacetime.nix
../../configs/sshd.nix
../../configs/bots ../../configs/bots
../../configs/admin-essentials.nix
]; ];
services.restic.backups.niveum = { services.restic.backups.niveum = {

View File

@@ -9,17 +9,10 @@
./backup.nix ./backup.nix
./gaslight.nix ./gaslight.nix
./hardware-configuration.nix ./hardware-configuration.nix
../../configs/mycelium.nix
./home-assistant.nix ./home-assistant.nix
../../configs/monitoring.nix
../../configs/retiolum.nix
../../configs/printing.nix ../../configs/printing.nix
../../configs/spacetime.nix
../../configs/sshd.nix
../../configs/tmux.nix ../../configs/tmux.nix
../../configs/wpa_supplicant.nix ../../configs/wpa_supplicant.nix
../../configs/nix.nix
../../configs/admin-essentials.nix
]; ];
services.pipewire.systemWide = true; services.pipewire.systemWide = true;