From 6ca0d7248bb14d786b8e38f27f54f34345b247ff Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 16 Dec 2024 15:51:41 -0500 Subject: [PATCH] refactor: rename some flake attr directories --- README.md | 4 +- apps/update-sources/default.nix | 2 +- checks/default.nix | 20 --- {devices => configurations}/README.md | 0 .../android/default.nix | 0 .../android/nix-on-droid.nix | 0 .../bbsteamie/default.nix | 0 .../bbsteamie/hardware-configuration.nix | 0 .../bbsteamie/modules/default.nix | 0 .../bbsteamie/modules/desktop/default.nix | 0 .../modules/desktop/install_palia_map.md | 0 .../modules/desktop/session-switching.nix | 0 .../bbsteamie/modules/desktop/steam.nix | 0 {devices => configurations}/binto/default.nix | 0 .../binto/hardware-configuration.nix | 0 .../binto/modules/default.nix | 0 .../binto/modules/gpu-replay.nix | 0 .../binto/modules/nix-gaming.nix | 0 .../cluster/default.nix | 0 .../cluster/hardware-configuration.nix | 0 .../cluster/modules/blocky.nix | 0 .../cluster/modules/caddy.nix | 0 .../cluster/modules/default.nix | 0 .../cluster/modules/headscale/completion.bash | 0 .../cluster/modules/headscale/default.nix | 0 .../cluster/modules/nfs-client.nix | 0 .../cluster/modules/pcsd.nix | 0 .../cluster/modules/unbound.nix | 0 {devices => configurations}/homie/default.nix | 0 .../homie/hardware-configuration.nix | 0 .../homie/modules/androidtv/default.nix | 0 .../homie/modules/binary-cache.nix | 2 +- .../homie/modules/default.nix | 0 .../homie/modules/home-assistant/assist.nix | 0 .../modules/home-assistant/bluetooth.nix | 0 .../homie/modules/home-assistant/default.nix | 0 .../modules/home-assistant/docs/functions.nix | 0 .../homie/modules/home-assistant/docs/prompt | 0 .../homie/modules/home-assistant/firmware.nix | 0 .../homie/modules/home-assistant/frontend.nix | 0 .../home-assistant/netdaemon/.editorconfig | 0 .../modules/home-assistant/netdaemon/.envrc | 0 .../home-assistant/netdaemon/.gitignore | 0 .../modules/home-assistant/netdaemon/.version | 0 .../netdaemon/HomeAssistantGenerated | Bin .../apps/Spotify/PauseUnpause/PauseUnpause.cs | 0 .../apps/Spotify/PlayAlbum/PlayAlbum.cs | 0 .../SpotifyplusSearchAlbumsResponse.cs | 0 .../apps/Spotify/PlayArtist/PlayArtist.cs | 0 .../SpotifyplusSearchArtistsResponse.cs | 0 .../apps/Spotify/PlayPlaylist/PlayPlaylist.cs | 0 .../SpotifyplusPlaylistResponse.cs | 0 .../apps/Spotify/PlaySong/PlaySong.cs | 0 .../SpotifyplusSearchTracksResponse.cs | 0 .../netdaemon/apps/Spotify/Types.cs | 0 .../home-assistant/netdaemon/appsettings.json | 0 .../home-assistant/netdaemon/default.nix | 0 .../modules/home-assistant/netdaemon/deps.nix | 0 .../netdaemon/images/netdaemon.nix | 0 .../home-assistant/netdaemon/netdaemon.csproj | 0 .../home-assistant/netdaemon/package.nix | 0 .../home-assistant/netdaemon/program.cs | 0 .../home-assistant/spotify/default.nix | 0 .../home-assistant/spotify/sentences.nix | 0 .../modules/home-assistant/timer/default.nix | 0 .../home-assistant/timer/sentences.nix | 0 .../homie/modules/music/default.nix | 0 .../live-image/default.nix | 0 {devices => configurations}/nos/default.nix | 0 .../nos/hardware-configuration.nix | 0 .../nos/modules/default.nix | 0 .../nos/modules/docker/default.nix | 0 .../nos/modules/docker/forgejo/compose.nix | 0 .../docker/forgejo/images/act_runner.nix | 0 .../modules/docker/forgejo/images/forgejo.nix | 0 .../docker/forgejo/images/postgres.nix | 0 .../nos/modules/docker/freshrss/compose.nix | 0 .../docker/freshrss/images/freshrss.nix | 0 .../docker/freshrss/images/postgres.nix | 0 .../docker/freshrss/images/rss-bridge.nix | 0 .../nos/modules/docker/gameyfin/compose.nix | 0 .../docker/gameyfin/images/gameyfin.nix | 0 .../nos/modules/docker/hauk/compose.nix | 0 .../nos/modules/docker/hauk/config.php | 0 .../nos/modules/docker/hauk/images/hauk.nix | 0 .../nos/modules/docker/immich/compose.nix | 0 .../nos/modules/docker/immich/env | 0 .../docker/immich/images/machine-learning.nix | 0 .../modules/docker/immich/images/postgres.nix | 0 .../modules/docker/immich/images/redis.nix | 0 .../modules/docker/immich/images/server.nix | 0 .../modules/docker/media/bazarr/compose.nix | 0 .../docker/media/bazarr/images/bazarr.nix | 0 .../nos/modules/docker/media/joal/compose.nix | 0 .../modules/docker/media/joal/images/joal.nix | 0 .../modules/docker/media/prowlarr/compose.nix | 0 .../media/prowlarr/images/flaresolverr.nix | 0 .../docker/media/prowlarr/images/prowlarr.nix | 0 .../modules/docker/media/radarr/compose.nix | 0 .../docker/media/radarr/images/radarr.nix | 0 .../modules/docker/media/sabnzbd/compose.nix | 0 .../docker/media/sabnzbd/images/sabnzbd.nix | 0 .../modules/docker/media/seerr/compose.nix | 0 .../docker/media/seerr/images/jellyseerr.nix | 0 .../modules/docker/media/sonarr/compose.nix | 0 .../docker/media/sonarr/images/sonarr.nix | 0 .../modules/docker/music/jbots/compose.nix | 0 .../docker/music/jbots/images/jmusicbot.nix | 0 .../nos/modules/docker/nextcloud/compose.nix | 0 .../docker/nextcloud/images/nextcloud.nix | 0 .../modules/docker/nextcloud/images/nginx.nix | 0 .../docker/nextcloud/images/onlyoffice.nix | 0 .../docker/nextcloud/images/postgres.nix | 0 .../modules/docker/nextcloud/images/redis.nix | 0 .../nos/modules/docker/nextcloud/nginx.conf | 0 .../nos/modules/docker/resume/compose.nix | 0 .../modules/docker/resume/images/postgres.nix | 0 .../docker/resume/images/resume-client.nix | 0 .../docker/resume/images/resume-server.nix | 0 .../modules/docker/vaultwarden/compose.nix | 0 .../docker/vaultwarden/images/vaultwarden.nix | 0 .../nos/modules/docker/wg-easy/compose.nix | 0 .../modules/docker/wg-easy/images/wg-easy.nix | 0 .../nos/modules/homepage.nix | 0 .../nos/modules/jellyfin/default.nix | 0 .../nos/modules/jellyfin/images/jfa-go.nix | 0 .../nos/modules/jellyfin/jfa-go.nix | 0 .../nos/modules/jellyfin/packages.nix | 0 .../nos/modules/llm.nix | 0 .../nos/modules/mergerfs.nix | 0 .../nos/modules/qbittorrent/default.nix | 0 .../nos/modules/qbittorrent/qbittorrent.nix | 0 .../nos/modules/qbittorrent/vuetorrent.nix | 0 .../nos/modules/qbittorrent/wireguard.nix | 0 .../nos/modules/snapraid.nix | 0 .../nos/modules/subtitles/cleanup.nix | 0 .../nos/modules/subtitles/convert.nix | 0 .../nos/modules/subtitles/default.nix | 0 .../nos/modules/subtitles/syncing.nix | 0 .../servivi/default.nix | 0 .../servivi/hardware-configuration.nix | 0 .../servivi/modules/7-days-to-die.nix | 0 .../servivi/modules/binary-cache.nix | 4 +- .../servivi/modules/default.nix | 0 .../servivi/modules/minecraft.nix | 0 .../servivi/modules/nfs.nix | 0 .../servivi/modules/pr-tracker.nix | 0 {devices => configurations}/wim/default.nix | 0 .../wim/hardware-configuration.nix | 0 .../wim/modules/default.nix | 0 .../wim/modules/security.nix | 0 devShells/default.nix | 104 ++++++++++++++ inputs/lib.nix | 4 +- lib/attrs/default.nix | 5 + lib/default.nix | 5 +- {nixosModules => modules}/ags/config/.envrc | 0 .../ags/config/.gitignore | 0 {nixosModules => modules}/ags/config/app.ts | 0 .../ags/config/configurations/binto.ts | 0 .../ags/config/configurations/greeter.ts | 0 .../ags/config/configurations/lock.ts | 0 .../ags/config/configurations/wim.ts | 0 .../ags/config/default.nix | 0 {nixosModules => modules}/ags/config/env.d.ts | 0 .../ags/config/eslint.config.ts | 0 {nixosModules => modules}/ags/config/lib.ts | 0 .../ags/config/package-lock.json | Bin .../ags/config/package.json | 0 .../ags/config/services/brightness.ts | 0 .../config/services/gpu-screen-recorder.ts | 0 .../ags/config/services/monitor-clicks.ts | 0 .../ags/config/services/tablet.ts | 0 .../ags/config/style/colors.scss | 0 .../ags/config/style/common.scss | 0 .../ags/config/style/greeter.scss | 0 .../ags/config/style/lock.scss | 0 .../ags/config/style/main.scss | 0 .../config/widgets/applauncher/_index.scss | 0 .../config/widgets/applauncher/app-item.tsx | 0 .../ags/config/widgets/applauncher/launch.ts | 0 .../ags/config/widgets/applauncher/main.tsx | 0 .../ags/config/widgets/audio/_index.scss | 0 .../ags/config/widgets/audio/binto.tsx | 0 .../ags/config/widgets/audio/main.tsx | 0 .../ags/config/widgets/audio/profiles.tsx | 0 .../ags/config/widgets/audio/streams.tsx | 0 .../ags/config/widgets/audio/wim.tsx | 0 .../ags/config/widgets/bar/_index.scss | 0 .../ags/config/widgets/bar/binto.tsx | 0 .../ags/config/widgets/bar/fullscreen.tsx | 0 .../ags/config/widgets/bar/items/audio.tsx | 0 .../ags/config/widgets/bar/items/battery.tsx | 0 .../config/widgets/bar/items/bluetooth.tsx | 0 .../config/widgets/bar/items/brightness.tsx | 0 .../ags/config/widgets/bar/items/clock.tsx | 0 .../widgets/bar/items/current-client.tsx | 0 .../config/widgets/bar/items/current-icon.tsx | 0 .../ags/config/widgets/bar/items/network.tsx | 0 .../config/widgets/bar/items/notif-button.tsx | 0 .../ags/config/widgets/bar/items/tray.tsx | 0 .../config/widgets/bar/items/workspaces.tsx | 0 .../ags/config/widgets/bar/wim.tsx | 0 .../ags/config/widgets/bg-layer/main.tsx | 0 .../ags/config/widgets/bluetooth/_index.scss | 0 .../ags/config/widgets/bluetooth/device.tsx | 0 .../ags/config/widgets/bluetooth/main.tsx | 0 .../ags/config/widgets/bluetooth/wim.tsx | 0 .../ags/config/widgets/clipboard/_index.scss | 0 .../config/widgets/clipboard/clip-item.tsx | 0 .../ags/config/widgets/clipboard/cliphist.sh | 0 .../ags/config/widgets/clipboard/main.tsx | 0 .../ags/config/widgets/corners/main.tsx | 0 .../config/widgets/corners/screen-corners.tsx | 0 .../ags/config/widgets/date/_index.scss | 0 .../ags/config/widgets/date/binto.tsx | 0 .../ags/config/widgets/date/main.tsx | 0 .../ags/config/widgets/date/wim.tsx | 0 .../ags/config/widgets/greeter/main.tsx | 0 .../config/widgets/icon-browser/_index.scss | 0 .../ags/config/widgets/icon-browser/main.tsx | 0 .../ags/config/widgets/lockscreen/_index.scss | 0 .../ags/config/widgets/lockscreen/main.tsx | 0 .../ags/config/widgets/misc/_index.scss | 0 .../ags/config/widgets/misc/popup-window.tsx | 0 .../ags/config/widgets/misc/separator.tsx | 0 .../config/widgets/misc/smooth-progress.tsx | 0 .../ags/config/widgets/misc/sorted-list.tsx | 0 .../ags/config/widgets/misc/subclasses.tsx | 0 .../ags/config/widgets/notifs/_index.scss | 0 .../ags/config/widgets/notifs/binto.tsx | 0 .../ags/config/widgets/notifs/center.tsx | 0 .../ags/config/widgets/notifs/gesture.tsx | 0 .../config/widgets/notifs/notification.tsx | 0 .../ags/config/widgets/notifs/popups.tsx | 0 .../ags/config/widgets/notifs/wim.tsx | 0 .../widgets/on-screen-display/_index.scss | 0 .../config/widgets/on-screen-display/main.tsx | 0 .../widgets/on-screen-keyboard/_index.scss | 0 .../widgets/on-screen-keyboard/arcs.tsx | 0 .../widgets/on-screen-keyboard/gesture.ts | 0 .../on-screen-keyboard/keyboard-layouts.ts | 0 .../widgets/on-screen-keyboard/keyboard.tsx | 0 .../widgets/on-screen-keyboard/keys.tsx | 0 .../widgets/on-screen-keyboard/main.tsx | 0 .../widgets/on-screen-keyboard/osk-window.tsx | 0 .../ags/config/widgets/powermenu/_index.scss | 0 .../ags/config/widgets/powermenu/main.tsx | 0 .../ags/config/widgets/screenshot/_index.scss | 0 .../ags/config/widgets/screenshot/capture.sh | 0 .../ags/config/widgets/screenshot/main.tsx | 0 {nixosModules => modules}/ags/default.nix | 2 +- {nixosModules => modules}/ags/hyprland.nix | 0 {nixosModules => modules}/ags/packages.nix | 0 .../ags/v1/config/global-types.d.ts | 0 .../ags/v1/config/scss/player.scss | 0 .../ags/v1/config/scss/quick-settings.scss | 0 .../ags/v1/config/ts/bar/heart.ts | 0 .../ags/v1/config/ts/bar/keyboard-layout.ts | 0 .../ags/v1/config/ts/media-player/gesture.ts | 0 .../ags/v1/config/ts/media-player/mpris.ts | 0 .../ags/v1/config/ts/media-player/player.ts | 0 {nixosModules => modules}/ags/v1/icons.nix | 0 .../base/common-nix/default.nix | 0 .../base/default-droid.nix | 0 {nixosModules => modules}/base/default.nix | 0 .../base/locale/default.nix | 0 .../base/locate/default.nix | 0 .../base/packages/default.nix | 0 .../base/substituters/default.nix | 0 .../borgbackup/default.nix | 0 .../borgbackup/module.nix | 0 {nixosModules => modules}/default.nix | 0 {nixosModules => modules}/desktop/default.nix | 0 .../desktop/environment/config/dolphinrc | 0 .../desktop/environment/config/kdeglobals | 0 .../desktop/environment/config/kiorc | 0 .../desktop/environment/config/mimeapps.list | 0 .../desktop/environment/default.nix | 0 .../desktop/environment/home/dev.nix | 0 .../desktop/environment/home/foot.nix | 0 .../desktop/environment/home/hyprexpo.nix | 0 .../desktop/environment/home/hyprgrass.nix | 0 .../desktop/environment/home/inputs.nix | 0 .../desktop/environment/home/mpv.nix | 0 .../desktop/environment/home/obs.nix | 0 .../desktop/environment/modules/audio.nix | 0 .../desktop/environment/modules/dconf.nix | 0 .../desktop/environment/modules/dolphin.nix | 0 .../desktop/environment/modules/packages.nix | 2 +- .../desktop/environment/modules/printer.nix | 0 .../environment/modules/ratbag-mice.nix | 0 .../desktop/environment/modules/security.nix | 2 +- .../desktop/manager/ags.nix | 0 .../desktop/manager/default.nix | 0 .../desktop/manager/hyprland.nix | 0 .../desktop/manager/setupMonitors.nix | 0 .../desktop/theme/cursors.nix | 0 .../desktop/theme/default.nix | 0 .../desktop/theme/gtk/default.nix | 0 .../desktop/theme/gtk/gradience.nix | 0 .../desktop/theme/hyprpaper.nix | 0 .../desktop/theme/qt.nix | 0 .../desktop/theme/xresources.nix | 0 .../docker/.template/compose.nix | 0 .../docker/.template/images/image.nix | 0 {nixosModules => modules}/docker/default.nix | 0 .../docker/updateImage.nix | 0 .../esphome-plus/default.nix | 0 {nixosModules => modules}/ha-plus/default.nix | 0 {nixosModules => modules}/kmscon/default.nix | 0 {nixosModules => modules}/nvidia/default.nix | 0 .../plymouth/default.nix | 0 {nixosModules => modules}/server/default.nix | 0 {nixosModules => modules}/server/sshd.nix | 0 .../server/tailscale.nix | 0 {nixosModules => modules}/tmux/default.nix | 0 .../wyoming-plus/default.nix | 0 .../wyoming-plus/pkgs/default.nix | 0 .../wyoming-plus/pkgs/openwakeword.nix | 0 .../wyoming-plus/pkgs/speexdsp-ns.nix | 0 .../wyoming-plus/pkgs/tflite-runtime.nix | 0 .../pkgs/wyoming-openwakeword.nix | 0 {checks => nixFastChecks}/apps/default.nix | 0 nixFastChecks/default.nix | 26 ++++ .../devShells/default.nix | 0 {checks => nixFastChecks}/devices/default.nix | 1 - .../packages/default.nix | 0 outputs.nix | 132 ++++-------------- overlays/default.nix | 2 +- 329 files changed, 178 insertions(+), 139 deletions(-) delete mode 100644 checks/default.nix rename {devices => configurations}/README.md (100%) rename {devices => configurations}/android/default.nix (100%) rename {devices => configurations}/android/nix-on-droid.nix (100%) rename {devices => configurations}/bbsteamie/default.nix (100%) rename {devices => configurations}/bbsteamie/hardware-configuration.nix (100%) rename {devices => configurations}/bbsteamie/modules/default.nix (100%) rename {devices => configurations}/bbsteamie/modules/desktop/default.nix (100%) rename {devices => configurations}/bbsteamie/modules/desktop/install_palia_map.md (100%) rename {devices => configurations}/bbsteamie/modules/desktop/session-switching.nix (100%) rename {devices => configurations}/bbsteamie/modules/desktop/steam.nix (100%) rename {devices => configurations}/binto/default.nix (100%) rename {devices => configurations}/binto/hardware-configuration.nix (100%) rename {devices => configurations}/binto/modules/default.nix (100%) rename {devices => configurations}/binto/modules/gpu-replay.nix (100%) rename {devices => configurations}/binto/modules/nix-gaming.nix (100%) rename {devices => configurations}/cluster/default.nix (100%) rename {devices => configurations}/cluster/hardware-configuration.nix (100%) rename {devices => configurations}/cluster/modules/blocky.nix (100%) rename {devices => configurations}/cluster/modules/caddy.nix (100%) rename {devices => configurations}/cluster/modules/default.nix (100%) rename {devices => configurations}/cluster/modules/headscale/completion.bash (100%) rename {devices => configurations}/cluster/modules/headscale/default.nix (100%) rename {devices => configurations}/cluster/modules/nfs-client.nix (100%) rename {devices => configurations}/cluster/modules/pcsd.nix (100%) rename {devices => configurations}/cluster/modules/unbound.nix (100%) rename {devices => configurations}/homie/default.nix (100%) rename {devices => configurations}/homie/hardware-configuration.nix (100%) rename {devices => configurations}/homie/modules/androidtv/default.nix (100%) rename {devices => configurations}/homie/modules/binary-cache.nix (88%) rename {devices => configurations}/homie/modules/default.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/assist.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/bluetooth.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/default.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/docs/functions.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/docs/prompt (100%) rename {devices => configurations}/homie/modules/home-assistant/firmware.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/frontend.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/.editorconfig (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/.envrc (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/.gitignore (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/.version (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PauseUnpause/PauseUnpause.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/PlayPlaylist.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/SpotifyplusPlaylistResponse.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/PlaySong.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/SpotifyplusSearchTracksResponse.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/appsettings.json (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/default.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/deps.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/images/netdaemon.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/netdaemon.csproj (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/package.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/netdaemon/program.cs (100%) rename {devices => configurations}/homie/modules/home-assistant/spotify/default.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/spotify/sentences.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/timer/default.nix (100%) rename {devices => configurations}/homie/modules/home-assistant/timer/sentences.nix (100%) rename {devices => configurations}/homie/modules/music/default.nix (100%) rename {devices => configurations}/live-image/default.nix (100%) rename {devices => configurations}/nos/default.nix (100%) rename {devices => configurations}/nos/hardware-configuration.nix (100%) rename {devices => configurations}/nos/modules/default.nix (100%) rename {devices => configurations}/nos/modules/docker/default.nix (100%) rename {devices => configurations}/nos/modules/docker/forgejo/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/forgejo/images/act_runner.nix (100%) rename {devices => configurations}/nos/modules/docker/forgejo/images/forgejo.nix (100%) rename {devices => configurations}/nos/modules/docker/forgejo/images/postgres.nix (100%) rename {devices => configurations}/nos/modules/docker/freshrss/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/freshrss/images/freshrss.nix (100%) rename {devices => configurations}/nos/modules/docker/freshrss/images/postgres.nix (100%) rename {devices => configurations}/nos/modules/docker/freshrss/images/rss-bridge.nix (100%) rename {devices => configurations}/nos/modules/docker/gameyfin/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/gameyfin/images/gameyfin.nix (100%) rename {devices => configurations}/nos/modules/docker/hauk/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/hauk/config.php (100%) rename {devices => configurations}/nos/modules/docker/hauk/images/hauk.nix (100%) rename {devices => configurations}/nos/modules/docker/immich/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/immich/env (100%) rename {devices => configurations}/nos/modules/docker/immich/images/machine-learning.nix (100%) rename {devices => configurations}/nos/modules/docker/immich/images/postgres.nix (100%) rename {devices => configurations}/nos/modules/docker/immich/images/redis.nix (100%) rename {devices => configurations}/nos/modules/docker/immich/images/server.nix (100%) rename {devices => configurations}/nos/modules/docker/media/bazarr/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/bazarr/images/bazarr.nix (100%) rename {devices => configurations}/nos/modules/docker/media/joal/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/joal/images/joal.nix (100%) rename {devices => configurations}/nos/modules/docker/media/prowlarr/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/prowlarr/images/flaresolverr.nix (100%) rename {devices => configurations}/nos/modules/docker/media/prowlarr/images/prowlarr.nix (100%) rename {devices => configurations}/nos/modules/docker/media/radarr/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/radarr/images/radarr.nix (100%) rename {devices => configurations}/nos/modules/docker/media/sabnzbd/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix (100%) rename {devices => configurations}/nos/modules/docker/media/seerr/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/seerr/images/jellyseerr.nix (100%) rename {devices => configurations}/nos/modules/docker/media/sonarr/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/media/sonarr/images/sonarr.nix (100%) rename {devices => configurations}/nos/modules/docker/music/jbots/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/music/jbots/images/jmusicbot.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/images/nextcloud.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/images/nginx.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/images/onlyoffice.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/images/postgres.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/images/redis.nix (100%) rename {devices => configurations}/nos/modules/docker/nextcloud/nginx.conf (100%) rename {devices => configurations}/nos/modules/docker/resume/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/resume/images/postgres.nix (100%) rename {devices => configurations}/nos/modules/docker/resume/images/resume-client.nix (100%) rename {devices => configurations}/nos/modules/docker/resume/images/resume-server.nix (100%) rename {devices => configurations}/nos/modules/docker/vaultwarden/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/vaultwarden/images/vaultwarden.nix (100%) rename {devices => configurations}/nos/modules/docker/wg-easy/compose.nix (100%) rename {devices => configurations}/nos/modules/docker/wg-easy/images/wg-easy.nix (100%) rename {devices => configurations}/nos/modules/homepage.nix (100%) rename {devices => configurations}/nos/modules/jellyfin/default.nix (100%) rename {devices => configurations}/nos/modules/jellyfin/images/jfa-go.nix (100%) rename {devices => configurations}/nos/modules/jellyfin/jfa-go.nix (100%) rename {devices => configurations}/nos/modules/jellyfin/packages.nix (100%) rename {devices => configurations}/nos/modules/llm.nix (100%) rename {devices => configurations}/nos/modules/mergerfs.nix (100%) rename {devices => configurations}/nos/modules/qbittorrent/default.nix (100%) rename {devices => configurations}/nos/modules/qbittorrent/qbittorrent.nix (100%) rename {devices => configurations}/nos/modules/qbittorrent/vuetorrent.nix (100%) rename {devices => configurations}/nos/modules/qbittorrent/wireguard.nix (100%) rename {devices => configurations}/nos/modules/snapraid.nix (100%) rename {devices => configurations}/nos/modules/subtitles/cleanup.nix (100%) rename {devices => configurations}/nos/modules/subtitles/convert.nix (100%) rename {devices => configurations}/nos/modules/subtitles/default.nix (100%) rename {devices => configurations}/nos/modules/subtitles/syncing.nix (100%) rename {devices => configurations}/servivi/default.nix (100%) rename {devices => configurations}/servivi/hardware-configuration.nix (100%) rename {devices => configurations}/servivi/modules/7-days-to-die.nix (100%) rename {devices => configurations}/servivi/modules/binary-cache.nix (93%) rename {devices => configurations}/servivi/modules/default.nix (100%) rename {devices => configurations}/servivi/modules/minecraft.nix (100%) rename {devices => configurations}/servivi/modules/nfs.nix (100%) rename {devices => configurations}/servivi/modules/pr-tracker.nix (100%) rename {devices => configurations}/wim/default.nix (100%) rename {devices => configurations}/wim/hardware-configuration.nix (100%) rename {devices => configurations}/wim/modules/default.nix (100%) rename {devices => configurations}/wim/modules/security.nix (100%) create mode 100644 devShells/default.nix create mode 100644 lib/attrs/default.nix rename {nixosModules => modules}/ags/config/.envrc (100%) rename {nixosModules => modules}/ags/config/.gitignore (100%) rename {nixosModules => modules}/ags/config/app.ts (100%) rename {nixosModules => modules}/ags/config/configurations/binto.ts (100%) rename {nixosModules => modules}/ags/config/configurations/greeter.ts (100%) rename {nixosModules => modules}/ags/config/configurations/lock.ts (100%) rename {nixosModules => modules}/ags/config/configurations/wim.ts (100%) rename {nixosModules => modules}/ags/config/default.nix (100%) rename {nixosModules => modules}/ags/config/env.d.ts (100%) rename {nixosModules => modules}/ags/config/eslint.config.ts (100%) rename {nixosModules => modules}/ags/config/lib.ts (100%) rename {nixosModules => modules}/ags/config/package-lock.json (100%) rename {nixosModules => modules}/ags/config/package.json (100%) rename {nixosModules => modules}/ags/config/services/brightness.ts (100%) rename {nixosModules => modules}/ags/config/services/gpu-screen-recorder.ts (100%) rename {nixosModules => modules}/ags/config/services/monitor-clicks.ts (100%) rename {nixosModules => modules}/ags/config/services/tablet.ts (100%) rename {nixosModules => modules}/ags/config/style/colors.scss (100%) rename {nixosModules => modules}/ags/config/style/common.scss (100%) rename {nixosModules => modules}/ags/config/style/greeter.scss (100%) rename {nixosModules => modules}/ags/config/style/lock.scss (100%) rename {nixosModules => modules}/ags/config/style/main.scss (100%) rename {nixosModules => modules}/ags/config/widgets/applauncher/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/applauncher/app-item.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/applauncher/launch.ts (100%) rename {nixosModules => modules}/ags/config/widgets/applauncher/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/audio/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/audio/binto.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/audio/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/audio/profiles.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/audio/streams.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/audio/wim.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/bar/binto.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/fullscreen.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/audio.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/battery.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/bluetooth.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/brightness.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/clock.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/current-client.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/current-icon.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/network.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/notif-button.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/tray.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/items/workspaces.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bar/wim.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bg-layer/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bluetooth/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/bluetooth/device.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bluetooth/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/bluetooth/wim.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/clipboard/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/clipboard/clip-item.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/clipboard/cliphist.sh (100%) rename {nixosModules => modules}/ags/config/widgets/clipboard/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/corners/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/corners/screen-corners.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/date/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/date/binto.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/date/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/date/wim.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/greeter/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/icon-browser/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/icon-browser/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/lockscreen/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/lockscreen/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/misc/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/misc/popup-window.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/misc/separator.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/misc/smooth-progress.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/misc/sorted-list.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/misc/subclasses.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/binto.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/center.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/gesture.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/notification.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/popups.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/notifs/wim.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-display/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-display/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/arcs.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/gesture.ts (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/keyboard-layouts.ts (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/keyboard.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/keys.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/on-screen-keyboard/osk-window.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/powermenu/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/powermenu/main.tsx (100%) rename {nixosModules => modules}/ags/config/widgets/screenshot/_index.scss (100%) rename {nixosModules => modules}/ags/config/widgets/screenshot/capture.sh (100%) rename {nixosModules => modules}/ags/config/widgets/screenshot/main.tsx (100%) rename {nixosModules => modules}/ags/default.nix (98%) rename {nixosModules => modules}/ags/hyprland.nix (100%) rename {nixosModules => modules}/ags/packages.nix (100%) rename {nixosModules => modules}/ags/v1/config/global-types.d.ts (100%) rename {nixosModules => modules}/ags/v1/config/scss/player.scss (100%) rename {nixosModules => modules}/ags/v1/config/scss/quick-settings.scss (100%) rename {nixosModules => modules}/ags/v1/config/ts/bar/heart.ts (100%) rename {nixosModules => modules}/ags/v1/config/ts/bar/keyboard-layout.ts (100%) rename {nixosModules => modules}/ags/v1/config/ts/media-player/gesture.ts (100%) rename {nixosModules => modules}/ags/v1/config/ts/media-player/mpris.ts (100%) rename {nixosModules => modules}/ags/v1/config/ts/media-player/player.ts (100%) rename {nixosModules => modules}/ags/v1/icons.nix (100%) rename {nixosModules => modules}/base/common-nix/default.nix (100%) rename {nixosModules => modules}/base/default-droid.nix (100%) rename {nixosModules => modules}/base/default.nix (100%) rename {nixosModules => modules}/base/locale/default.nix (100%) rename {nixosModules => modules}/base/locate/default.nix (100%) rename {nixosModules => modules}/base/packages/default.nix (100%) rename {nixosModules => modules}/base/substituters/default.nix (100%) rename {nixosModules => modules}/borgbackup/default.nix (100%) rename {nixosModules => modules}/borgbackup/module.nix (100%) rename {nixosModules => modules}/default.nix (100%) rename {nixosModules => modules}/desktop/default.nix (100%) rename {nixosModules => modules}/desktop/environment/config/dolphinrc (100%) rename {nixosModules => modules}/desktop/environment/config/kdeglobals (100%) rename {nixosModules => modules}/desktop/environment/config/kiorc (100%) rename {nixosModules => modules}/desktop/environment/config/mimeapps.list (100%) rename {nixosModules => modules}/desktop/environment/default.nix (100%) rename {nixosModules => modules}/desktop/environment/home/dev.nix (100%) rename {nixosModules => modules}/desktop/environment/home/foot.nix (100%) rename {nixosModules => modules}/desktop/environment/home/hyprexpo.nix (100%) rename {nixosModules => modules}/desktop/environment/home/hyprgrass.nix (100%) rename {nixosModules => modules}/desktop/environment/home/inputs.nix (100%) rename {nixosModules => modules}/desktop/environment/home/mpv.nix (100%) rename {nixosModules => modules}/desktop/environment/home/obs.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/audio.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/dconf.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/dolphin.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/packages.nix (98%) rename {nixosModules => modules}/desktop/environment/modules/printer.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/ratbag-mice.nix (100%) rename {nixosModules => modules}/desktop/environment/modules/security.nix (98%) rename {nixosModules => modules}/desktop/manager/ags.nix (100%) rename {nixosModules => modules}/desktop/manager/default.nix (100%) rename {nixosModules => modules}/desktop/manager/hyprland.nix (100%) rename {nixosModules => modules}/desktop/manager/setupMonitors.nix (100%) rename {nixosModules => modules}/desktop/theme/cursors.nix (100%) rename {nixosModules => modules}/desktop/theme/default.nix (100%) rename {nixosModules => modules}/desktop/theme/gtk/default.nix (100%) rename {nixosModules => modules}/desktop/theme/gtk/gradience.nix (100%) rename {nixosModules => modules}/desktop/theme/hyprpaper.nix (100%) rename {nixosModules => modules}/desktop/theme/qt.nix (100%) rename {nixosModules => modules}/desktop/theme/xresources.nix (100%) rename {nixosModules => modules}/docker/.template/compose.nix (100%) rename {nixosModules => modules}/docker/.template/images/image.nix (100%) rename {nixosModules => modules}/docker/default.nix (100%) rename {nixosModules => modules}/docker/updateImage.nix (100%) rename {nixosModules => modules}/esphome-plus/default.nix (100%) rename {nixosModules => modules}/ha-plus/default.nix (100%) rename {nixosModules => modules}/kmscon/default.nix (100%) rename {nixosModules => modules}/nvidia/default.nix (100%) rename {nixosModules => modules}/plymouth/default.nix (100%) rename {nixosModules => modules}/server/default.nix (100%) rename {nixosModules => modules}/server/sshd.nix (100%) rename {nixosModules => modules}/server/tailscale.nix (100%) rename {nixosModules => modules}/tmux/default.nix (100%) rename {nixosModules => modules}/wyoming-plus/default.nix (100%) rename {nixosModules => modules}/wyoming-plus/pkgs/default.nix (100%) rename {nixosModules => modules}/wyoming-plus/pkgs/openwakeword.nix (100%) rename {nixosModules => modules}/wyoming-plus/pkgs/speexdsp-ns.nix (100%) rename {nixosModules => modules}/wyoming-plus/pkgs/tflite-runtime.nix (100%) rename {nixosModules => modules}/wyoming-plus/pkgs/wyoming-openwakeword.nix (100%) rename {checks => nixFastChecks}/apps/default.nix (100%) create mode 100644 nixFastChecks/default.nix rename {checks => nixFastChecks}/devShells/default.nix (100%) rename {checks => nixFastChecks}/devices/default.nix (81%) rename {checks => nixFastChecks}/packages/default.nix (100%) diff --git a/README.md b/README.md index 16c5000a..06d18aca 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ You might find it weird that most of my config is written in TypeScript. That's because all my desktops run [AGS](https://github.com/Aylur/ags) for UI. Click on -[this](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/nixosModules/ags) +[this](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/modules/ags) to see my configuration. I'm also a victim of Stockholm syndrome at this point and make my scripts @@ -55,7 +55,7 @@ sudo ln -sf /home/matt/.nix /etc/nixos | `scopedPackages` | Some custom [package scopes](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/scopedPackages) not available in nixpkgs or modified from it | | `apps` | Scripts ran from the flake defined [here](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/apps) | | `homeManagerModules` | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/homeManagerModules) made for home-manager | -| `homeManagerModules` | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/nixosModules) made for NixOS systems | +| `homeManagerModules` | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/modules) made for NixOS systems | | `formatter` | I format nix code with [alejandra](https://github.com/kamadorueda/alejandra) | | `devShells.default` | A dev shell to build an ISO from the live-image nixosConfiguration | | `devShells.ags` | A dev shell to have a NodeJS env when I enter my AGS's config directory | diff --git a/apps/update-sources/default.nix b/apps/update-sources/default.nix index f77a8072..e1cc7aa7 100644 --- a/apps/update-sources/default.nix +++ b/apps/update-sources/default.nix @@ -12,6 +12,6 @@ buildApp { runtimeInputs = [ nodejs_latest prefetch-npm-deps - (callPackage ../../nixosModules/docker/updateImage.nix {}) + (callPackage ../../modules/docker/updateImage.nix {}) ]; } diff --git a/checks/default.nix b/checks/default.nix deleted file mode 100644 index cc31a831..00000000 --- a/checks/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - self, -}: let - apps = import ./apps {inherit pkgs self;}; - devices = import ./devices {inherit pkgs self;}; - devShells = import ./devShells {inherit pkgs self;}; - packages = import ./packages {inherit pkgs self;}; -in { - # Allow homie to serve a binary cache for the devices away from servivi - aptDevices = - devShells - // (import ./devices { - onlyApt = true; - inherit pkgs self; - }); - - all = apps // devices // devShells // packages; - inherit apps devices devShells packages; -} diff --git a/devices/README.md b/configurations/README.md similarity index 100% rename from devices/README.md rename to configurations/README.md diff --git a/devices/android/default.nix b/configurations/android/default.nix similarity index 100% rename from devices/android/default.nix rename to configurations/android/default.nix diff --git a/devices/android/nix-on-droid.nix b/configurations/android/nix-on-droid.nix similarity index 100% rename from devices/android/nix-on-droid.nix rename to configurations/android/nix-on-droid.nix diff --git a/devices/bbsteamie/default.nix b/configurations/bbsteamie/default.nix similarity index 100% rename from devices/bbsteamie/default.nix rename to configurations/bbsteamie/default.nix diff --git a/devices/bbsteamie/hardware-configuration.nix b/configurations/bbsteamie/hardware-configuration.nix similarity index 100% rename from devices/bbsteamie/hardware-configuration.nix rename to configurations/bbsteamie/hardware-configuration.nix diff --git a/devices/bbsteamie/modules/default.nix b/configurations/bbsteamie/modules/default.nix similarity index 100% rename from devices/bbsteamie/modules/default.nix rename to configurations/bbsteamie/modules/default.nix diff --git a/devices/bbsteamie/modules/desktop/default.nix b/configurations/bbsteamie/modules/desktop/default.nix similarity index 100% rename from devices/bbsteamie/modules/desktop/default.nix rename to configurations/bbsteamie/modules/desktop/default.nix diff --git a/devices/bbsteamie/modules/desktop/install_palia_map.md b/configurations/bbsteamie/modules/desktop/install_palia_map.md similarity index 100% rename from devices/bbsteamie/modules/desktop/install_palia_map.md rename to configurations/bbsteamie/modules/desktop/install_palia_map.md diff --git a/devices/bbsteamie/modules/desktop/session-switching.nix b/configurations/bbsteamie/modules/desktop/session-switching.nix similarity index 100% rename from devices/bbsteamie/modules/desktop/session-switching.nix rename to configurations/bbsteamie/modules/desktop/session-switching.nix diff --git a/devices/bbsteamie/modules/desktop/steam.nix b/configurations/bbsteamie/modules/desktop/steam.nix similarity index 100% rename from devices/bbsteamie/modules/desktop/steam.nix rename to configurations/bbsteamie/modules/desktop/steam.nix diff --git a/devices/binto/default.nix b/configurations/binto/default.nix similarity index 100% rename from devices/binto/default.nix rename to configurations/binto/default.nix diff --git a/devices/binto/hardware-configuration.nix b/configurations/binto/hardware-configuration.nix similarity index 100% rename from devices/binto/hardware-configuration.nix rename to configurations/binto/hardware-configuration.nix diff --git a/devices/binto/modules/default.nix b/configurations/binto/modules/default.nix similarity index 100% rename from devices/binto/modules/default.nix rename to configurations/binto/modules/default.nix diff --git a/devices/binto/modules/gpu-replay.nix b/configurations/binto/modules/gpu-replay.nix similarity index 100% rename from devices/binto/modules/gpu-replay.nix rename to configurations/binto/modules/gpu-replay.nix diff --git a/devices/binto/modules/nix-gaming.nix b/configurations/binto/modules/nix-gaming.nix similarity index 100% rename from devices/binto/modules/nix-gaming.nix rename to configurations/binto/modules/nix-gaming.nix diff --git a/devices/cluster/default.nix b/configurations/cluster/default.nix similarity index 100% rename from devices/cluster/default.nix rename to configurations/cluster/default.nix diff --git a/devices/cluster/hardware-configuration.nix b/configurations/cluster/hardware-configuration.nix similarity index 100% rename from devices/cluster/hardware-configuration.nix rename to configurations/cluster/hardware-configuration.nix diff --git a/devices/cluster/modules/blocky.nix b/configurations/cluster/modules/blocky.nix similarity index 100% rename from devices/cluster/modules/blocky.nix rename to configurations/cluster/modules/blocky.nix diff --git a/devices/cluster/modules/caddy.nix b/configurations/cluster/modules/caddy.nix similarity index 100% rename from devices/cluster/modules/caddy.nix rename to configurations/cluster/modules/caddy.nix diff --git a/devices/cluster/modules/default.nix b/configurations/cluster/modules/default.nix similarity index 100% rename from devices/cluster/modules/default.nix rename to configurations/cluster/modules/default.nix diff --git a/devices/cluster/modules/headscale/completion.bash b/configurations/cluster/modules/headscale/completion.bash similarity index 100% rename from devices/cluster/modules/headscale/completion.bash rename to configurations/cluster/modules/headscale/completion.bash diff --git a/devices/cluster/modules/headscale/default.nix b/configurations/cluster/modules/headscale/default.nix similarity index 100% rename from devices/cluster/modules/headscale/default.nix rename to configurations/cluster/modules/headscale/default.nix diff --git a/devices/cluster/modules/nfs-client.nix b/configurations/cluster/modules/nfs-client.nix similarity index 100% rename from devices/cluster/modules/nfs-client.nix rename to configurations/cluster/modules/nfs-client.nix diff --git a/devices/cluster/modules/pcsd.nix b/configurations/cluster/modules/pcsd.nix similarity index 100% rename from devices/cluster/modules/pcsd.nix rename to configurations/cluster/modules/pcsd.nix diff --git a/devices/cluster/modules/unbound.nix b/configurations/cluster/modules/unbound.nix similarity index 100% rename from devices/cluster/modules/unbound.nix rename to configurations/cluster/modules/unbound.nix diff --git a/devices/homie/default.nix b/configurations/homie/default.nix similarity index 100% rename from devices/homie/default.nix rename to configurations/homie/default.nix diff --git a/devices/homie/hardware-configuration.nix b/configurations/homie/hardware-configuration.nix similarity index 100% rename from devices/homie/hardware-configuration.nix rename to configurations/homie/hardware-configuration.nix diff --git a/devices/homie/modules/androidtv/default.nix b/configurations/homie/modules/androidtv/default.nix similarity index 100% rename from devices/homie/modules/androidtv/default.nix rename to configurations/homie/modules/androidtv/default.nix diff --git a/devices/homie/modules/binary-cache.nix b/configurations/homie/modules/binary-cache.nix similarity index 88% rename from devices/homie/modules/binary-cache.nix rename to configurations/homie/modules/binary-cache.nix index eb6bc6b4..fa1ecde3 100644 --- a/devices/homie/modules/binary-cache.nix +++ b/configurations/homie/modules/binary-cache.nix @@ -21,7 +21,7 @@ text = '' cd "$FLAKE/results" || return - nix-fast-build -f ..#nixFastChecks.${pkgs.system}.aptDevices "$@" + nix-fast-build -f ..#nixFastChecks.aptDevices "$@" ''; }; in { diff --git a/devices/homie/modules/default.nix b/configurations/homie/modules/default.nix similarity index 100% rename from devices/homie/modules/default.nix rename to configurations/homie/modules/default.nix diff --git a/devices/homie/modules/home-assistant/assist.nix b/configurations/homie/modules/home-assistant/assist.nix similarity index 100% rename from devices/homie/modules/home-assistant/assist.nix rename to configurations/homie/modules/home-assistant/assist.nix diff --git a/devices/homie/modules/home-assistant/bluetooth.nix b/configurations/homie/modules/home-assistant/bluetooth.nix similarity index 100% rename from devices/homie/modules/home-assistant/bluetooth.nix rename to configurations/homie/modules/home-assistant/bluetooth.nix diff --git a/devices/homie/modules/home-assistant/default.nix b/configurations/homie/modules/home-assistant/default.nix similarity index 100% rename from devices/homie/modules/home-assistant/default.nix rename to configurations/homie/modules/home-assistant/default.nix diff --git a/devices/homie/modules/home-assistant/docs/functions.nix b/configurations/homie/modules/home-assistant/docs/functions.nix similarity index 100% rename from devices/homie/modules/home-assistant/docs/functions.nix rename to configurations/homie/modules/home-assistant/docs/functions.nix diff --git a/devices/homie/modules/home-assistant/docs/prompt b/configurations/homie/modules/home-assistant/docs/prompt similarity index 100% rename from devices/homie/modules/home-assistant/docs/prompt rename to configurations/homie/modules/home-assistant/docs/prompt diff --git a/devices/homie/modules/home-assistant/firmware.nix b/configurations/homie/modules/home-assistant/firmware.nix similarity index 100% rename from devices/homie/modules/home-assistant/firmware.nix rename to configurations/homie/modules/home-assistant/firmware.nix diff --git a/devices/homie/modules/home-assistant/frontend.nix b/configurations/homie/modules/home-assistant/frontend.nix similarity index 100% rename from devices/homie/modules/home-assistant/frontend.nix rename to configurations/homie/modules/home-assistant/frontend.nix diff --git a/devices/homie/modules/home-assistant/netdaemon/.editorconfig b/configurations/homie/modules/home-assistant/netdaemon/.editorconfig similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/.editorconfig rename to configurations/homie/modules/home-assistant/netdaemon/.editorconfig diff --git a/devices/homie/modules/home-assistant/netdaemon/.envrc b/configurations/homie/modules/home-assistant/netdaemon/.envrc similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/.envrc rename to configurations/homie/modules/home-assistant/netdaemon/.envrc diff --git a/devices/homie/modules/home-assistant/netdaemon/.gitignore b/configurations/homie/modules/home-assistant/netdaemon/.gitignore similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/.gitignore rename to configurations/homie/modules/home-assistant/netdaemon/.gitignore diff --git a/devices/homie/modules/home-assistant/netdaemon/.version b/configurations/homie/modules/home-assistant/netdaemon/.version similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/.version rename to configurations/homie/modules/home-assistant/netdaemon/.version diff --git a/devices/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated b/configurations/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated rename to configurations/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PauseUnpause/PauseUnpause.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PauseUnpause/PauseUnpause.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PauseUnpause/PauseUnpause.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PauseUnpause/PauseUnpause.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/PlayPlaylist.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/PlayPlaylist.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/PlayPlaylist.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/PlayPlaylist.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/SpotifyplusPlaylistResponse.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/SpotifyplusPlaylistResponse.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/SpotifyplusPlaylistResponse.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayPlaylist/SpotifyplusPlaylistResponse.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/PlaySong.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/PlaySong.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/PlaySong.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/PlaySong.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/SpotifyplusSearchTracksResponse.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/SpotifyplusSearchTracksResponse.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/SpotifyplusSearchTracksResponse.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/PlaySong/SpotifyplusSearchTracksResponse.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs b/configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs rename to configurations/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs diff --git a/devices/homie/modules/home-assistant/netdaemon/appsettings.json b/configurations/homie/modules/home-assistant/netdaemon/appsettings.json similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/appsettings.json rename to configurations/homie/modules/home-assistant/netdaemon/appsettings.json diff --git a/devices/homie/modules/home-assistant/netdaemon/default.nix b/configurations/homie/modules/home-assistant/netdaemon/default.nix similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/default.nix rename to configurations/homie/modules/home-assistant/netdaemon/default.nix diff --git a/devices/homie/modules/home-assistant/netdaemon/deps.nix b/configurations/homie/modules/home-assistant/netdaemon/deps.nix similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/deps.nix rename to configurations/homie/modules/home-assistant/netdaemon/deps.nix diff --git a/devices/homie/modules/home-assistant/netdaemon/images/netdaemon.nix b/configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/images/netdaemon.nix rename to configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix diff --git a/devices/homie/modules/home-assistant/netdaemon/netdaemon.csproj b/configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/netdaemon.csproj rename to configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj diff --git a/devices/homie/modules/home-assistant/netdaemon/package.nix b/configurations/homie/modules/home-assistant/netdaemon/package.nix similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/package.nix rename to configurations/homie/modules/home-assistant/netdaemon/package.nix diff --git a/devices/homie/modules/home-assistant/netdaemon/program.cs b/configurations/homie/modules/home-assistant/netdaemon/program.cs similarity index 100% rename from devices/homie/modules/home-assistant/netdaemon/program.cs rename to configurations/homie/modules/home-assistant/netdaemon/program.cs diff --git a/devices/homie/modules/home-assistant/spotify/default.nix b/configurations/homie/modules/home-assistant/spotify/default.nix similarity index 100% rename from devices/homie/modules/home-assistant/spotify/default.nix rename to configurations/homie/modules/home-assistant/spotify/default.nix diff --git a/devices/homie/modules/home-assistant/spotify/sentences.nix b/configurations/homie/modules/home-assistant/spotify/sentences.nix similarity index 100% rename from devices/homie/modules/home-assistant/spotify/sentences.nix rename to configurations/homie/modules/home-assistant/spotify/sentences.nix diff --git a/devices/homie/modules/home-assistant/timer/default.nix b/configurations/homie/modules/home-assistant/timer/default.nix similarity index 100% rename from devices/homie/modules/home-assistant/timer/default.nix rename to configurations/homie/modules/home-assistant/timer/default.nix diff --git a/devices/homie/modules/home-assistant/timer/sentences.nix b/configurations/homie/modules/home-assistant/timer/sentences.nix similarity index 100% rename from devices/homie/modules/home-assistant/timer/sentences.nix rename to configurations/homie/modules/home-assistant/timer/sentences.nix diff --git a/devices/homie/modules/music/default.nix b/configurations/homie/modules/music/default.nix similarity index 100% rename from devices/homie/modules/music/default.nix rename to configurations/homie/modules/music/default.nix diff --git a/devices/live-image/default.nix b/configurations/live-image/default.nix similarity index 100% rename from devices/live-image/default.nix rename to configurations/live-image/default.nix diff --git a/devices/nos/default.nix b/configurations/nos/default.nix similarity index 100% rename from devices/nos/default.nix rename to configurations/nos/default.nix diff --git a/devices/nos/hardware-configuration.nix b/configurations/nos/hardware-configuration.nix similarity index 100% rename from devices/nos/hardware-configuration.nix rename to configurations/nos/hardware-configuration.nix diff --git a/devices/nos/modules/default.nix b/configurations/nos/modules/default.nix similarity index 100% rename from devices/nos/modules/default.nix rename to configurations/nos/modules/default.nix diff --git a/devices/nos/modules/docker/default.nix b/configurations/nos/modules/docker/default.nix similarity index 100% rename from devices/nos/modules/docker/default.nix rename to configurations/nos/modules/docker/default.nix diff --git a/devices/nos/modules/docker/forgejo/compose.nix b/configurations/nos/modules/docker/forgejo/compose.nix similarity index 100% rename from devices/nos/modules/docker/forgejo/compose.nix rename to configurations/nos/modules/docker/forgejo/compose.nix diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/configurations/nos/modules/docker/forgejo/images/act_runner.nix similarity index 100% rename from devices/nos/modules/docker/forgejo/images/act_runner.nix rename to configurations/nos/modules/docker/forgejo/images/act_runner.nix diff --git a/devices/nos/modules/docker/forgejo/images/forgejo.nix b/configurations/nos/modules/docker/forgejo/images/forgejo.nix similarity index 100% rename from devices/nos/modules/docker/forgejo/images/forgejo.nix rename to configurations/nos/modules/docker/forgejo/images/forgejo.nix diff --git a/devices/nos/modules/docker/forgejo/images/postgres.nix b/configurations/nos/modules/docker/forgejo/images/postgres.nix similarity index 100% rename from devices/nos/modules/docker/forgejo/images/postgres.nix rename to configurations/nos/modules/docker/forgejo/images/postgres.nix diff --git a/devices/nos/modules/docker/freshrss/compose.nix b/configurations/nos/modules/docker/freshrss/compose.nix similarity index 100% rename from devices/nos/modules/docker/freshrss/compose.nix rename to configurations/nos/modules/docker/freshrss/compose.nix diff --git a/devices/nos/modules/docker/freshrss/images/freshrss.nix b/configurations/nos/modules/docker/freshrss/images/freshrss.nix similarity index 100% rename from devices/nos/modules/docker/freshrss/images/freshrss.nix rename to configurations/nos/modules/docker/freshrss/images/freshrss.nix diff --git a/devices/nos/modules/docker/freshrss/images/postgres.nix b/configurations/nos/modules/docker/freshrss/images/postgres.nix similarity index 100% rename from devices/nos/modules/docker/freshrss/images/postgres.nix rename to configurations/nos/modules/docker/freshrss/images/postgres.nix diff --git a/devices/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix similarity index 100% rename from devices/nos/modules/docker/freshrss/images/rss-bridge.nix rename to configurations/nos/modules/docker/freshrss/images/rss-bridge.nix diff --git a/devices/nos/modules/docker/gameyfin/compose.nix b/configurations/nos/modules/docker/gameyfin/compose.nix similarity index 100% rename from devices/nos/modules/docker/gameyfin/compose.nix rename to configurations/nos/modules/docker/gameyfin/compose.nix diff --git a/devices/nos/modules/docker/gameyfin/images/gameyfin.nix b/configurations/nos/modules/docker/gameyfin/images/gameyfin.nix similarity index 100% rename from devices/nos/modules/docker/gameyfin/images/gameyfin.nix rename to configurations/nos/modules/docker/gameyfin/images/gameyfin.nix diff --git a/devices/nos/modules/docker/hauk/compose.nix b/configurations/nos/modules/docker/hauk/compose.nix similarity index 100% rename from devices/nos/modules/docker/hauk/compose.nix rename to configurations/nos/modules/docker/hauk/compose.nix diff --git a/devices/nos/modules/docker/hauk/config.php b/configurations/nos/modules/docker/hauk/config.php similarity index 100% rename from devices/nos/modules/docker/hauk/config.php rename to configurations/nos/modules/docker/hauk/config.php diff --git a/devices/nos/modules/docker/hauk/images/hauk.nix b/configurations/nos/modules/docker/hauk/images/hauk.nix similarity index 100% rename from devices/nos/modules/docker/hauk/images/hauk.nix rename to configurations/nos/modules/docker/hauk/images/hauk.nix diff --git a/devices/nos/modules/docker/immich/compose.nix b/configurations/nos/modules/docker/immich/compose.nix similarity index 100% rename from devices/nos/modules/docker/immich/compose.nix rename to configurations/nos/modules/docker/immich/compose.nix diff --git a/devices/nos/modules/docker/immich/env b/configurations/nos/modules/docker/immich/env similarity index 100% rename from devices/nos/modules/docker/immich/env rename to configurations/nos/modules/docker/immich/env diff --git a/devices/nos/modules/docker/immich/images/machine-learning.nix b/configurations/nos/modules/docker/immich/images/machine-learning.nix similarity index 100% rename from devices/nos/modules/docker/immich/images/machine-learning.nix rename to configurations/nos/modules/docker/immich/images/machine-learning.nix diff --git a/devices/nos/modules/docker/immich/images/postgres.nix b/configurations/nos/modules/docker/immich/images/postgres.nix similarity index 100% rename from devices/nos/modules/docker/immich/images/postgres.nix rename to configurations/nos/modules/docker/immich/images/postgres.nix diff --git a/devices/nos/modules/docker/immich/images/redis.nix b/configurations/nos/modules/docker/immich/images/redis.nix similarity index 100% rename from devices/nos/modules/docker/immich/images/redis.nix rename to configurations/nos/modules/docker/immich/images/redis.nix diff --git a/devices/nos/modules/docker/immich/images/server.nix b/configurations/nos/modules/docker/immich/images/server.nix similarity index 100% rename from devices/nos/modules/docker/immich/images/server.nix rename to configurations/nos/modules/docker/immich/images/server.nix diff --git a/devices/nos/modules/docker/media/bazarr/compose.nix b/configurations/nos/modules/docker/media/bazarr/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/bazarr/compose.nix rename to configurations/nos/modules/docker/media/bazarr/compose.nix diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/configurations/nos/modules/docker/media/bazarr/images/bazarr.nix similarity index 100% rename from devices/nos/modules/docker/media/bazarr/images/bazarr.nix rename to configurations/nos/modules/docker/media/bazarr/images/bazarr.nix diff --git a/devices/nos/modules/docker/media/joal/compose.nix b/configurations/nos/modules/docker/media/joal/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/joal/compose.nix rename to configurations/nos/modules/docker/media/joal/compose.nix diff --git a/devices/nos/modules/docker/media/joal/images/joal.nix b/configurations/nos/modules/docker/media/joal/images/joal.nix similarity index 100% rename from devices/nos/modules/docker/media/joal/images/joal.nix rename to configurations/nos/modules/docker/media/joal/images/joal.nix diff --git a/devices/nos/modules/docker/media/prowlarr/compose.nix b/configurations/nos/modules/docker/media/prowlarr/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/prowlarr/compose.nix rename to configurations/nos/modules/docker/media/prowlarr/compose.nix diff --git a/devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix b/configurations/nos/modules/docker/media/prowlarr/images/flaresolverr.nix similarity index 100% rename from devices/nos/modules/docker/media/prowlarr/images/flaresolverr.nix rename to configurations/nos/modules/docker/media/prowlarr/images/flaresolverr.nix diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix similarity index 100% rename from devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix rename to configurations/nos/modules/docker/media/prowlarr/images/prowlarr.nix diff --git a/devices/nos/modules/docker/media/radarr/compose.nix b/configurations/nos/modules/docker/media/radarr/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/radarr/compose.nix rename to configurations/nos/modules/docker/media/radarr/compose.nix diff --git a/devices/nos/modules/docker/media/radarr/images/radarr.nix b/configurations/nos/modules/docker/media/radarr/images/radarr.nix similarity index 100% rename from devices/nos/modules/docker/media/radarr/images/radarr.nix rename to configurations/nos/modules/docker/media/radarr/images/radarr.nix diff --git a/devices/nos/modules/docker/media/sabnzbd/compose.nix b/configurations/nos/modules/docker/media/sabnzbd/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/sabnzbd/compose.nix rename to configurations/nos/modules/docker/media/sabnzbd/compose.nix diff --git a/devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix b/configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix similarity index 100% rename from devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix rename to configurations/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix diff --git a/devices/nos/modules/docker/media/seerr/compose.nix b/configurations/nos/modules/docker/media/seerr/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/seerr/compose.nix rename to configurations/nos/modules/docker/media/seerr/compose.nix diff --git a/devices/nos/modules/docker/media/seerr/images/jellyseerr.nix b/configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix similarity index 100% rename from devices/nos/modules/docker/media/seerr/images/jellyseerr.nix rename to configurations/nos/modules/docker/media/seerr/images/jellyseerr.nix diff --git a/devices/nos/modules/docker/media/sonarr/compose.nix b/configurations/nos/modules/docker/media/sonarr/compose.nix similarity index 100% rename from devices/nos/modules/docker/media/sonarr/compose.nix rename to configurations/nos/modules/docker/media/sonarr/compose.nix diff --git a/devices/nos/modules/docker/media/sonarr/images/sonarr.nix b/configurations/nos/modules/docker/media/sonarr/images/sonarr.nix similarity index 100% rename from devices/nos/modules/docker/media/sonarr/images/sonarr.nix rename to configurations/nos/modules/docker/media/sonarr/images/sonarr.nix diff --git a/devices/nos/modules/docker/music/jbots/compose.nix b/configurations/nos/modules/docker/music/jbots/compose.nix similarity index 100% rename from devices/nos/modules/docker/music/jbots/compose.nix rename to configurations/nos/modules/docker/music/jbots/compose.nix diff --git a/devices/nos/modules/docker/music/jbots/images/jmusicbot.nix b/configurations/nos/modules/docker/music/jbots/images/jmusicbot.nix similarity index 100% rename from devices/nos/modules/docker/music/jbots/images/jmusicbot.nix rename to configurations/nos/modules/docker/music/jbots/images/jmusicbot.nix diff --git a/devices/nos/modules/docker/nextcloud/compose.nix b/configurations/nos/modules/docker/nextcloud/compose.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/compose.nix rename to configurations/nos/modules/docker/nextcloud/compose.nix diff --git a/devices/nos/modules/docker/nextcloud/images/nextcloud.nix b/configurations/nos/modules/docker/nextcloud/images/nextcloud.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/images/nextcloud.nix rename to configurations/nos/modules/docker/nextcloud/images/nextcloud.nix diff --git a/devices/nos/modules/docker/nextcloud/images/nginx.nix b/configurations/nos/modules/docker/nextcloud/images/nginx.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/images/nginx.nix rename to configurations/nos/modules/docker/nextcloud/images/nginx.nix diff --git a/devices/nos/modules/docker/nextcloud/images/onlyoffice.nix b/configurations/nos/modules/docker/nextcloud/images/onlyoffice.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/images/onlyoffice.nix rename to configurations/nos/modules/docker/nextcloud/images/onlyoffice.nix diff --git a/devices/nos/modules/docker/nextcloud/images/postgres.nix b/configurations/nos/modules/docker/nextcloud/images/postgres.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/images/postgres.nix rename to configurations/nos/modules/docker/nextcloud/images/postgres.nix diff --git a/devices/nos/modules/docker/nextcloud/images/redis.nix b/configurations/nos/modules/docker/nextcloud/images/redis.nix similarity index 100% rename from devices/nos/modules/docker/nextcloud/images/redis.nix rename to configurations/nos/modules/docker/nextcloud/images/redis.nix diff --git a/devices/nos/modules/docker/nextcloud/nginx.conf b/configurations/nos/modules/docker/nextcloud/nginx.conf similarity index 100% rename from devices/nos/modules/docker/nextcloud/nginx.conf rename to configurations/nos/modules/docker/nextcloud/nginx.conf diff --git a/devices/nos/modules/docker/resume/compose.nix b/configurations/nos/modules/docker/resume/compose.nix similarity index 100% rename from devices/nos/modules/docker/resume/compose.nix rename to configurations/nos/modules/docker/resume/compose.nix diff --git a/devices/nos/modules/docker/resume/images/postgres.nix b/configurations/nos/modules/docker/resume/images/postgres.nix similarity index 100% rename from devices/nos/modules/docker/resume/images/postgres.nix rename to configurations/nos/modules/docker/resume/images/postgres.nix diff --git a/devices/nos/modules/docker/resume/images/resume-client.nix b/configurations/nos/modules/docker/resume/images/resume-client.nix similarity index 100% rename from devices/nos/modules/docker/resume/images/resume-client.nix rename to configurations/nos/modules/docker/resume/images/resume-client.nix diff --git a/devices/nos/modules/docker/resume/images/resume-server.nix b/configurations/nos/modules/docker/resume/images/resume-server.nix similarity index 100% rename from devices/nos/modules/docker/resume/images/resume-server.nix rename to configurations/nos/modules/docker/resume/images/resume-server.nix diff --git a/devices/nos/modules/docker/vaultwarden/compose.nix b/configurations/nos/modules/docker/vaultwarden/compose.nix similarity index 100% rename from devices/nos/modules/docker/vaultwarden/compose.nix rename to configurations/nos/modules/docker/vaultwarden/compose.nix diff --git a/devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix b/configurations/nos/modules/docker/vaultwarden/images/vaultwarden.nix similarity index 100% rename from devices/nos/modules/docker/vaultwarden/images/vaultwarden.nix rename to configurations/nos/modules/docker/vaultwarden/images/vaultwarden.nix diff --git a/devices/nos/modules/docker/wg-easy/compose.nix b/configurations/nos/modules/docker/wg-easy/compose.nix similarity index 100% rename from devices/nos/modules/docker/wg-easy/compose.nix rename to configurations/nos/modules/docker/wg-easy/compose.nix diff --git a/devices/nos/modules/docker/wg-easy/images/wg-easy.nix b/configurations/nos/modules/docker/wg-easy/images/wg-easy.nix similarity index 100% rename from devices/nos/modules/docker/wg-easy/images/wg-easy.nix rename to configurations/nos/modules/docker/wg-easy/images/wg-easy.nix diff --git a/devices/nos/modules/homepage.nix b/configurations/nos/modules/homepage.nix similarity index 100% rename from devices/nos/modules/homepage.nix rename to configurations/nos/modules/homepage.nix diff --git a/devices/nos/modules/jellyfin/default.nix b/configurations/nos/modules/jellyfin/default.nix similarity index 100% rename from devices/nos/modules/jellyfin/default.nix rename to configurations/nos/modules/jellyfin/default.nix diff --git a/devices/nos/modules/jellyfin/images/jfa-go.nix b/configurations/nos/modules/jellyfin/images/jfa-go.nix similarity index 100% rename from devices/nos/modules/jellyfin/images/jfa-go.nix rename to configurations/nos/modules/jellyfin/images/jfa-go.nix diff --git a/devices/nos/modules/jellyfin/jfa-go.nix b/configurations/nos/modules/jellyfin/jfa-go.nix similarity index 100% rename from devices/nos/modules/jellyfin/jfa-go.nix rename to configurations/nos/modules/jellyfin/jfa-go.nix diff --git a/devices/nos/modules/jellyfin/packages.nix b/configurations/nos/modules/jellyfin/packages.nix similarity index 100% rename from devices/nos/modules/jellyfin/packages.nix rename to configurations/nos/modules/jellyfin/packages.nix diff --git a/devices/nos/modules/llm.nix b/configurations/nos/modules/llm.nix similarity index 100% rename from devices/nos/modules/llm.nix rename to configurations/nos/modules/llm.nix diff --git a/devices/nos/modules/mergerfs.nix b/configurations/nos/modules/mergerfs.nix similarity index 100% rename from devices/nos/modules/mergerfs.nix rename to configurations/nos/modules/mergerfs.nix diff --git a/devices/nos/modules/qbittorrent/default.nix b/configurations/nos/modules/qbittorrent/default.nix similarity index 100% rename from devices/nos/modules/qbittorrent/default.nix rename to configurations/nos/modules/qbittorrent/default.nix diff --git a/devices/nos/modules/qbittorrent/qbittorrent.nix b/configurations/nos/modules/qbittorrent/qbittorrent.nix similarity index 100% rename from devices/nos/modules/qbittorrent/qbittorrent.nix rename to configurations/nos/modules/qbittorrent/qbittorrent.nix diff --git a/devices/nos/modules/qbittorrent/vuetorrent.nix b/configurations/nos/modules/qbittorrent/vuetorrent.nix similarity index 100% rename from devices/nos/modules/qbittorrent/vuetorrent.nix rename to configurations/nos/modules/qbittorrent/vuetorrent.nix diff --git a/devices/nos/modules/qbittorrent/wireguard.nix b/configurations/nos/modules/qbittorrent/wireguard.nix similarity index 100% rename from devices/nos/modules/qbittorrent/wireguard.nix rename to configurations/nos/modules/qbittorrent/wireguard.nix diff --git a/devices/nos/modules/snapraid.nix b/configurations/nos/modules/snapraid.nix similarity index 100% rename from devices/nos/modules/snapraid.nix rename to configurations/nos/modules/snapraid.nix diff --git a/devices/nos/modules/subtitles/cleanup.nix b/configurations/nos/modules/subtitles/cleanup.nix similarity index 100% rename from devices/nos/modules/subtitles/cleanup.nix rename to configurations/nos/modules/subtitles/cleanup.nix diff --git a/devices/nos/modules/subtitles/convert.nix b/configurations/nos/modules/subtitles/convert.nix similarity index 100% rename from devices/nos/modules/subtitles/convert.nix rename to configurations/nos/modules/subtitles/convert.nix diff --git a/devices/nos/modules/subtitles/default.nix b/configurations/nos/modules/subtitles/default.nix similarity index 100% rename from devices/nos/modules/subtitles/default.nix rename to configurations/nos/modules/subtitles/default.nix diff --git a/devices/nos/modules/subtitles/syncing.nix b/configurations/nos/modules/subtitles/syncing.nix similarity index 100% rename from devices/nos/modules/subtitles/syncing.nix rename to configurations/nos/modules/subtitles/syncing.nix diff --git a/devices/servivi/default.nix b/configurations/servivi/default.nix similarity index 100% rename from devices/servivi/default.nix rename to configurations/servivi/default.nix diff --git a/devices/servivi/hardware-configuration.nix b/configurations/servivi/hardware-configuration.nix similarity index 100% rename from devices/servivi/hardware-configuration.nix rename to configurations/servivi/hardware-configuration.nix diff --git a/devices/servivi/modules/7-days-to-die.nix b/configurations/servivi/modules/7-days-to-die.nix similarity index 100% rename from devices/servivi/modules/7-days-to-die.nix rename to configurations/servivi/modules/7-days-to-die.nix diff --git a/devices/servivi/modules/binary-cache.nix b/configurations/servivi/modules/binary-cache.nix similarity index 93% rename from devices/servivi/modules/binary-cache.nix rename to configurations/servivi/modules/binary-cache.nix index 267d7a61..0646ab59 100644 --- a/devices/servivi/modules/binary-cache.nix +++ b/configurations/servivi/modules/binary-cache.nix @@ -26,7 +26,7 @@ nom build --no-link \ ..#nixosConfigurations.homie.config.services.home-assistant.package - nix-fast-build -f ..#nixFastChecks.${pkgs.system}.all "$@" + nix-fast-build -f ..#nixFastChecks.all "$@" ''; }; in { @@ -68,7 +68,7 @@ in { git clone https://git.nelim.org/matt1432/nixos-configs.git nix-clone cd nix-clone - nix-fast-build -f .#nixFastChecks.${pkgs.system}.all + nix-fast-build -f .#nixFastChecks.all cd .. rm -r nix-clone diff --git a/devices/servivi/modules/default.nix b/configurations/servivi/modules/default.nix similarity index 100% rename from devices/servivi/modules/default.nix rename to configurations/servivi/modules/default.nix diff --git a/devices/servivi/modules/minecraft.nix b/configurations/servivi/modules/minecraft.nix similarity index 100% rename from devices/servivi/modules/minecraft.nix rename to configurations/servivi/modules/minecraft.nix diff --git a/devices/servivi/modules/nfs.nix b/configurations/servivi/modules/nfs.nix similarity index 100% rename from devices/servivi/modules/nfs.nix rename to configurations/servivi/modules/nfs.nix diff --git a/devices/servivi/modules/pr-tracker.nix b/configurations/servivi/modules/pr-tracker.nix similarity index 100% rename from devices/servivi/modules/pr-tracker.nix rename to configurations/servivi/modules/pr-tracker.nix diff --git a/devices/wim/default.nix b/configurations/wim/default.nix similarity index 100% rename from devices/wim/default.nix rename to configurations/wim/default.nix diff --git a/devices/wim/hardware-configuration.nix b/configurations/wim/hardware-configuration.nix similarity index 100% rename from devices/wim/hardware-configuration.nix rename to configurations/wim/hardware-configuration.nix diff --git a/devices/wim/modules/default.nix b/configurations/wim/modules/default.nix similarity index 100% rename from devices/wim/modules/default.nix rename to configurations/wim/modules/default.nix diff --git a/devices/wim/modules/security.nix b/configurations/wim/modules/security.nix similarity index 100% rename from devices/wim/modules/security.nix rename to configurations/wim/modules/security.nix diff --git a/devShells/default.nix b/devShells/default.nix new file mode 100644 index 00000000..44e178eb --- /dev/null +++ b/devShells/default.nix @@ -0,0 +1,104 @@ +{pkgs, ...}: let + inherit (builtins) attrValues; + + bumpNpmDeps = pkgs.writeShellApplication { + name = "bumpNpmDeps"; + runtimeInputs = attrValues { + inherit + (pkgs) + prefetch-npm-deps + nodejs_latest + ; + }; + text = '' + # this command might fail but still updates the main lockfile + npm i --package-lock-only || true + prefetch-npm-deps ./package-lock.json + ''; + }; +in { + default = pkgs.mkShell { + packages = [ + (pkgs.writeShellApplication { + name = "mkIso"; + + runtimeInputs = attrValues { + inherit + (pkgs) + nix-output-monitor + ; + }; + + text = '' + isoConfig="nixosConfigurations.live-image.config.system.build.isoImage" + nom build "$FLAKE#$isoConfig" + ''; + }) + + (pkgs.writeShellApplication { + name = "fixUidChange"; + + runtimeInputs = attrValues { + inherit + (pkgs) + findutils + gnused + ; + }; + + text = '' + GROUP="$1" + OLD_GID="$2" + NEW_GID="$3" + + # Remove generated group entry + sudo sed -i -e "/^$GROUP:/d" /etc/group + + # Change GID on existing files + sudo find / -gid "$OLD_GID" -exec chgrp "$NEW_GID" {} + + ''; + }) + ]; + }; + + netdaemon = pkgs.mkShell { + packages = attrValues { + inherit + (pkgs.dotnetCorePackages) + sdk_9_0 + ; + }; + }; + + node = pkgs.mkShell { + packages = attrValues { + inherit + (pkgs) + nodejs_latest + ; + + inherit + bumpNpmDeps + ; + }; + }; + + subtitles-dev = pkgs.mkShell { + packages = attrValues { + inherit + (pkgs) + nodejs_latest + ffmpeg-full + ; + + inherit + (pkgs.nodePackages) + ts-node + ; + + inherit + bumpNpmDeps + ; + }; + }; +} diff --git a/inputs/lib.nix b/inputs/lib.nix index e7d85372..112c802e 100644 --- a/inputs/lib.nix +++ b/inputs/lib.nix @@ -8,9 +8,9 @@ let }}/lib"; inherit (lib) attrValues findFirst foldl' hasAttr matchAttrs optionalAttrs recursiveUpdate; - - recursiveUpdateList = list: foldl' recursiveUpdate {} list; in rec { + recursiveUpdateList = list: foldl' recursiveUpdate {} list; + /* * From an attrset, returns a flake input that has its type defaulted * to `github` and has some of its inputs following this flake's input diff --git a/lib/attrs/default.nix b/lib/attrs/default.nix new file mode 100644 index 00000000..c624d8ff --- /dev/null +++ b/lib/attrs/default.nix @@ -0,0 +1,5 @@ +{...}: let + inputsLib = import ../../inputs/lib.nix; +in { + inherit (inputsLib) recursiveUpdateList; +} diff --git a/lib/default.nix b/lib/default.nix index e399bb03..432dce25 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -2,16 +2,17 @@ perSystem, inputs, }: let + attrs = import ./attrs {}; flake = import ./flake inputs; hypr = import ./hypr inputs.nixpkgs.lib; strings = import ./strings inputs.nixpkgs.lib; - lib = flake // hypr // strings; + lib = attrs // flake // hypr // strings; in # Expose main attrs lib # Expose all funcs - // {inherit flake hypr strings;} + // {inherit attrs flake hypr strings;} # Expose funcs that require pkgs // perSystem ( pkgs: diff --git a/nixosModules/ags/config/.envrc b/modules/ags/config/.envrc similarity index 100% rename from nixosModules/ags/config/.envrc rename to modules/ags/config/.envrc diff --git a/nixosModules/ags/config/.gitignore b/modules/ags/config/.gitignore similarity index 100% rename from nixosModules/ags/config/.gitignore rename to modules/ags/config/.gitignore diff --git a/nixosModules/ags/config/app.ts b/modules/ags/config/app.ts similarity index 100% rename from nixosModules/ags/config/app.ts rename to modules/ags/config/app.ts diff --git a/nixosModules/ags/config/configurations/binto.ts b/modules/ags/config/configurations/binto.ts similarity index 100% rename from nixosModules/ags/config/configurations/binto.ts rename to modules/ags/config/configurations/binto.ts diff --git a/nixosModules/ags/config/configurations/greeter.ts b/modules/ags/config/configurations/greeter.ts similarity index 100% rename from nixosModules/ags/config/configurations/greeter.ts rename to modules/ags/config/configurations/greeter.ts diff --git a/nixosModules/ags/config/configurations/lock.ts b/modules/ags/config/configurations/lock.ts similarity index 100% rename from nixosModules/ags/config/configurations/lock.ts rename to modules/ags/config/configurations/lock.ts diff --git a/nixosModules/ags/config/configurations/wim.ts b/modules/ags/config/configurations/wim.ts similarity index 100% rename from nixosModules/ags/config/configurations/wim.ts rename to modules/ags/config/configurations/wim.ts diff --git a/nixosModules/ags/config/default.nix b/modules/ags/config/default.nix similarity index 100% rename from nixosModules/ags/config/default.nix rename to modules/ags/config/default.nix diff --git a/nixosModules/ags/config/env.d.ts b/modules/ags/config/env.d.ts similarity index 100% rename from nixosModules/ags/config/env.d.ts rename to modules/ags/config/env.d.ts diff --git a/nixosModules/ags/config/eslint.config.ts b/modules/ags/config/eslint.config.ts similarity index 100% rename from nixosModules/ags/config/eslint.config.ts rename to modules/ags/config/eslint.config.ts diff --git a/nixosModules/ags/config/lib.ts b/modules/ags/config/lib.ts similarity index 100% rename from nixosModules/ags/config/lib.ts rename to modules/ags/config/lib.ts diff --git a/nixosModules/ags/config/package-lock.json b/modules/ags/config/package-lock.json similarity index 100% rename from nixosModules/ags/config/package-lock.json rename to modules/ags/config/package-lock.json diff --git a/nixosModules/ags/config/package.json b/modules/ags/config/package.json similarity index 100% rename from nixosModules/ags/config/package.json rename to modules/ags/config/package.json diff --git a/nixosModules/ags/config/services/brightness.ts b/modules/ags/config/services/brightness.ts similarity index 100% rename from nixosModules/ags/config/services/brightness.ts rename to modules/ags/config/services/brightness.ts diff --git a/nixosModules/ags/config/services/gpu-screen-recorder.ts b/modules/ags/config/services/gpu-screen-recorder.ts similarity index 100% rename from nixosModules/ags/config/services/gpu-screen-recorder.ts rename to modules/ags/config/services/gpu-screen-recorder.ts diff --git a/nixosModules/ags/config/services/monitor-clicks.ts b/modules/ags/config/services/monitor-clicks.ts similarity index 100% rename from nixosModules/ags/config/services/monitor-clicks.ts rename to modules/ags/config/services/monitor-clicks.ts diff --git a/nixosModules/ags/config/services/tablet.ts b/modules/ags/config/services/tablet.ts similarity index 100% rename from nixosModules/ags/config/services/tablet.ts rename to modules/ags/config/services/tablet.ts diff --git a/nixosModules/ags/config/style/colors.scss b/modules/ags/config/style/colors.scss similarity index 100% rename from nixosModules/ags/config/style/colors.scss rename to modules/ags/config/style/colors.scss diff --git a/nixosModules/ags/config/style/common.scss b/modules/ags/config/style/common.scss similarity index 100% rename from nixosModules/ags/config/style/common.scss rename to modules/ags/config/style/common.scss diff --git a/nixosModules/ags/config/style/greeter.scss b/modules/ags/config/style/greeter.scss similarity index 100% rename from nixosModules/ags/config/style/greeter.scss rename to modules/ags/config/style/greeter.scss diff --git a/nixosModules/ags/config/style/lock.scss b/modules/ags/config/style/lock.scss similarity index 100% rename from nixosModules/ags/config/style/lock.scss rename to modules/ags/config/style/lock.scss diff --git a/nixosModules/ags/config/style/main.scss b/modules/ags/config/style/main.scss similarity index 100% rename from nixosModules/ags/config/style/main.scss rename to modules/ags/config/style/main.scss diff --git a/nixosModules/ags/config/widgets/applauncher/_index.scss b/modules/ags/config/widgets/applauncher/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/applauncher/_index.scss rename to modules/ags/config/widgets/applauncher/_index.scss diff --git a/nixosModules/ags/config/widgets/applauncher/app-item.tsx b/modules/ags/config/widgets/applauncher/app-item.tsx similarity index 100% rename from nixosModules/ags/config/widgets/applauncher/app-item.tsx rename to modules/ags/config/widgets/applauncher/app-item.tsx diff --git a/nixosModules/ags/config/widgets/applauncher/launch.ts b/modules/ags/config/widgets/applauncher/launch.ts similarity index 100% rename from nixosModules/ags/config/widgets/applauncher/launch.ts rename to modules/ags/config/widgets/applauncher/launch.ts diff --git a/nixosModules/ags/config/widgets/applauncher/main.tsx b/modules/ags/config/widgets/applauncher/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/applauncher/main.tsx rename to modules/ags/config/widgets/applauncher/main.tsx diff --git a/nixosModules/ags/config/widgets/audio/_index.scss b/modules/ags/config/widgets/audio/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/audio/_index.scss rename to modules/ags/config/widgets/audio/_index.scss diff --git a/nixosModules/ags/config/widgets/audio/binto.tsx b/modules/ags/config/widgets/audio/binto.tsx similarity index 100% rename from nixosModules/ags/config/widgets/audio/binto.tsx rename to modules/ags/config/widgets/audio/binto.tsx diff --git a/nixosModules/ags/config/widgets/audio/main.tsx b/modules/ags/config/widgets/audio/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/audio/main.tsx rename to modules/ags/config/widgets/audio/main.tsx diff --git a/nixosModules/ags/config/widgets/audio/profiles.tsx b/modules/ags/config/widgets/audio/profiles.tsx similarity index 100% rename from nixosModules/ags/config/widgets/audio/profiles.tsx rename to modules/ags/config/widgets/audio/profiles.tsx diff --git a/nixosModules/ags/config/widgets/audio/streams.tsx b/modules/ags/config/widgets/audio/streams.tsx similarity index 100% rename from nixosModules/ags/config/widgets/audio/streams.tsx rename to modules/ags/config/widgets/audio/streams.tsx diff --git a/nixosModules/ags/config/widgets/audio/wim.tsx b/modules/ags/config/widgets/audio/wim.tsx similarity index 100% rename from nixosModules/ags/config/widgets/audio/wim.tsx rename to modules/ags/config/widgets/audio/wim.tsx diff --git a/nixosModules/ags/config/widgets/bar/_index.scss b/modules/ags/config/widgets/bar/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/bar/_index.scss rename to modules/ags/config/widgets/bar/_index.scss diff --git a/nixosModules/ags/config/widgets/bar/binto.tsx b/modules/ags/config/widgets/bar/binto.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/binto.tsx rename to modules/ags/config/widgets/bar/binto.tsx diff --git a/nixosModules/ags/config/widgets/bar/fullscreen.tsx b/modules/ags/config/widgets/bar/fullscreen.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/fullscreen.tsx rename to modules/ags/config/widgets/bar/fullscreen.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/audio.tsx b/modules/ags/config/widgets/bar/items/audio.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/audio.tsx rename to modules/ags/config/widgets/bar/items/audio.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/battery.tsx b/modules/ags/config/widgets/bar/items/battery.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/battery.tsx rename to modules/ags/config/widgets/bar/items/battery.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/bluetooth.tsx b/modules/ags/config/widgets/bar/items/bluetooth.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/bluetooth.tsx rename to modules/ags/config/widgets/bar/items/bluetooth.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/brightness.tsx b/modules/ags/config/widgets/bar/items/brightness.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/brightness.tsx rename to modules/ags/config/widgets/bar/items/brightness.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/clock.tsx b/modules/ags/config/widgets/bar/items/clock.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/clock.tsx rename to modules/ags/config/widgets/bar/items/clock.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/current-client.tsx b/modules/ags/config/widgets/bar/items/current-client.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/current-client.tsx rename to modules/ags/config/widgets/bar/items/current-client.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/current-icon.tsx b/modules/ags/config/widgets/bar/items/current-icon.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/current-icon.tsx rename to modules/ags/config/widgets/bar/items/current-icon.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/network.tsx b/modules/ags/config/widgets/bar/items/network.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/network.tsx rename to modules/ags/config/widgets/bar/items/network.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/notif-button.tsx b/modules/ags/config/widgets/bar/items/notif-button.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/notif-button.tsx rename to modules/ags/config/widgets/bar/items/notif-button.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/tray.tsx b/modules/ags/config/widgets/bar/items/tray.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/tray.tsx rename to modules/ags/config/widgets/bar/items/tray.tsx diff --git a/nixosModules/ags/config/widgets/bar/items/workspaces.tsx b/modules/ags/config/widgets/bar/items/workspaces.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/items/workspaces.tsx rename to modules/ags/config/widgets/bar/items/workspaces.tsx diff --git a/nixosModules/ags/config/widgets/bar/wim.tsx b/modules/ags/config/widgets/bar/wim.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bar/wim.tsx rename to modules/ags/config/widgets/bar/wim.tsx diff --git a/nixosModules/ags/config/widgets/bg-layer/main.tsx b/modules/ags/config/widgets/bg-layer/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bg-layer/main.tsx rename to modules/ags/config/widgets/bg-layer/main.tsx diff --git a/nixosModules/ags/config/widgets/bluetooth/_index.scss b/modules/ags/config/widgets/bluetooth/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/bluetooth/_index.scss rename to modules/ags/config/widgets/bluetooth/_index.scss diff --git a/nixosModules/ags/config/widgets/bluetooth/device.tsx b/modules/ags/config/widgets/bluetooth/device.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bluetooth/device.tsx rename to modules/ags/config/widgets/bluetooth/device.tsx diff --git a/nixosModules/ags/config/widgets/bluetooth/main.tsx b/modules/ags/config/widgets/bluetooth/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bluetooth/main.tsx rename to modules/ags/config/widgets/bluetooth/main.tsx diff --git a/nixosModules/ags/config/widgets/bluetooth/wim.tsx b/modules/ags/config/widgets/bluetooth/wim.tsx similarity index 100% rename from nixosModules/ags/config/widgets/bluetooth/wim.tsx rename to modules/ags/config/widgets/bluetooth/wim.tsx diff --git a/nixosModules/ags/config/widgets/clipboard/_index.scss b/modules/ags/config/widgets/clipboard/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/clipboard/_index.scss rename to modules/ags/config/widgets/clipboard/_index.scss diff --git a/nixosModules/ags/config/widgets/clipboard/clip-item.tsx b/modules/ags/config/widgets/clipboard/clip-item.tsx similarity index 100% rename from nixosModules/ags/config/widgets/clipboard/clip-item.tsx rename to modules/ags/config/widgets/clipboard/clip-item.tsx diff --git a/nixosModules/ags/config/widgets/clipboard/cliphist.sh b/modules/ags/config/widgets/clipboard/cliphist.sh similarity index 100% rename from nixosModules/ags/config/widgets/clipboard/cliphist.sh rename to modules/ags/config/widgets/clipboard/cliphist.sh diff --git a/nixosModules/ags/config/widgets/clipboard/main.tsx b/modules/ags/config/widgets/clipboard/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/clipboard/main.tsx rename to modules/ags/config/widgets/clipboard/main.tsx diff --git a/nixosModules/ags/config/widgets/corners/main.tsx b/modules/ags/config/widgets/corners/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/corners/main.tsx rename to modules/ags/config/widgets/corners/main.tsx diff --git a/nixosModules/ags/config/widgets/corners/screen-corners.tsx b/modules/ags/config/widgets/corners/screen-corners.tsx similarity index 100% rename from nixosModules/ags/config/widgets/corners/screen-corners.tsx rename to modules/ags/config/widgets/corners/screen-corners.tsx diff --git a/nixosModules/ags/config/widgets/date/_index.scss b/modules/ags/config/widgets/date/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/date/_index.scss rename to modules/ags/config/widgets/date/_index.scss diff --git a/nixosModules/ags/config/widgets/date/binto.tsx b/modules/ags/config/widgets/date/binto.tsx similarity index 100% rename from nixosModules/ags/config/widgets/date/binto.tsx rename to modules/ags/config/widgets/date/binto.tsx diff --git a/nixosModules/ags/config/widgets/date/main.tsx b/modules/ags/config/widgets/date/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/date/main.tsx rename to modules/ags/config/widgets/date/main.tsx diff --git a/nixosModules/ags/config/widgets/date/wim.tsx b/modules/ags/config/widgets/date/wim.tsx similarity index 100% rename from nixosModules/ags/config/widgets/date/wim.tsx rename to modules/ags/config/widgets/date/wim.tsx diff --git a/nixosModules/ags/config/widgets/greeter/main.tsx b/modules/ags/config/widgets/greeter/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/greeter/main.tsx rename to modules/ags/config/widgets/greeter/main.tsx diff --git a/nixosModules/ags/config/widgets/icon-browser/_index.scss b/modules/ags/config/widgets/icon-browser/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/icon-browser/_index.scss rename to modules/ags/config/widgets/icon-browser/_index.scss diff --git a/nixosModules/ags/config/widgets/icon-browser/main.tsx b/modules/ags/config/widgets/icon-browser/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/icon-browser/main.tsx rename to modules/ags/config/widgets/icon-browser/main.tsx diff --git a/nixosModules/ags/config/widgets/lockscreen/_index.scss b/modules/ags/config/widgets/lockscreen/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/lockscreen/_index.scss rename to modules/ags/config/widgets/lockscreen/_index.scss diff --git a/nixosModules/ags/config/widgets/lockscreen/main.tsx b/modules/ags/config/widgets/lockscreen/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/lockscreen/main.tsx rename to modules/ags/config/widgets/lockscreen/main.tsx diff --git a/nixosModules/ags/config/widgets/misc/_index.scss b/modules/ags/config/widgets/misc/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/misc/_index.scss rename to modules/ags/config/widgets/misc/_index.scss diff --git a/nixosModules/ags/config/widgets/misc/popup-window.tsx b/modules/ags/config/widgets/misc/popup-window.tsx similarity index 100% rename from nixosModules/ags/config/widgets/misc/popup-window.tsx rename to modules/ags/config/widgets/misc/popup-window.tsx diff --git a/nixosModules/ags/config/widgets/misc/separator.tsx b/modules/ags/config/widgets/misc/separator.tsx similarity index 100% rename from nixosModules/ags/config/widgets/misc/separator.tsx rename to modules/ags/config/widgets/misc/separator.tsx diff --git a/nixosModules/ags/config/widgets/misc/smooth-progress.tsx b/modules/ags/config/widgets/misc/smooth-progress.tsx similarity index 100% rename from nixosModules/ags/config/widgets/misc/smooth-progress.tsx rename to modules/ags/config/widgets/misc/smooth-progress.tsx diff --git a/nixosModules/ags/config/widgets/misc/sorted-list.tsx b/modules/ags/config/widgets/misc/sorted-list.tsx similarity index 100% rename from nixosModules/ags/config/widgets/misc/sorted-list.tsx rename to modules/ags/config/widgets/misc/sorted-list.tsx diff --git a/nixosModules/ags/config/widgets/misc/subclasses.tsx b/modules/ags/config/widgets/misc/subclasses.tsx similarity index 100% rename from nixosModules/ags/config/widgets/misc/subclasses.tsx rename to modules/ags/config/widgets/misc/subclasses.tsx diff --git a/nixosModules/ags/config/widgets/notifs/_index.scss b/modules/ags/config/widgets/notifs/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/notifs/_index.scss rename to modules/ags/config/widgets/notifs/_index.scss diff --git a/nixosModules/ags/config/widgets/notifs/binto.tsx b/modules/ags/config/widgets/notifs/binto.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/binto.tsx rename to modules/ags/config/widgets/notifs/binto.tsx diff --git a/nixosModules/ags/config/widgets/notifs/center.tsx b/modules/ags/config/widgets/notifs/center.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/center.tsx rename to modules/ags/config/widgets/notifs/center.tsx diff --git a/nixosModules/ags/config/widgets/notifs/gesture.tsx b/modules/ags/config/widgets/notifs/gesture.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/gesture.tsx rename to modules/ags/config/widgets/notifs/gesture.tsx diff --git a/nixosModules/ags/config/widgets/notifs/notification.tsx b/modules/ags/config/widgets/notifs/notification.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/notification.tsx rename to modules/ags/config/widgets/notifs/notification.tsx diff --git a/nixosModules/ags/config/widgets/notifs/popups.tsx b/modules/ags/config/widgets/notifs/popups.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/popups.tsx rename to modules/ags/config/widgets/notifs/popups.tsx diff --git a/nixosModules/ags/config/widgets/notifs/wim.tsx b/modules/ags/config/widgets/notifs/wim.tsx similarity index 100% rename from nixosModules/ags/config/widgets/notifs/wim.tsx rename to modules/ags/config/widgets/notifs/wim.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-display/_index.scss b/modules/ags/config/widgets/on-screen-display/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-display/_index.scss rename to modules/ags/config/widgets/on-screen-display/_index.scss diff --git a/nixosModules/ags/config/widgets/on-screen-display/main.tsx b/modules/ags/config/widgets/on-screen-display/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-display/main.tsx rename to modules/ags/config/widgets/on-screen-display/main.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/_index.scss b/modules/ags/config/widgets/on-screen-keyboard/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/_index.scss rename to modules/ags/config/widgets/on-screen-keyboard/_index.scss diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/arcs.tsx b/modules/ags/config/widgets/on-screen-keyboard/arcs.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/arcs.tsx rename to modules/ags/config/widgets/on-screen-keyboard/arcs.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/gesture.ts b/modules/ags/config/widgets/on-screen-keyboard/gesture.ts similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/gesture.ts rename to modules/ags/config/widgets/on-screen-keyboard/gesture.ts diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/keyboard-layouts.ts b/modules/ags/config/widgets/on-screen-keyboard/keyboard-layouts.ts similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/keyboard-layouts.ts rename to modules/ags/config/widgets/on-screen-keyboard/keyboard-layouts.ts diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/keyboard.tsx b/modules/ags/config/widgets/on-screen-keyboard/keyboard.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/keyboard.tsx rename to modules/ags/config/widgets/on-screen-keyboard/keyboard.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/keys.tsx b/modules/ags/config/widgets/on-screen-keyboard/keys.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/keys.tsx rename to modules/ags/config/widgets/on-screen-keyboard/keys.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/main.tsx b/modules/ags/config/widgets/on-screen-keyboard/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/main.tsx rename to modules/ags/config/widgets/on-screen-keyboard/main.tsx diff --git a/nixosModules/ags/config/widgets/on-screen-keyboard/osk-window.tsx b/modules/ags/config/widgets/on-screen-keyboard/osk-window.tsx similarity index 100% rename from nixosModules/ags/config/widgets/on-screen-keyboard/osk-window.tsx rename to modules/ags/config/widgets/on-screen-keyboard/osk-window.tsx diff --git a/nixosModules/ags/config/widgets/powermenu/_index.scss b/modules/ags/config/widgets/powermenu/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/powermenu/_index.scss rename to modules/ags/config/widgets/powermenu/_index.scss diff --git a/nixosModules/ags/config/widgets/powermenu/main.tsx b/modules/ags/config/widgets/powermenu/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/powermenu/main.tsx rename to modules/ags/config/widgets/powermenu/main.tsx diff --git a/nixosModules/ags/config/widgets/screenshot/_index.scss b/modules/ags/config/widgets/screenshot/_index.scss similarity index 100% rename from nixosModules/ags/config/widgets/screenshot/_index.scss rename to modules/ags/config/widgets/screenshot/_index.scss diff --git a/nixosModules/ags/config/widgets/screenshot/capture.sh b/modules/ags/config/widgets/screenshot/capture.sh similarity index 100% rename from nixosModules/ags/config/widgets/screenshot/capture.sh rename to modules/ags/config/widgets/screenshot/capture.sh diff --git a/nixosModules/ags/config/widgets/screenshot/main.tsx b/modules/ags/config/widgets/screenshot/main.tsx similarity index 100% rename from nixosModules/ags/config/widgets/screenshot/main.tsx rename to modules/ags/config/widgets/screenshot/main.tsx diff --git a/nixosModules/ags/default.nix b/modules/ags/default.nix similarity index 98% rename from nixosModules/ags/default.nix rename to modules/ags/default.nix index a636af51..3e90962b 100644 --- a/nixosModules/ags/default.nix +++ b/modules/ags/default.nix @@ -11,7 +11,7 @@ self: { cfgDesktop = config.roles.desktop; flakeDir = config.environment.variables.FLAKE; - agsConfigDir = "${removePrefix "/home/${cfgDesktop.user}/" flakeDir}/nixosModules/ags/config"; + agsConfigDir = "${removePrefix "/home/${cfgDesktop.user}/" flakeDir}/modules/ags/config"; hmOpts = {lib, ...}: { options.programs.ags = { diff --git a/nixosModules/ags/hyprland.nix b/modules/ags/hyprland.nix similarity index 100% rename from nixosModules/ags/hyprland.nix rename to modules/ags/hyprland.nix diff --git a/nixosModules/ags/packages.nix b/modules/ags/packages.nix similarity index 100% rename from nixosModules/ags/packages.nix rename to modules/ags/packages.nix diff --git a/nixosModules/ags/v1/config/global-types.d.ts b/modules/ags/v1/config/global-types.d.ts similarity index 100% rename from nixosModules/ags/v1/config/global-types.d.ts rename to modules/ags/v1/config/global-types.d.ts diff --git a/nixosModules/ags/v1/config/scss/player.scss b/modules/ags/v1/config/scss/player.scss similarity index 100% rename from nixosModules/ags/v1/config/scss/player.scss rename to modules/ags/v1/config/scss/player.scss diff --git a/nixosModules/ags/v1/config/scss/quick-settings.scss b/modules/ags/v1/config/scss/quick-settings.scss similarity index 100% rename from nixosModules/ags/v1/config/scss/quick-settings.scss rename to modules/ags/v1/config/scss/quick-settings.scss diff --git a/nixosModules/ags/v1/config/ts/bar/heart.ts b/modules/ags/v1/config/ts/bar/heart.ts similarity index 100% rename from nixosModules/ags/v1/config/ts/bar/heart.ts rename to modules/ags/v1/config/ts/bar/heart.ts diff --git a/nixosModules/ags/v1/config/ts/bar/keyboard-layout.ts b/modules/ags/v1/config/ts/bar/keyboard-layout.ts similarity index 100% rename from nixosModules/ags/v1/config/ts/bar/keyboard-layout.ts rename to modules/ags/v1/config/ts/bar/keyboard-layout.ts diff --git a/nixosModules/ags/v1/config/ts/media-player/gesture.ts b/modules/ags/v1/config/ts/media-player/gesture.ts similarity index 100% rename from nixosModules/ags/v1/config/ts/media-player/gesture.ts rename to modules/ags/v1/config/ts/media-player/gesture.ts diff --git a/nixosModules/ags/v1/config/ts/media-player/mpris.ts b/modules/ags/v1/config/ts/media-player/mpris.ts similarity index 100% rename from nixosModules/ags/v1/config/ts/media-player/mpris.ts rename to modules/ags/v1/config/ts/media-player/mpris.ts diff --git a/nixosModules/ags/v1/config/ts/media-player/player.ts b/modules/ags/v1/config/ts/media-player/player.ts similarity index 100% rename from nixosModules/ags/v1/config/ts/media-player/player.ts rename to modules/ags/v1/config/ts/media-player/player.ts diff --git a/nixosModules/ags/v1/icons.nix b/modules/ags/v1/icons.nix similarity index 100% rename from nixosModules/ags/v1/icons.nix rename to modules/ags/v1/icons.nix diff --git a/nixosModules/base/common-nix/default.nix b/modules/base/common-nix/default.nix similarity index 100% rename from nixosModules/base/common-nix/default.nix rename to modules/base/common-nix/default.nix diff --git a/nixosModules/base/default-droid.nix b/modules/base/default-droid.nix similarity index 100% rename from nixosModules/base/default-droid.nix rename to modules/base/default-droid.nix diff --git a/nixosModules/base/default.nix b/modules/base/default.nix similarity index 100% rename from nixosModules/base/default.nix rename to modules/base/default.nix diff --git a/nixosModules/base/locale/default.nix b/modules/base/locale/default.nix similarity index 100% rename from nixosModules/base/locale/default.nix rename to modules/base/locale/default.nix diff --git a/nixosModules/base/locate/default.nix b/modules/base/locate/default.nix similarity index 100% rename from nixosModules/base/locate/default.nix rename to modules/base/locate/default.nix diff --git a/nixosModules/base/packages/default.nix b/modules/base/packages/default.nix similarity index 100% rename from nixosModules/base/packages/default.nix rename to modules/base/packages/default.nix diff --git a/nixosModules/base/substituters/default.nix b/modules/base/substituters/default.nix similarity index 100% rename from nixosModules/base/substituters/default.nix rename to modules/base/substituters/default.nix diff --git a/nixosModules/borgbackup/default.nix b/modules/borgbackup/default.nix similarity index 100% rename from nixosModules/borgbackup/default.nix rename to modules/borgbackup/default.nix diff --git a/nixosModules/borgbackup/module.nix b/modules/borgbackup/module.nix similarity index 100% rename from nixosModules/borgbackup/module.nix rename to modules/borgbackup/module.nix diff --git a/nixosModules/default.nix b/modules/default.nix similarity index 100% rename from nixosModules/default.nix rename to modules/default.nix diff --git a/nixosModules/desktop/default.nix b/modules/desktop/default.nix similarity index 100% rename from nixosModules/desktop/default.nix rename to modules/desktop/default.nix diff --git a/nixosModules/desktop/environment/config/dolphinrc b/modules/desktop/environment/config/dolphinrc similarity index 100% rename from nixosModules/desktop/environment/config/dolphinrc rename to modules/desktop/environment/config/dolphinrc diff --git a/nixosModules/desktop/environment/config/kdeglobals b/modules/desktop/environment/config/kdeglobals similarity index 100% rename from nixosModules/desktop/environment/config/kdeglobals rename to modules/desktop/environment/config/kdeglobals diff --git a/nixosModules/desktop/environment/config/kiorc b/modules/desktop/environment/config/kiorc similarity index 100% rename from nixosModules/desktop/environment/config/kiorc rename to modules/desktop/environment/config/kiorc diff --git a/nixosModules/desktop/environment/config/mimeapps.list b/modules/desktop/environment/config/mimeapps.list similarity index 100% rename from nixosModules/desktop/environment/config/mimeapps.list rename to modules/desktop/environment/config/mimeapps.list diff --git a/nixosModules/desktop/environment/default.nix b/modules/desktop/environment/default.nix similarity index 100% rename from nixosModules/desktop/environment/default.nix rename to modules/desktop/environment/default.nix diff --git a/nixosModules/desktop/environment/home/dev.nix b/modules/desktop/environment/home/dev.nix similarity index 100% rename from nixosModules/desktop/environment/home/dev.nix rename to modules/desktop/environment/home/dev.nix diff --git a/nixosModules/desktop/environment/home/foot.nix b/modules/desktop/environment/home/foot.nix similarity index 100% rename from nixosModules/desktop/environment/home/foot.nix rename to modules/desktop/environment/home/foot.nix diff --git a/nixosModules/desktop/environment/home/hyprexpo.nix b/modules/desktop/environment/home/hyprexpo.nix similarity index 100% rename from nixosModules/desktop/environment/home/hyprexpo.nix rename to modules/desktop/environment/home/hyprexpo.nix diff --git a/nixosModules/desktop/environment/home/hyprgrass.nix b/modules/desktop/environment/home/hyprgrass.nix similarity index 100% rename from nixosModules/desktop/environment/home/hyprgrass.nix rename to modules/desktop/environment/home/hyprgrass.nix diff --git a/nixosModules/desktop/environment/home/inputs.nix b/modules/desktop/environment/home/inputs.nix similarity index 100% rename from nixosModules/desktop/environment/home/inputs.nix rename to modules/desktop/environment/home/inputs.nix diff --git a/nixosModules/desktop/environment/home/mpv.nix b/modules/desktop/environment/home/mpv.nix similarity index 100% rename from nixosModules/desktop/environment/home/mpv.nix rename to modules/desktop/environment/home/mpv.nix diff --git a/nixosModules/desktop/environment/home/obs.nix b/modules/desktop/environment/home/obs.nix similarity index 100% rename from nixosModules/desktop/environment/home/obs.nix rename to modules/desktop/environment/home/obs.nix diff --git a/nixosModules/desktop/environment/modules/audio.nix b/modules/desktop/environment/modules/audio.nix similarity index 100% rename from nixosModules/desktop/environment/modules/audio.nix rename to modules/desktop/environment/modules/audio.nix diff --git a/nixosModules/desktop/environment/modules/dconf.nix b/modules/desktop/environment/modules/dconf.nix similarity index 100% rename from nixosModules/desktop/environment/modules/dconf.nix rename to modules/desktop/environment/modules/dconf.nix diff --git a/nixosModules/desktop/environment/modules/dolphin.nix b/modules/desktop/environment/modules/dolphin.nix similarity index 100% rename from nixosModules/desktop/environment/modules/dolphin.nix rename to modules/desktop/environment/modules/dolphin.nix diff --git a/nixosModules/desktop/environment/modules/packages.nix b/modules/desktop/environment/modules/packages.nix similarity index 98% rename from nixosModules/desktop/environment/modules/packages.nix rename to modules/desktop/environment/modules/packages.nix index 4250fecc..63a9ba32 100644 --- a/nixosModules/desktop/environment/modules/packages.nix +++ b/modules/desktop/environment/modules/packages.nix @@ -44,7 +44,7 @@ in { ({config, ...}: let inherit (config.lib.file) mkOutOfStoreSymlink; - configDir = "${flakeDir}/nixosModules/desktop/environment/config"; + configDir = "${flakeDir}/modules/desktop/environment/config"; in { xdg.configFile = { "dolphinrc".source = mkOutOfStoreSymlink "${configDir}/dolphinrc"; diff --git a/nixosModules/desktop/environment/modules/printer.nix b/modules/desktop/environment/modules/printer.nix similarity index 100% rename from nixosModules/desktop/environment/modules/printer.nix rename to modules/desktop/environment/modules/printer.nix diff --git a/nixosModules/desktop/environment/modules/ratbag-mice.nix b/modules/desktop/environment/modules/ratbag-mice.nix similarity index 100% rename from nixosModules/desktop/environment/modules/ratbag-mice.nix rename to modules/desktop/environment/modules/ratbag-mice.nix diff --git a/nixosModules/desktop/environment/modules/security.nix b/modules/desktop/environment/modules/security.nix similarity index 98% rename from nixosModules/desktop/environment/modules/security.nix rename to modules/desktop/environment/modules/security.nix index 5814ab87..b7f4302a 100644 --- a/nixosModules/desktop/environment/modules/security.nix +++ b/modules/desktop/environment/modules/security.nix @@ -13,7 +13,7 @@ self: { hmCfg = config.home-manager.users.${cfg.user}; hyprPkg = hmCfg.wayland.windowManager.hyprland.finalPackage; - # See nixosModules/ags/packages.nix + # See modules/ags/packages.nix lockPkg = hmCfg.programs.ags.lockPkg; runInDesktop = pkgs.writeShellApplication { diff --git a/nixosModules/desktop/manager/ags.nix b/modules/desktop/manager/ags.nix similarity index 100% rename from nixosModules/desktop/manager/ags.nix rename to modules/desktop/manager/ags.nix diff --git a/nixosModules/desktop/manager/default.nix b/modules/desktop/manager/default.nix similarity index 100% rename from nixosModules/desktop/manager/default.nix rename to modules/desktop/manager/default.nix diff --git a/nixosModules/desktop/manager/hyprland.nix b/modules/desktop/manager/hyprland.nix similarity index 100% rename from nixosModules/desktop/manager/hyprland.nix rename to modules/desktop/manager/hyprland.nix diff --git a/nixosModules/desktop/manager/setupMonitors.nix b/modules/desktop/manager/setupMonitors.nix similarity index 100% rename from nixosModules/desktop/manager/setupMonitors.nix rename to modules/desktop/manager/setupMonitors.nix diff --git a/nixosModules/desktop/theme/cursors.nix b/modules/desktop/theme/cursors.nix similarity index 100% rename from nixosModules/desktop/theme/cursors.nix rename to modules/desktop/theme/cursors.nix diff --git a/nixosModules/desktop/theme/default.nix b/modules/desktop/theme/default.nix similarity index 100% rename from nixosModules/desktop/theme/default.nix rename to modules/desktop/theme/default.nix diff --git a/nixosModules/desktop/theme/gtk/default.nix b/modules/desktop/theme/gtk/default.nix similarity index 100% rename from nixosModules/desktop/theme/gtk/default.nix rename to modules/desktop/theme/gtk/default.nix diff --git a/nixosModules/desktop/theme/gtk/gradience.nix b/modules/desktop/theme/gtk/gradience.nix similarity index 100% rename from nixosModules/desktop/theme/gtk/gradience.nix rename to modules/desktop/theme/gtk/gradience.nix diff --git a/nixosModules/desktop/theme/hyprpaper.nix b/modules/desktop/theme/hyprpaper.nix similarity index 100% rename from nixosModules/desktop/theme/hyprpaper.nix rename to modules/desktop/theme/hyprpaper.nix diff --git a/nixosModules/desktop/theme/qt.nix b/modules/desktop/theme/qt.nix similarity index 100% rename from nixosModules/desktop/theme/qt.nix rename to modules/desktop/theme/qt.nix diff --git a/nixosModules/desktop/theme/xresources.nix b/modules/desktop/theme/xresources.nix similarity index 100% rename from nixosModules/desktop/theme/xresources.nix rename to modules/desktop/theme/xresources.nix diff --git a/nixosModules/docker/.template/compose.nix b/modules/docker/.template/compose.nix similarity index 100% rename from nixosModules/docker/.template/compose.nix rename to modules/docker/.template/compose.nix diff --git a/nixosModules/docker/.template/images/image.nix b/modules/docker/.template/images/image.nix similarity index 100% rename from nixosModules/docker/.template/images/image.nix rename to modules/docker/.template/images/image.nix diff --git a/nixosModules/docker/default.nix b/modules/docker/default.nix similarity index 100% rename from nixosModules/docker/default.nix rename to modules/docker/default.nix diff --git a/nixosModules/docker/updateImage.nix b/modules/docker/updateImage.nix similarity index 100% rename from nixosModules/docker/updateImage.nix rename to modules/docker/updateImage.nix diff --git a/nixosModules/esphome-plus/default.nix b/modules/esphome-plus/default.nix similarity index 100% rename from nixosModules/esphome-plus/default.nix rename to modules/esphome-plus/default.nix diff --git a/nixosModules/ha-plus/default.nix b/modules/ha-plus/default.nix similarity index 100% rename from nixosModules/ha-plus/default.nix rename to modules/ha-plus/default.nix diff --git a/nixosModules/kmscon/default.nix b/modules/kmscon/default.nix similarity index 100% rename from nixosModules/kmscon/default.nix rename to modules/kmscon/default.nix diff --git a/nixosModules/nvidia/default.nix b/modules/nvidia/default.nix similarity index 100% rename from nixosModules/nvidia/default.nix rename to modules/nvidia/default.nix diff --git a/nixosModules/plymouth/default.nix b/modules/plymouth/default.nix similarity index 100% rename from nixosModules/plymouth/default.nix rename to modules/plymouth/default.nix diff --git a/nixosModules/server/default.nix b/modules/server/default.nix similarity index 100% rename from nixosModules/server/default.nix rename to modules/server/default.nix diff --git a/nixosModules/server/sshd.nix b/modules/server/sshd.nix similarity index 100% rename from nixosModules/server/sshd.nix rename to modules/server/sshd.nix diff --git a/nixosModules/server/tailscale.nix b/modules/server/tailscale.nix similarity index 100% rename from nixosModules/server/tailscale.nix rename to modules/server/tailscale.nix diff --git a/nixosModules/tmux/default.nix b/modules/tmux/default.nix similarity index 100% rename from nixosModules/tmux/default.nix rename to modules/tmux/default.nix diff --git a/nixosModules/wyoming-plus/default.nix b/modules/wyoming-plus/default.nix similarity index 100% rename from nixosModules/wyoming-plus/default.nix rename to modules/wyoming-plus/default.nix diff --git a/nixosModules/wyoming-plus/pkgs/default.nix b/modules/wyoming-plus/pkgs/default.nix similarity index 100% rename from nixosModules/wyoming-plus/pkgs/default.nix rename to modules/wyoming-plus/pkgs/default.nix diff --git a/nixosModules/wyoming-plus/pkgs/openwakeword.nix b/modules/wyoming-plus/pkgs/openwakeword.nix similarity index 100% rename from nixosModules/wyoming-plus/pkgs/openwakeword.nix rename to modules/wyoming-plus/pkgs/openwakeword.nix diff --git a/nixosModules/wyoming-plus/pkgs/speexdsp-ns.nix b/modules/wyoming-plus/pkgs/speexdsp-ns.nix similarity index 100% rename from nixosModules/wyoming-plus/pkgs/speexdsp-ns.nix rename to modules/wyoming-plus/pkgs/speexdsp-ns.nix diff --git a/nixosModules/wyoming-plus/pkgs/tflite-runtime.nix b/modules/wyoming-plus/pkgs/tflite-runtime.nix similarity index 100% rename from nixosModules/wyoming-plus/pkgs/tflite-runtime.nix rename to modules/wyoming-plus/pkgs/tflite-runtime.nix diff --git a/nixosModules/wyoming-plus/pkgs/wyoming-openwakeword.nix b/modules/wyoming-plus/pkgs/wyoming-openwakeword.nix similarity index 100% rename from nixosModules/wyoming-plus/pkgs/wyoming-openwakeword.nix rename to modules/wyoming-plus/pkgs/wyoming-openwakeword.nix diff --git a/checks/apps/default.nix b/nixFastChecks/apps/default.nix similarity index 100% rename from checks/apps/default.nix rename to nixFastChecks/apps/default.nix diff --git a/nixFastChecks/default.nix b/nixFastChecks/default.nix new file mode 100644 index 00000000..4de28e46 --- /dev/null +++ b/nixFastChecks/default.nix @@ -0,0 +1,26 @@ +# Inspired by : +# https://github.com/Mic92/dotfiles/blob/c2f538934d67417941f83d8bb65b8263c43d32ca/flake.nix#L168 +{ + perSystem, + self, + ... +}: let + inherit (self.lib.attrs) recursiveUpdateList; + + aptDevices = perSystem (pkgs: + import ./devices { + onlyApt = true; + inherit pkgs self; + }); + + apps = perSystem (pkgs: import ./apps {inherit pkgs self;}); + devices = perSystem (pkgs: import ./devices {inherit pkgs self;}); + devShells = perSystem (pkgs: import ./devShells {inherit pkgs self;}); + packages = perSystem (pkgs: import ./packages {inherit pkgs self;}); +in { + # Allow homie to serve a binary cache for the devices away from servivi + aptDevices = recursiveUpdateList [aptDevices devShells]; + + all = recursiveUpdateList [apps devices devShells packages]; + inherit apps devices devShells packages; +} diff --git a/checks/devShells/default.nix b/nixFastChecks/devShells/default.nix similarity index 100% rename from checks/devShells/default.nix rename to nixFastChecks/devShells/default.nix diff --git a/checks/devices/default.nix b/nixFastChecks/devices/default.nix similarity index 81% rename from checks/devices/default.nix rename to nixFastChecks/devices/default.nix index 638277fd..5feb09e1 100644 --- a/checks/devices/default.nix +++ b/nixFastChecks/devices/default.nix @@ -1,4 +1,3 @@ -# CI: https://github.com/Mic92/dotfiles/blob/c2f538934d67417941f83d8bb65b8263c43d32ca/flake.nix#L168 { pkgs, self, diff --git a/checks/packages/default.nix b/nixFastChecks/packages/default.nix similarity index 100% rename from checks/packages/default.nix rename to nixFastChecks/packages/default.nix diff --git a/outputs.nix b/outputs.nix index cbf4bd98..f7de7076 100644 --- a/outputs.nix +++ b/outputs.nix @@ -42,10 +42,10 @@ mainInputs // extraInputs; outputs = inputs @ { - nixpkgs, - secrets, self, systems, + nixpkgs, + secrets, ... }: let inherit (self.lib) mkVersion mkNixOS mkNixOnDroid mkPkgs; @@ -56,33 +56,32 @@ in { lib = import ./lib {inherit inputs perSystem;}; - nixosModules = import ./nixosModules self; - - homeManagerModules = import ./homeManagerModules self; + nixOnDroidConfigurations.default = + mkNixOnDroid [./configurations/android]; nixosConfigurations = { # Desktops wim = mkNixOS { extraModules = [ - ./devices/wim + ./configurations/wim secrets.nixosModules.default ]; }; binto = mkNixOS { cudaSupport = true; - extraModules = [./devices/binto]; + extraModules = [./configurations/binto]; }; bbsteamie = mkNixOS { mainUser = "mariah"; - extraModules = [./devices/bbsteamie]; + extraModules = [./configurations/bbsteamie]; }; # NAS nos = mkNixOS { cudaSupport = true; extraModules = [ - ./devices/nos + ./configurations/nos secrets.nixosModules.nos ]; }; @@ -90,7 +89,7 @@ # Build / test server servivi = mkNixOS { extraModules = [ - ./devices/servivi + ./configurations/servivi secrets.nixosModules.servivi ]; }; @@ -98,7 +97,7 @@ # Home-assistant homie = mkNixOS { extraModules = [ - ./devices/homie + ./configurations/homie secrets.nixosModules.homie ]; }; @@ -106,35 +105,31 @@ # Cluster thingone = mkNixOS { extraModules = [ - (import ./devices/cluster "thingone") + (import ./configurations/cluster "thingone") secrets.nixosModules.thingy ]; }; thingtwo = mkNixOS { extraModules = [ - (import ./devices/cluster "thingtwo") + (import ./configurations/cluster "thingtwo") secrets.nixosModules.thingy ]; }; live-image = mkNixOS { mainUser = "nixos"; - extraModules = [./devices/live-image]; + extraModules = [./configurations/live-image]; }; }; - nixOnDroidConfigurations.default = - mkNixOnDroid [./devices/android]; + # For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show + nixFastChecks = import ./nixFastChecks {inherit perSystem self;}; - scopedPackages = - perSystem (pkgs: - import ./scopedPackages {inherit inputs mkVersion pkgs;}); + homeManagerModules = import ./homeManagerModules self; - packages = - perSystem (pkgs: - import ./packages {inherit inputs mkVersion pkgs;}); + nixosModules = import ./modules self; - overlays = import ./overlays {inherit self;}; + overlays = import ./overlays self; apps = perSystem (pkgs: @@ -144,88 +139,17 @@ perSystem (pkgs: import ./apps/nix/packages.nix {inherit pkgs self;}); - devShells = perSystem (pkgs: let - inherit (builtins) attrValues; - - bumpNpmDeps = pkgs.writeShellApplication { - name = "bumpNpmDeps"; - runtimeInputs = attrValues { - inherit - (pkgs) - prefetch-npm-deps - nodejs_latest - ; - }; - text = '' - npm i --package-lock-only || true # this command will fail but still updates the main lockfile - prefetch-npm-deps ./package-lock.json - ''; - }; - in { - default = pkgs.mkShell { - packages = [ - (pkgs.writeShellScriptBin "mkIso" '' - isoConfig="nixosConfigurations.live-image.config.system.build.isoImage" - nom build $(realpath /etc/nixos)#$isoConfig - '') - (pkgs.writeShellApplication { - name = "fixUidChange"; - text = '' - GROUP="$1" - OLD_GID="$2" - NEW_GID="$3" - - sudo sed -i -e "/^$GROUP:/d" /etc/group # Remove generated group entry - sudo find / -gid "$OLD_GID" -exec chgrp "$NEW_GID" {} + # Change GID on existing files - exec nh os switch # Regenerate /etc/group with new GID - ''; - }) - ]; - }; - - netdaemon = pkgs.mkShell { - packages = [ - pkgs.dotnet-sdk_9 - ]; - }; - - node = pkgs.mkShell { - packages = attrValues { - inherit - (pkgs) - nodejs_latest - ; - - inherit - bumpNpmDeps - ; - }; - }; - - subtitles-dev = pkgs.mkShell { - packages = attrValues { - inherit - (pkgs) - nodejs_latest - ffmpeg-full - ; - - inherit - (pkgs.nodePackages) - ts-node - ; - - inherit - bumpNpmDeps - ; - }; - }; - }); - - # For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show - nixFastChecks = + devShells = perSystem (pkgs: - import ./checks {inherit pkgs self;}); + import ./devShells {inherit pkgs;}); + + packages = + perSystem (pkgs: + import ./packages {inherit inputs mkVersion pkgs;}); + + scopedPackages = + perSystem (pkgs: + import ./scopedPackages {inherit inputs mkVersion pkgs;}); formatter = perSystem (pkgs: pkgs.alejandra); }; diff --git a/overlays/default.nix b/overlays/default.nix index e78db738..c91b0987 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -{self, ...}: { +self: { build-failures = import ./build-failures; nix-version = import ./nix-version self; xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;