From c3dc7b9e51d23e6d5f4fefb7678975b6ebc80801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Mon, 29 Dec 2025 12:22:30 +0100 Subject: [PATCH] unify profiles --- configs/default.nix | 9 ----- configs/mastodon-bot.nix | 20 ----------- configs/watson.nix | 10 ------ flake.nix | 56 +++++++++++++++++++++---------- systems/ful/configuration.nix | 9 ----- systems/kibbeh/configuration.nix | 1 - systems/makanek/configuration.nix | 8 ----- systems/zaatar/configuration.nix | 7 ---- 8 files changed, 39 insertions(+), 81 deletions(-) delete mode 100644 configs/mastodon-bot.nix delete mode 100644 configs/watson.nix diff --git a/configs/default.nix b/configs/default.nix index 0a885df..ec75da1 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -193,7 +193,6 @@ in }; } ./android.nix - ./admin-essentials.nix ./stylix.nix ./alacritty.nix ./backup.nix @@ -216,14 +215,12 @@ in ./i3.nix ./i3status-rust.nix ./keyboard - ./mycelium.nix ./kdeconnect.nix { services.upower.enable = true; } ./lb.nix ./mpv.nix ./mime.nix ./neovim.nix - ./nix.nix ./newsboat.nix ./flameshot.nix ./packages.nix @@ -232,17 +229,13 @@ in ./polkit.nix ./printing.nix ./redshift.nix - ./retiolum.nix ./rofi.nix - ./spacetime.nix ./ssh.nix - ./sshd.nix ./sound.nix ./sudo.nix ./tmux.nix ./unclutter.nix ./vscode.nix - ./watson.nix ./wallpaper.nix ./zsh.nix { @@ -250,8 +243,6 @@ in # nothing to see here ''; } - ./tor.nix - ./mastodon-bot.nix { home-manager.users.me = { xdg.userDirs = diff --git a/configs/mastodon-bot.nix b/configs/mastodon-bot.nix deleted file mode 100644 index 510d6db..0000000 --- a/configs/mastodon-bot.nix +++ /dev/null @@ -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"; -} diff --git a/configs/watson.nix b/configs/watson.nix deleted file mode 100644 index 869b28b..0000000 --- a/configs/watson.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - config, - pkgs, - ... -}: -{ - environment.systemPackages = [ pkgs.watson ]; - - environment.variables.WATSON_DIR = "${config.users.users.me.home}/cloud/Seafile/Documents/watson"; -} diff --git a/flake.nix b/flake.nix index 309d216..56c3e08 100644 --- a/flake.nix +++ b/flake.nix @@ -340,13 +340,20 @@ nixosConfigurations = let - defaultModules = [ + profiles.default = [ { nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; } { nixpkgs.overlays = [ self.overlays.default ]; } agenix.nixosModules.default 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 nix-index-database.nixosModules.default nur.modules.nixos.default @@ -354,13 +361,28 @@ self.nixosModules.system-dependent 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 { ful = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - modules = defaultModules ++ [ + modules = profiles.default ++ profiles.server ++ [ systems/ful/configuration.nix - self.nixosModules.passport self.nixosModules.panoptikon self.nixosModules.go-webring stockholm.nixosModules.reaktor2 @@ -370,45 +392,44 @@ }; zaatar = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = defaultModules ++ [ + modules = profiles.default ++ profiles.server ++ [ systems/zaatar/configuration.nix ]; }; kibbeh = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = - defaultModules - ++ desktopModules + profiles.default + ++ profiles.desktop ++ [ systems/kibbeh/configuration.nix ]; }; makanek = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = defaultModules ++ [ + modules = profiles.default ++ profiles.server ++ [ systems/makanek/configuration.nix self.nixosModules.telegram-bot - self.nixosModules.passport nur.modules.nixos.default ]; }; tahina = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = defaultModules ++ [ + modules = profiles.default ++ [ systems/tahina/configuration.nix ]; }; tabula = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = defaultModules ++ [ + modules = profiles.default ++ [ systems/tabula/configuration.nix ]; }; manakish = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = - defaultModules - ++ desktopModules + profiles.default + ++ profiles.desktop ++ [ systems/manakish/configuration.nix ]; @@ -416,8 +437,8 @@ kabsa = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = - defaultModules - ++ desktopModules + profiles.default + ++ profiles.desktop ++ [ systems/kabsa/configuration.nix ]; @@ -425,8 +446,8 @@ fatteh = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = - defaultModules - ++ desktopModules + profiles.default + ++ profiles.desktop ++ [ systems/fatteh/configuration.nix ]; @@ -491,6 +512,7 @@ mpv-tuner mpv-tv new-mac + niveum-ssh nix-git noise-waves notemenu diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix index 440097c..6e610fa 100644 --- a/systems/ful/configuration.nix +++ b/systems/ful/configuration.nix @@ -16,15 +16,6 @@ ./gemini.nix ./wallabag.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 = { diff --git a/systems/kibbeh/configuration.nix b/systems/kibbeh/configuration.nix index c313358..1b11347 100644 --- a/systems/kibbeh/configuration.nix +++ b/systems/kibbeh/configuration.nix @@ -19,7 +19,6 @@ ../../configs/sshd.nix ../../configs/sudo.nix ../../configs/zsh.nix - ../../configs/tor.nix ]; age.secrets = { diff --git a/systems/makanek/configuration.nix b/systems/makanek/configuration.nix index 76bcbe0..0fa3639 100644 --- a/systems/makanek/configuration.nix +++ b/systems/makanek/configuration.nix @@ -14,7 +14,6 @@ ./monitoring # ./names.nix ./nextcloud.nix - ../../configs/mycelium.nix ./radio-news.nix ./scrabble.nix # ./onlyoffice.nix @@ -22,15 +21,8 @@ ./oracle ./tt-rss.nix ./weechat.nix - ../../configs/monitoring.nix - ../../configs/nix.nix ../../configs/tor.nix - ../../configs/save-space.nix - ../../configs/retiolum.nix - ../../configs/spacetime.nix - ../../configs/sshd.nix ../../configs/bots - ../../configs/admin-essentials.nix ]; services.restic.backups.niveum = { diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix index d5765ee..89d6b48 100644 --- a/systems/zaatar/configuration.nix +++ b/systems/zaatar/configuration.nix @@ -9,17 +9,10 @@ ./backup.nix ./gaslight.nix ./hardware-configuration.nix - ../../configs/mycelium.nix ./home-assistant.nix - ../../configs/monitoring.nix - ../../configs/retiolum.nix ../../configs/printing.nix - ../../configs/spacetime.nix - ../../configs/sshd.nix ../../configs/tmux.nix ../../configs/wpa_supplicant.nix - ../../configs/nix.nix - ../../configs/admin-essentials.nix ]; services.pipewire.systemWide = true;