From 0760acb676af13d5b4ddd8e1a28799dfbc086dcd Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 15 Jan 2024 07:45:43 +0800 Subject: [PATCH] configs: consolidate NixOS and home-manager config into one `configs` folder Now we're going beyond these structuring as we might have to accomodate non-system configurations like Nixvim. --- {users => configs/home-manager}/README.adoc | 0 {users => configs}/home-manager/alice/README.adoc | 0 {users => configs}/home-manager/alice/default.nix | 0 .../home-manager/foo-dogsquared/.editorconfig | 0 .../foo-dogsquared/config/distrobox/distrobox.conf | 0 .../home-manager/foo-dogsquared/config/kanidm | 0 .../foo-dogsquared/config/nixpkgs/config.nix | 0 .../foo-dogsquared/config/ssh/self-hosted | 0 .../foo-dogsquared/config/tridactyl/tridactylrc | 0 .../foo-dogsquared/config/yt-dlp-audio.conf | 0 .../foo-dogsquared/config/zellij/layouts/editor.kdl | 0 .../home-manager/foo-dogsquared/default.nix | 0 .../home-manager/foo-dogsquared/files/age-key.pub | 0 .../home-manager/foo-dogsquared/files/ssh-key-2.pub | 0 .../home-manager/foo-dogsquared/files/ssh-key.pub | 0 .../home-manager/foo-dogsquared/modules/default.nix | 0 .../foo-dogsquared/modules/dotfiles.nix | 0 .../foo-dogsquared/modules/programs/browsers.nix | 0 .../foo-dogsquared/modules/programs/dconf.nix | 1 + .../foo-dogsquared/modules/programs/doom-emacs.nix | 0 .../foo-dogsquared/modules/programs/email.nix | 0 .../foo-dogsquared/modules/programs/git.nix | 0 .../foo-dogsquared/modules/programs/keys.nix | 0 .../foo-dogsquared/modules/programs/research.nix | 0 .../foo-dogsquared/modules/programs/shell.nix | 0 .../modules/programs/terminal-multiplexer.nix | 0 .../foo-dogsquared/modules/programs/vs-code.nix | 0 .../foo-dogsquared/modules/setups/desktop.nix | 0 .../foo-dogsquared/modules/setups/development.nix | 0 .../foo-dogsquared/modules/setups/fonts.nix | 0 .../foo-dogsquared/modules/setups/music.nix | 0 .../foo-dogsquared/secrets/secrets.yaml | 0 {users => configs}/home-manager/plover/default.nix | 0 {users => configs}/home-manager/winnow/default.nix | 0 {hosts => configs/nixos}/README.adoc | 0 .../nixos/_users}/admin/default.nix | 6 +++--- .../nixos/_users}/nixos/default.nix | 0 .../nixos/_users}/plover/default.nix | 8 ++++---- {hosts => configs/nixos}/bootstrap/README.adoc | 0 {hosts => configs/nixos}/bootstrap/default.nix | 0 .../nixos}/graphical-installer/README.adoc | 0 .../nixos}/graphical-installer/default.nix | 0 {hosts => configs/nixos}/ni/README.adoc | 0 .../nixos}/ni/config/nixpkgs/config.nix | 0 {hosts => configs/nixos}/ni/default.nix | 0 {hosts => configs/nixos}/ni/disko.nix | 0 {hosts => configs/nixos}/ni/files/age-key.pub | 0 {hosts => configs/nixos}/ni/files/ssh-key.pub | 0 .../ni/files/wireguard/wireguard-public-key-ni | 0 .../nixos}/ni/hardware-configuration.nix | 0 {hosts => configs/nixos}/ni/modules/default.nix | 0 .../nixos}/ni/modules/hardware/qol.nix | 0 .../nixos}/ni/modules/networking/setup.nix | 0 .../nixos}/ni/modules/networking/wireguard.nix | 0 .../nixos}/ni/modules/services/backup/default.nix | 0 .../ni/modules/services/backup/desktop-backup.pub | 0 .../nixos}/ni/modules/services/backup/secrets.yaml | 0 .../ni/modules/services/download-media/README.adoc | 0 .../download-media/data/jobs.archivebox.json | 0 .../services/download-media/data/jobs.schema.json | 0 .../services/download-media/data/jobs.yt-dlp.json | 0 .../ni/modules/services/download-media/default.nix | 0 .../scripts/create-jobs-from-newpipe-db.py | 0 .../scripts/create-jobs-from-rss-opml.py | 0 .../ni/modules/services/download-media/secrets.yaml | 0 .../nixos}/ni/modules/setups/desktop.nix | 0 .../nixos}/ni/modules/setups/development.nix | 0 .../nixos}/ni/modules/setups/gaming.nix | 0 .../nixos}/ni/modules/setups/music.nix | 0 {hosts => configs/nixos}/ni/secrets/secrets.yaml | 0 {hosts => configs/nixos}/plover/.terraform.lock.hcl | 0 {hosts => configs/nixos}/plover/README.adoc | 0 .../nixos}/plover/config/dns/foodogsquared.one.zone | 0 .../plover/config/dns/plover.foodogsquared.one.zone | 0 .../nixos}/plover/config/wezterm/config.lua | 0 {hosts => configs/nixos}/plover/default.nix | 0 {hosts => configs/nixos}/plover/disko.nix | 0 {hosts => configs/nixos}/plover/files/age-key.pub | 0 .../nixos}/plover/files/gitea/home.tmpl | 0 .../nixos}/plover/files/gitea/logo.png | Bin .../nixos}/plover/files/gitea/logo.svg | 0 .../nixos}/plover/files/hcloud/hcloud-user-data.yml | 0 .../plover/files/hetzner-boxes-online-backup.pub | 0 {hosts => configs/nixos}/plover/files/ssh-key.pub | 0 .../files/wireguard/wireguard-public-key-phone | 0 .../files/wireguard/wireguard-public-key-plover | 0 {hosts => configs/nixos}/plover/main.tf | 0 {hosts => configs/nixos}/plover/modules/default.nix | 0 .../nixos}/plover/modules/hardware/networks.nix | 0 .../plover/modules/profiles/hetzner-cloud-cx21.nix | 0 .../nixos}/plover/modules/services/atuin.nix | 0 .../nixos}/plover/modules/services/backup.nix | 0 .../nixos}/plover/modules/services/database.nix | 0 .../nixos}/plover/modules/services/dns-server.nix | 0 .../nixos}/plover/modules/services/fail2ban.nix | 0 .../nixos}/plover/modules/services/firewall.nix | 0 .../nixos}/plover/modules/services/gitea.nix | 0 .../nixos}/plover/modules/services/grafana.nix | 0 .../nixos}/plover/modules/services/idm.nix | 0 .../nixos}/plover/modules/services/monitoring.nix | 0 .../plover/modules/services/reverse-proxy.nix | 0 .../nixos}/plover/modules/services/vaultwarden.nix | 0 .../nixos}/plover/modules/services/vouch-proxy.nix | 0 .../plover/modules/services/wezterm-mux-server.nix | 0 .../nixos}/plover/modules/services/wireguard.nix | 0 .../nixos}/plover/secrets/secrets.yaml | 0 {hosts => configs/nixos}/plover/versions.tf | 0 {hosts => configs/nixos}/void/README.adoc | 0 {hosts => configs/nixos}/void/default.nix | 0 {hosts => configs/nixos}/winnowing/README.adoc | 0 {hosts => configs/nixos}/winnowing/default.nix | 0 flake.nix | 8 ++++---- lib/private.nix | 6 ++++-- setups/home-manager.nix | 2 +- setups/nixos.nix | 2 +- 115 files changed, 18 insertions(+), 15 deletions(-) rename {users => configs/home-manager}/README.adoc (100%) rename {users => configs}/home-manager/alice/README.adoc (100%) rename {users => configs}/home-manager/alice/default.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/.editorconfig (100%) rename {users => configs}/home-manager/foo-dogsquared/config/distrobox/distrobox.conf (100%) rename {users => configs}/home-manager/foo-dogsquared/config/kanidm (100%) rename {users => configs}/home-manager/foo-dogsquared/config/nixpkgs/config.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/config/ssh/self-hosted (100%) rename {users => configs}/home-manager/foo-dogsquared/config/tridactyl/tridactylrc (100%) rename {users => configs}/home-manager/foo-dogsquared/config/yt-dlp-audio.conf (100%) rename {users => configs}/home-manager/foo-dogsquared/config/zellij/layouts/editor.kdl (100%) rename {users => configs}/home-manager/foo-dogsquared/default.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/files/age-key.pub (100%) rename {users => configs}/home-manager/foo-dogsquared/files/ssh-key-2.pub (100%) rename {users => configs}/home-manager/foo-dogsquared/files/ssh-key.pub (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/default.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/dotfiles.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/browsers.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/dconf.nix (94%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/email.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/git.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/keys.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/research.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/shell.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/terminal-multiplexer.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/programs/vs-code.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/setups/desktop.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/setups/development.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/setups/fonts.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/modules/setups/music.nix (100%) rename {users => configs}/home-manager/foo-dogsquared/secrets/secrets.yaml (100%) rename {users => configs}/home-manager/plover/default.nix (100%) rename {users => configs}/home-manager/winnow/default.nix (100%) rename {hosts => configs/nixos}/README.adoc (100%) rename {users/nixos => configs/nixos/_users}/admin/default.nix (85%) rename {users/nixos => configs/nixos/_users}/nixos/default.nix (100%) rename {users/nixos => configs/nixos/_users}/plover/default.nix (73%) rename {hosts => configs/nixos}/bootstrap/README.adoc (100%) rename {hosts => configs/nixos}/bootstrap/default.nix (100%) rename {hosts => configs/nixos}/graphical-installer/README.adoc (100%) rename {hosts => configs/nixos}/graphical-installer/default.nix (100%) rename {hosts => configs/nixos}/ni/README.adoc (100%) rename {hosts => configs/nixos}/ni/config/nixpkgs/config.nix (100%) rename {hosts => configs/nixos}/ni/default.nix (100%) rename {hosts => configs/nixos}/ni/disko.nix (100%) rename {hosts => configs/nixos}/ni/files/age-key.pub (100%) rename {hosts => configs/nixos}/ni/files/ssh-key.pub (100%) rename {hosts => configs/nixos}/ni/files/wireguard/wireguard-public-key-ni (100%) rename {hosts => configs/nixos}/ni/hardware-configuration.nix (100%) rename {hosts => configs/nixos}/ni/modules/default.nix (100%) rename {hosts => configs/nixos}/ni/modules/hardware/qol.nix (100%) rename {hosts => configs/nixos}/ni/modules/networking/setup.nix (100%) rename {hosts => configs/nixos}/ni/modules/networking/wireguard.nix (100%) rename {hosts => configs/nixos}/ni/modules/services/backup/default.nix (100%) rename {hosts => configs/nixos}/ni/modules/services/backup/desktop-backup.pub (100%) rename {hosts => configs/nixos}/ni/modules/services/backup/secrets.yaml (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/README.adoc (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/data/jobs.archivebox.json (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/data/jobs.schema.json (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/data/jobs.yt-dlp.json (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/default.nix (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/scripts/create-jobs-from-newpipe-db.py (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/scripts/create-jobs-from-rss-opml.py (100%) rename {hosts => configs/nixos}/ni/modules/services/download-media/secrets.yaml (100%) rename {hosts => configs/nixos}/ni/modules/setups/desktop.nix (100%) rename {hosts => configs/nixos}/ni/modules/setups/development.nix (100%) rename {hosts => configs/nixos}/ni/modules/setups/gaming.nix (100%) rename {hosts => configs/nixos}/ni/modules/setups/music.nix (100%) rename {hosts => configs/nixos}/ni/secrets/secrets.yaml (100%) rename {hosts => configs/nixos}/plover/.terraform.lock.hcl (100%) rename {hosts => configs/nixos}/plover/README.adoc (100%) rename {hosts => configs/nixos}/plover/config/dns/foodogsquared.one.zone (100%) rename {hosts => configs/nixos}/plover/config/dns/plover.foodogsquared.one.zone (100%) rename {hosts => configs/nixos}/plover/config/wezterm/config.lua (100%) rename {hosts => configs/nixos}/plover/default.nix (100%) rename {hosts => configs/nixos}/plover/disko.nix (100%) rename {hosts => configs/nixos}/plover/files/age-key.pub (100%) rename {hosts => configs/nixos}/plover/files/gitea/home.tmpl (100%) rename {hosts => configs/nixos}/plover/files/gitea/logo.png (100%) rename {hosts => configs/nixos}/plover/files/gitea/logo.svg (100%) rename {hosts => configs/nixos}/plover/files/hcloud/hcloud-user-data.yml (100%) rename {hosts => configs/nixos}/plover/files/hetzner-boxes-online-backup.pub (100%) rename {hosts => configs/nixos}/plover/files/ssh-key.pub (100%) rename {hosts => configs/nixos}/plover/files/wireguard/wireguard-public-key-phone (100%) rename {hosts => configs/nixos}/plover/files/wireguard/wireguard-public-key-plover (100%) rename {hosts => configs/nixos}/plover/main.tf (100%) rename {hosts => configs/nixos}/plover/modules/default.nix (100%) rename {hosts => configs/nixos}/plover/modules/hardware/networks.nix (100%) rename {hosts => configs/nixos}/plover/modules/profiles/hetzner-cloud-cx21.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/atuin.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/backup.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/database.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/dns-server.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/fail2ban.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/firewall.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/gitea.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/grafana.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/idm.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/monitoring.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/reverse-proxy.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/vaultwarden.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/vouch-proxy.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/wezterm-mux-server.nix (100%) rename {hosts => configs/nixos}/plover/modules/services/wireguard.nix (100%) rename {hosts => configs/nixos}/plover/secrets/secrets.yaml (100%) rename {hosts => configs/nixos}/plover/versions.tf (100%) rename {hosts => configs/nixos}/void/README.adoc (100%) rename {hosts => configs/nixos}/void/default.nix (100%) rename {hosts => configs/nixos}/winnowing/README.adoc (100%) rename {hosts => configs/nixos}/winnowing/default.nix (100%) diff --git a/users/README.adoc b/configs/home-manager/README.adoc similarity index 100% rename from users/README.adoc rename to configs/home-manager/README.adoc diff --git a/users/home-manager/alice/README.adoc b/configs/home-manager/alice/README.adoc similarity index 100% rename from users/home-manager/alice/README.adoc rename to configs/home-manager/alice/README.adoc diff --git a/users/home-manager/alice/default.nix b/configs/home-manager/alice/default.nix similarity index 100% rename from users/home-manager/alice/default.nix rename to configs/home-manager/alice/default.nix diff --git a/users/home-manager/foo-dogsquared/.editorconfig b/configs/home-manager/foo-dogsquared/.editorconfig similarity index 100% rename from users/home-manager/foo-dogsquared/.editorconfig rename to configs/home-manager/foo-dogsquared/.editorconfig diff --git a/users/home-manager/foo-dogsquared/config/distrobox/distrobox.conf b/configs/home-manager/foo-dogsquared/config/distrobox/distrobox.conf similarity index 100% rename from users/home-manager/foo-dogsquared/config/distrobox/distrobox.conf rename to configs/home-manager/foo-dogsquared/config/distrobox/distrobox.conf diff --git a/users/home-manager/foo-dogsquared/config/kanidm b/configs/home-manager/foo-dogsquared/config/kanidm similarity index 100% rename from users/home-manager/foo-dogsquared/config/kanidm rename to configs/home-manager/foo-dogsquared/config/kanidm diff --git a/users/home-manager/foo-dogsquared/config/nixpkgs/config.nix b/configs/home-manager/foo-dogsquared/config/nixpkgs/config.nix similarity index 100% rename from users/home-manager/foo-dogsquared/config/nixpkgs/config.nix rename to configs/home-manager/foo-dogsquared/config/nixpkgs/config.nix diff --git a/users/home-manager/foo-dogsquared/config/ssh/self-hosted b/configs/home-manager/foo-dogsquared/config/ssh/self-hosted similarity index 100% rename from users/home-manager/foo-dogsquared/config/ssh/self-hosted rename to configs/home-manager/foo-dogsquared/config/ssh/self-hosted diff --git a/users/home-manager/foo-dogsquared/config/tridactyl/tridactylrc b/configs/home-manager/foo-dogsquared/config/tridactyl/tridactylrc similarity index 100% rename from users/home-manager/foo-dogsquared/config/tridactyl/tridactylrc rename to configs/home-manager/foo-dogsquared/config/tridactyl/tridactylrc diff --git a/users/home-manager/foo-dogsquared/config/yt-dlp-audio.conf b/configs/home-manager/foo-dogsquared/config/yt-dlp-audio.conf similarity index 100% rename from users/home-manager/foo-dogsquared/config/yt-dlp-audio.conf rename to configs/home-manager/foo-dogsquared/config/yt-dlp-audio.conf diff --git a/users/home-manager/foo-dogsquared/config/zellij/layouts/editor.kdl b/configs/home-manager/foo-dogsquared/config/zellij/layouts/editor.kdl similarity index 100% rename from users/home-manager/foo-dogsquared/config/zellij/layouts/editor.kdl rename to configs/home-manager/foo-dogsquared/config/zellij/layouts/editor.kdl diff --git a/users/home-manager/foo-dogsquared/default.nix b/configs/home-manager/foo-dogsquared/default.nix similarity index 100% rename from users/home-manager/foo-dogsquared/default.nix rename to configs/home-manager/foo-dogsquared/default.nix diff --git a/users/home-manager/foo-dogsquared/files/age-key.pub b/configs/home-manager/foo-dogsquared/files/age-key.pub similarity index 100% rename from users/home-manager/foo-dogsquared/files/age-key.pub rename to configs/home-manager/foo-dogsquared/files/age-key.pub diff --git a/users/home-manager/foo-dogsquared/files/ssh-key-2.pub b/configs/home-manager/foo-dogsquared/files/ssh-key-2.pub similarity index 100% rename from users/home-manager/foo-dogsquared/files/ssh-key-2.pub rename to configs/home-manager/foo-dogsquared/files/ssh-key-2.pub diff --git a/users/home-manager/foo-dogsquared/files/ssh-key.pub b/configs/home-manager/foo-dogsquared/files/ssh-key.pub similarity index 100% rename from users/home-manager/foo-dogsquared/files/ssh-key.pub rename to configs/home-manager/foo-dogsquared/files/ssh-key.pub diff --git a/users/home-manager/foo-dogsquared/modules/default.nix b/configs/home-manager/foo-dogsquared/modules/default.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/default.nix rename to configs/home-manager/foo-dogsquared/modules/default.nix diff --git a/users/home-manager/foo-dogsquared/modules/dotfiles.nix b/configs/home-manager/foo-dogsquared/modules/dotfiles.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/dotfiles.nix rename to configs/home-manager/foo-dogsquared/modules/dotfiles.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/browsers.nix b/configs/home-manager/foo-dogsquared/modules/programs/browsers.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/browsers.nix rename to configs/home-manager/foo-dogsquared/modules/programs/browsers.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/dconf.nix b/configs/home-manager/foo-dogsquared/modules/programs/dconf.nix similarity index 94% rename from users/home-manager/foo-dogsquared/modules/programs/dconf.nix rename to configs/home-manager/foo-dogsquared/modules/programs/dconf.nix index ca4a14d9..18841288 100644 --- a/users/home-manager/foo-dogsquared/modules/programs/dconf.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/dconf.nix @@ -10,6 +10,7 @@ in config = lib.mkIf cfg.enable { dconf.settings = { + # My GNOME Shell and programs configuration. "org/gnome/shell" = { favorite-apps = lib.optional userCfg.programs.browsers.firefox.enable "firefox.desktop" diff --git a/users/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix b/configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix rename to configs/home-manager/foo-dogsquared/modules/programs/doom-emacs.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/email.nix b/configs/home-manager/foo-dogsquared/modules/programs/email.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/email.nix rename to configs/home-manager/foo-dogsquared/modules/programs/email.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/git.nix b/configs/home-manager/foo-dogsquared/modules/programs/git.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/git.nix rename to configs/home-manager/foo-dogsquared/modules/programs/git.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/keys.nix b/configs/home-manager/foo-dogsquared/modules/programs/keys.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/keys.nix rename to configs/home-manager/foo-dogsquared/modules/programs/keys.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/research.nix b/configs/home-manager/foo-dogsquared/modules/programs/research.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/research.nix rename to configs/home-manager/foo-dogsquared/modules/programs/research.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/shell.nix b/configs/home-manager/foo-dogsquared/modules/programs/shell.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/shell.nix rename to configs/home-manager/foo-dogsquared/modules/programs/shell.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/terminal-multiplexer.nix b/configs/home-manager/foo-dogsquared/modules/programs/terminal-multiplexer.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/terminal-multiplexer.nix rename to configs/home-manager/foo-dogsquared/modules/programs/terminal-multiplexer.nix diff --git a/users/home-manager/foo-dogsquared/modules/programs/vs-code.nix b/configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/programs/vs-code.nix rename to configs/home-manager/foo-dogsquared/modules/programs/vs-code.nix diff --git a/users/home-manager/foo-dogsquared/modules/setups/desktop.nix b/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/setups/desktop.nix rename to configs/home-manager/foo-dogsquared/modules/setups/desktop.nix diff --git a/users/home-manager/foo-dogsquared/modules/setups/development.nix b/configs/home-manager/foo-dogsquared/modules/setups/development.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/setups/development.nix rename to configs/home-manager/foo-dogsquared/modules/setups/development.nix diff --git a/users/home-manager/foo-dogsquared/modules/setups/fonts.nix b/configs/home-manager/foo-dogsquared/modules/setups/fonts.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/setups/fonts.nix rename to configs/home-manager/foo-dogsquared/modules/setups/fonts.nix diff --git a/users/home-manager/foo-dogsquared/modules/setups/music.nix b/configs/home-manager/foo-dogsquared/modules/setups/music.nix similarity index 100% rename from users/home-manager/foo-dogsquared/modules/setups/music.nix rename to configs/home-manager/foo-dogsquared/modules/setups/music.nix diff --git a/users/home-manager/foo-dogsquared/secrets/secrets.yaml b/configs/home-manager/foo-dogsquared/secrets/secrets.yaml similarity index 100% rename from users/home-manager/foo-dogsquared/secrets/secrets.yaml rename to configs/home-manager/foo-dogsquared/secrets/secrets.yaml diff --git a/users/home-manager/plover/default.nix b/configs/home-manager/plover/default.nix similarity index 100% rename from users/home-manager/plover/default.nix rename to configs/home-manager/plover/default.nix diff --git a/users/home-manager/winnow/default.nix b/configs/home-manager/winnow/default.nix similarity index 100% rename from users/home-manager/winnow/default.nix rename to configs/home-manager/winnow/default.nix diff --git a/hosts/README.adoc b/configs/nixos/README.adoc similarity index 100% rename from hosts/README.adoc rename to configs/nixos/README.adoc diff --git a/users/nixos/admin/default.nix b/configs/nixos/_users/admin/default.nix similarity index 85% rename from users/nixos/admin/default.nix rename to configs/nixos/_users/admin/default.nix index db8b34a9..2418f57b 100644 --- a/users/nixos/admin/default.nix +++ b/configs/nixos/_users/admin/default.nix @@ -11,9 +11,9 @@ in extraGroups = [ "wheel" ]; useDefaultShell = true; openssh.authorizedKeys.keyFiles = [ - ../../home-manager/foo-dogsquared/files/ssh-key.pub - ../../home-manager/foo-dogsquared/files/ssh-key-2.pub - ../../../hosts/ni/files/ssh-key.pub + ../../../home-manager/foo-dogsquared/files/ssh-key.pub + ../../../home-manager/foo-dogsquared/files/ssh-key-2.pub + ../../ni/files/ssh-key.pub ]; }; diff --git a/users/nixos/nixos/default.nix b/configs/nixos/_users/nixos/default.nix similarity index 100% rename from users/nixos/nixos/default.nix rename to configs/nixos/_users/nixos/default.nix diff --git a/users/nixos/plover/default.nix b/configs/nixos/_users/plover/default.nix similarity index 73% rename from users/nixos/plover/default.nix rename to configs/nixos/_users/plover/default.nix index 7d83469b..96f1d224 100644 --- a/users/nixos/plover/default.nix +++ b/configs/nixos/_users/plover/default.nix @@ -3,7 +3,7 @@ let user = "plover"; - homeManagerUser = lib.private.getUser "home-manager" user; + homeManagerUser = lib.private.getConfig "home-manager" user; in { users.users.${user} = { @@ -15,9 +15,9 @@ in description = "The go-to user for server systems."; openssh.authorizedKeys.keyFiles = [ - ../../home-manager/foo-dogsquared/files/ssh-key.pub - ../../home-manager/foo-dogsquared/files/ssh-key-2.pub - ../../../hosts/ni/files/ssh-key.pub + ../../../home-manager/foo-dogsquared/files/ssh-key.pub + ../../../home-manager/foo-dogsquared/files/ssh-key-2.pub + ../../ni/files/ssh-key.pub ]; }; diff --git a/hosts/bootstrap/README.adoc b/configs/nixos/bootstrap/README.adoc similarity index 100% rename from hosts/bootstrap/README.adoc rename to configs/nixos/bootstrap/README.adoc diff --git a/hosts/bootstrap/default.nix b/configs/nixos/bootstrap/default.nix similarity index 100% rename from hosts/bootstrap/default.nix rename to configs/nixos/bootstrap/default.nix diff --git a/hosts/graphical-installer/README.adoc b/configs/nixos/graphical-installer/README.adoc similarity index 100% rename from hosts/graphical-installer/README.adoc rename to configs/nixos/graphical-installer/README.adoc diff --git a/hosts/graphical-installer/default.nix b/configs/nixos/graphical-installer/default.nix similarity index 100% rename from hosts/graphical-installer/default.nix rename to configs/nixos/graphical-installer/default.nix diff --git a/hosts/ni/README.adoc b/configs/nixos/ni/README.adoc similarity index 100% rename from hosts/ni/README.adoc rename to configs/nixos/ni/README.adoc diff --git a/hosts/ni/config/nixpkgs/config.nix b/configs/nixos/ni/config/nixpkgs/config.nix similarity index 100% rename from hosts/ni/config/nixpkgs/config.nix rename to configs/nixos/ni/config/nixpkgs/config.nix diff --git a/hosts/ni/default.nix b/configs/nixos/ni/default.nix similarity index 100% rename from hosts/ni/default.nix rename to configs/nixos/ni/default.nix diff --git a/hosts/ni/disko.nix b/configs/nixos/ni/disko.nix similarity index 100% rename from hosts/ni/disko.nix rename to configs/nixos/ni/disko.nix diff --git a/hosts/ni/files/age-key.pub b/configs/nixos/ni/files/age-key.pub similarity index 100% rename from hosts/ni/files/age-key.pub rename to configs/nixos/ni/files/age-key.pub diff --git a/hosts/ni/files/ssh-key.pub b/configs/nixos/ni/files/ssh-key.pub similarity index 100% rename from hosts/ni/files/ssh-key.pub rename to configs/nixos/ni/files/ssh-key.pub diff --git a/hosts/ni/files/wireguard/wireguard-public-key-ni b/configs/nixos/ni/files/wireguard/wireguard-public-key-ni similarity index 100% rename from hosts/ni/files/wireguard/wireguard-public-key-ni rename to configs/nixos/ni/files/wireguard/wireguard-public-key-ni diff --git a/hosts/ni/hardware-configuration.nix b/configs/nixos/ni/hardware-configuration.nix similarity index 100% rename from hosts/ni/hardware-configuration.nix rename to configs/nixos/ni/hardware-configuration.nix diff --git a/hosts/ni/modules/default.nix b/configs/nixos/ni/modules/default.nix similarity index 100% rename from hosts/ni/modules/default.nix rename to configs/nixos/ni/modules/default.nix diff --git a/hosts/ni/modules/hardware/qol.nix b/configs/nixos/ni/modules/hardware/qol.nix similarity index 100% rename from hosts/ni/modules/hardware/qol.nix rename to configs/nixos/ni/modules/hardware/qol.nix diff --git a/hosts/ni/modules/networking/setup.nix b/configs/nixos/ni/modules/networking/setup.nix similarity index 100% rename from hosts/ni/modules/networking/setup.nix rename to configs/nixos/ni/modules/networking/setup.nix diff --git a/hosts/ni/modules/networking/wireguard.nix b/configs/nixos/ni/modules/networking/wireguard.nix similarity index 100% rename from hosts/ni/modules/networking/wireguard.nix rename to configs/nixos/ni/modules/networking/wireguard.nix diff --git a/hosts/ni/modules/services/backup/default.nix b/configs/nixos/ni/modules/services/backup/default.nix similarity index 100% rename from hosts/ni/modules/services/backup/default.nix rename to configs/nixos/ni/modules/services/backup/default.nix diff --git a/hosts/ni/modules/services/backup/desktop-backup.pub b/configs/nixos/ni/modules/services/backup/desktop-backup.pub similarity index 100% rename from hosts/ni/modules/services/backup/desktop-backup.pub rename to configs/nixos/ni/modules/services/backup/desktop-backup.pub diff --git a/hosts/ni/modules/services/backup/secrets.yaml b/configs/nixos/ni/modules/services/backup/secrets.yaml similarity index 100% rename from hosts/ni/modules/services/backup/secrets.yaml rename to configs/nixos/ni/modules/services/backup/secrets.yaml diff --git a/hosts/ni/modules/services/download-media/README.adoc b/configs/nixos/ni/modules/services/download-media/README.adoc similarity index 100% rename from hosts/ni/modules/services/download-media/README.adoc rename to configs/nixos/ni/modules/services/download-media/README.adoc diff --git a/hosts/ni/modules/services/download-media/data/jobs.archivebox.json b/configs/nixos/ni/modules/services/download-media/data/jobs.archivebox.json similarity index 100% rename from hosts/ni/modules/services/download-media/data/jobs.archivebox.json rename to configs/nixos/ni/modules/services/download-media/data/jobs.archivebox.json diff --git a/hosts/ni/modules/services/download-media/data/jobs.schema.json b/configs/nixos/ni/modules/services/download-media/data/jobs.schema.json similarity index 100% rename from hosts/ni/modules/services/download-media/data/jobs.schema.json rename to configs/nixos/ni/modules/services/download-media/data/jobs.schema.json diff --git a/hosts/ni/modules/services/download-media/data/jobs.yt-dlp.json b/configs/nixos/ni/modules/services/download-media/data/jobs.yt-dlp.json similarity index 100% rename from hosts/ni/modules/services/download-media/data/jobs.yt-dlp.json rename to configs/nixos/ni/modules/services/download-media/data/jobs.yt-dlp.json diff --git a/hosts/ni/modules/services/download-media/default.nix b/configs/nixos/ni/modules/services/download-media/default.nix similarity index 100% rename from hosts/ni/modules/services/download-media/default.nix rename to configs/nixos/ni/modules/services/download-media/default.nix diff --git a/hosts/ni/modules/services/download-media/scripts/create-jobs-from-newpipe-db.py b/configs/nixos/ni/modules/services/download-media/scripts/create-jobs-from-newpipe-db.py similarity index 100% rename from hosts/ni/modules/services/download-media/scripts/create-jobs-from-newpipe-db.py rename to configs/nixos/ni/modules/services/download-media/scripts/create-jobs-from-newpipe-db.py diff --git a/hosts/ni/modules/services/download-media/scripts/create-jobs-from-rss-opml.py b/configs/nixos/ni/modules/services/download-media/scripts/create-jobs-from-rss-opml.py similarity index 100% rename from hosts/ni/modules/services/download-media/scripts/create-jobs-from-rss-opml.py rename to configs/nixos/ni/modules/services/download-media/scripts/create-jobs-from-rss-opml.py diff --git a/hosts/ni/modules/services/download-media/secrets.yaml b/configs/nixos/ni/modules/services/download-media/secrets.yaml similarity index 100% rename from hosts/ni/modules/services/download-media/secrets.yaml rename to configs/nixos/ni/modules/services/download-media/secrets.yaml diff --git a/hosts/ni/modules/setups/desktop.nix b/configs/nixos/ni/modules/setups/desktop.nix similarity index 100% rename from hosts/ni/modules/setups/desktop.nix rename to configs/nixos/ni/modules/setups/desktop.nix diff --git a/hosts/ni/modules/setups/development.nix b/configs/nixos/ni/modules/setups/development.nix similarity index 100% rename from hosts/ni/modules/setups/development.nix rename to configs/nixos/ni/modules/setups/development.nix diff --git a/hosts/ni/modules/setups/gaming.nix b/configs/nixos/ni/modules/setups/gaming.nix similarity index 100% rename from hosts/ni/modules/setups/gaming.nix rename to configs/nixos/ni/modules/setups/gaming.nix diff --git a/hosts/ni/modules/setups/music.nix b/configs/nixos/ni/modules/setups/music.nix similarity index 100% rename from hosts/ni/modules/setups/music.nix rename to configs/nixos/ni/modules/setups/music.nix diff --git a/hosts/ni/secrets/secrets.yaml b/configs/nixos/ni/secrets/secrets.yaml similarity index 100% rename from hosts/ni/secrets/secrets.yaml rename to configs/nixos/ni/secrets/secrets.yaml diff --git a/hosts/plover/.terraform.lock.hcl b/configs/nixos/plover/.terraform.lock.hcl similarity index 100% rename from hosts/plover/.terraform.lock.hcl rename to configs/nixos/plover/.terraform.lock.hcl diff --git a/hosts/plover/README.adoc b/configs/nixos/plover/README.adoc similarity index 100% rename from hosts/plover/README.adoc rename to configs/nixos/plover/README.adoc diff --git a/hosts/plover/config/dns/foodogsquared.one.zone b/configs/nixos/plover/config/dns/foodogsquared.one.zone similarity index 100% rename from hosts/plover/config/dns/foodogsquared.one.zone rename to configs/nixos/plover/config/dns/foodogsquared.one.zone diff --git a/hosts/plover/config/dns/plover.foodogsquared.one.zone b/configs/nixos/plover/config/dns/plover.foodogsquared.one.zone similarity index 100% rename from hosts/plover/config/dns/plover.foodogsquared.one.zone rename to configs/nixos/plover/config/dns/plover.foodogsquared.one.zone diff --git a/hosts/plover/config/wezterm/config.lua b/configs/nixos/plover/config/wezterm/config.lua similarity index 100% rename from hosts/plover/config/wezterm/config.lua rename to configs/nixos/plover/config/wezterm/config.lua diff --git a/hosts/plover/default.nix b/configs/nixos/plover/default.nix similarity index 100% rename from hosts/plover/default.nix rename to configs/nixos/plover/default.nix diff --git a/hosts/plover/disko.nix b/configs/nixos/plover/disko.nix similarity index 100% rename from hosts/plover/disko.nix rename to configs/nixos/plover/disko.nix diff --git a/hosts/plover/files/age-key.pub b/configs/nixos/plover/files/age-key.pub similarity index 100% rename from hosts/plover/files/age-key.pub rename to configs/nixos/plover/files/age-key.pub diff --git a/hosts/plover/files/gitea/home.tmpl b/configs/nixos/plover/files/gitea/home.tmpl similarity index 100% rename from hosts/plover/files/gitea/home.tmpl rename to configs/nixos/plover/files/gitea/home.tmpl diff --git a/hosts/plover/files/gitea/logo.png b/configs/nixos/plover/files/gitea/logo.png similarity index 100% rename from hosts/plover/files/gitea/logo.png rename to configs/nixos/plover/files/gitea/logo.png diff --git a/hosts/plover/files/gitea/logo.svg b/configs/nixos/plover/files/gitea/logo.svg similarity index 100% rename from hosts/plover/files/gitea/logo.svg rename to configs/nixos/plover/files/gitea/logo.svg diff --git a/hosts/plover/files/hcloud/hcloud-user-data.yml b/configs/nixos/plover/files/hcloud/hcloud-user-data.yml similarity index 100% rename from hosts/plover/files/hcloud/hcloud-user-data.yml rename to configs/nixos/plover/files/hcloud/hcloud-user-data.yml diff --git a/hosts/plover/files/hetzner-boxes-online-backup.pub b/configs/nixos/plover/files/hetzner-boxes-online-backup.pub similarity index 100% rename from hosts/plover/files/hetzner-boxes-online-backup.pub rename to configs/nixos/plover/files/hetzner-boxes-online-backup.pub diff --git a/hosts/plover/files/ssh-key.pub b/configs/nixos/plover/files/ssh-key.pub similarity index 100% rename from hosts/plover/files/ssh-key.pub rename to configs/nixos/plover/files/ssh-key.pub diff --git a/hosts/plover/files/wireguard/wireguard-public-key-phone b/configs/nixos/plover/files/wireguard/wireguard-public-key-phone similarity index 100% rename from hosts/plover/files/wireguard/wireguard-public-key-phone rename to configs/nixos/plover/files/wireguard/wireguard-public-key-phone diff --git a/hosts/plover/files/wireguard/wireguard-public-key-plover b/configs/nixos/plover/files/wireguard/wireguard-public-key-plover similarity index 100% rename from hosts/plover/files/wireguard/wireguard-public-key-plover rename to configs/nixos/plover/files/wireguard/wireguard-public-key-plover diff --git a/hosts/plover/main.tf b/configs/nixos/plover/main.tf similarity index 100% rename from hosts/plover/main.tf rename to configs/nixos/plover/main.tf diff --git a/hosts/plover/modules/default.nix b/configs/nixos/plover/modules/default.nix similarity index 100% rename from hosts/plover/modules/default.nix rename to configs/nixos/plover/modules/default.nix diff --git a/hosts/plover/modules/hardware/networks.nix b/configs/nixos/plover/modules/hardware/networks.nix similarity index 100% rename from hosts/plover/modules/hardware/networks.nix rename to configs/nixos/plover/modules/hardware/networks.nix diff --git a/hosts/plover/modules/profiles/hetzner-cloud-cx21.nix b/configs/nixos/plover/modules/profiles/hetzner-cloud-cx21.nix similarity index 100% rename from hosts/plover/modules/profiles/hetzner-cloud-cx21.nix rename to configs/nixos/plover/modules/profiles/hetzner-cloud-cx21.nix diff --git a/hosts/plover/modules/services/atuin.nix b/configs/nixos/plover/modules/services/atuin.nix similarity index 100% rename from hosts/plover/modules/services/atuin.nix rename to configs/nixos/plover/modules/services/atuin.nix diff --git a/hosts/plover/modules/services/backup.nix b/configs/nixos/plover/modules/services/backup.nix similarity index 100% rename from hosts/plover/modules/services/backup.nix rename to configs/nixos/plover/modules/services/backup.nix diff --git a/hosts/plover/modules/services/database.nix b/configs/nixos/plover/modules/services/database.nix similarity index 100% rename from hosts/plover/modules/services/database.nix rename to configs/nixos/plover/modules/services/database.nix diff --git a/hosts/plover/modules/services/dns-server.nix b/configs/nixos/plover/modules/services/dns-server.nix similarity index 100% rename from hosts/plover/modules/services/dns-server.nix rename to configs/nixos/plover/modules/services/dns-server.nix diff --git a/hosts/plover/modules/services/fail2ban.nix b/configs/nixos/plover/modules/services/fail2ban.nix similarity index 100% rename from hosts/plover/modules/services/fail2ban.nix rename to configs/nixos/plover/modules/services/fail2ban.nix diff --git a/hosts/plover/modules/services/firewall.nix b/configs/nixos/plover/modules/services/firewall.nix similarity index 100% rename from hosts/plover/modules/services/firewall.nix rename to configs/nixos/plover/modules/services/firewall.nix diff --git a/hosts/plover/modules/services/gitea.nix b/configs/nixos/plover/modules/services/gitea.nix similarity index 100% rename from hosts/plover/modules/services/gitea.nix rename to configs/nixos/plover/modules/services/gitea.nix diff --git a/hosts/plover/modules/services/grafana.nix b/configs/nixos/plover/modules/services/grafana.nix similarity index 100% rename from hosts/plover/modules/services/grafana.nix rename to configs/nixos/plover/modules/services/grafana.nix diff --git a/hosts/plover/modules/services/idm.nix b/configs/nixos/plover/modules/services/idm.nix similarity index 100% rename from hosts/plover/modules/services/idm.nix rename to configs/nixos/plover/modules/services/idm.nix diff --git a/hosts/plover/modules/services/monitoring.nix b/configs/nixos/plover/modules/services/monitoring.nix similarity index 100% rename from hosts/plover/modules/services/monitoring.nix rename to configs/nixos/plover/modules/services/monitoring.nix diff --git a/hosts/plover/modules/services/reverse-proxy.nix b/configs/nixos/plover/modules/services/reverse-proxy.nix similarity index 100% rename from hosts/plover/modules/services/reverse-proxy.nix rename to configs/nixos/plover/modules/services/reverse-proxy.nix diff --git a/hosts/plover/modules/services/vaultwarden.nix b/configs/nixos/plover/modules/services/vaultwarden.nix similarity index 100% rename from hosts/plover/modules/services/vaultwarden.nix rename to configs/nixos/plover/modules/services/vaultwarden.nix diff --git a/hosts/plover/modules/services/vouch-proxy.nix b/configs/nixos/plover/modules/services/vouch-proxy.nix similarity index 100% rename from hosts/plover/modules/services/vouch-proxy.nix rename to configs/nixos/plover/modules/services/vouch-proxy.nix diff --git a/hosts/plover/modules/services/wezterm-mux-server.nix b/configs/nixos/plover/modules/services/wezterm-mux-server.nix similarity index 100% rename from hosts/plover/modules/services/wezterm-mux-server.nix rename to configs/nixos/plover/modules/services/wezterm-mux-server.nix diff --git a/hosts/plover/modules/services/wireguard.nix b/configs/nixos/plover/modules/services/wireguard.nix similarity index 100% rename from hosts/plover/modules/services/wireguard.nix rename to configs/nixos/plover/modules/services/wireguard.nix diff --git a/hosts/plover/secrets/secrets.yaml b/configs/nixos/plover/secrets/secrets.yaml similarity index 100% rename from hosts/plover/secrets/secrets.yaml rename to configs/nixos/plover/secrets/secrets.yaml diff --git a/hosts/plover/versions.tf b/configs/nixos/plover/versions.tf similarity index 100% rename from hosts/plover/versions.tf rename to configs/nixos/plover/versions.tf diff --git a/hosts/void/README.adoc b/configs/nixos/void/README.adoc similarity index 100% rename from hosts/void/README.adoc rename to configs/nixos/void/README.adoc diff --git a/hosts/void/default.nix b/configs/nixos/void/default.nix similarity index 100% rename from hosts/void/default.nix rename to configs/nixos/void/default.nix diff --git a/hosts/winnowing/README.adoc b/configs/nixos/winnowing/README.adoc similarity index 100% rename from hosts/winnowing/README.adoc rename to configs/nixos/winnowing/README.adoc diff --git a/hosts/winnowing/default.nix b/configs/nixos/winnowing/default.nix similarity index 100% rename from hosts/winnowing/default.nix rename to configs/nixos/winnowing/default.nix diff --git a/flake.nix b/flake.nix index 8c682b4f..52a94d67 100644 --- a/flake.nix +++ b/flake.nix @@ -320,7 +320,7 @@ hostSharedConfig nixSettingsSharedConfig - ./hosts/${host} + ./configs/nixos/${host} ]; config = lib.mkMerge [ @@ -350,7 +350,7 @@ imports = modules ++ [ userSharedConfig nixSettingsSharedConfig - ./users/home-manager/${name} + ./configs/home-manager/${name} ]; # Don't create the user directories since they are assumed to @@ -395,8 +395,8 @@ # include in other flakes for whatever reason may be. lib = import ./lib { lib = nixpkgs.lib; }; - # A list of NixOS configurations from the `./hosts` folder. It also has - # some sensible default configurations. + # A list of NixOS configurations from the `./configs/nixos` folder. It + # also has some sensible default configurations. nixosConfigurations = let validImages = lib.filterAttrs diff --git a/lib/private.nix b/lib/private.nix index abc394f6..da89b10a 100644 --- a/lib/private.nix +++ b/lib/private.nix @@ -22,7 +22,7 @@ rec { home.homeDirectory = homeDirectory; } - (getUser "home-manager" user) + (getConfig "home-manager" user) ]; }; @@ -32,5 +32,7 @@ rec { ]; }); - getUser = type: user: ../users/${type}/${user}; + getConfig = type: config: ../configs/${type}/${config}; + + getUser = type: user: ../configs/${type}/_users/${user}; } diff --git a/setups/home-manager.nix b/setups/home-manager.nix index dd55d319..1c9adad4 100644 --- a/setups/home-manager.nix +++ b/setups/home-manager.nix @@ -1,7 +1,7 @@ /* This is project data for deploying home-manager users with this flake. Each of the users defined here should correspond to one of the home-manager users - at `./users/home-manager/`. + at `./configs/home-manager/`. Schema: diff --git a/setups/nixos.nix b/setups/nixos.nix index b7f03a88..2d429e41 100644 --- a/setups/nixos.nix +++ b/setups/nixos.nix @@ -4,7 +4,7 @@ for servers and desktops to installers. The data is then used for the image creation functions found in `flake.nix`. - Each of the entry should correspond to one of the hosts in `./hosts/` + Each of the entry should correspond to one of the hosts in `./configs/nixos/` directory. Schema: