From 0f31678c5292fad585c106c84c0b3c081823798e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 6 Mar 2025 23:46:37 +0000 Subject: [PATCH] Remove the features directory --- nix/modules/home-manager/{features => }/cli/bin.nix | 0 nix/modules/home-manager/{features => }/cli/bluetuith.nix | 0 nix/modules/home-manager/{features => }/cli/default.nix | 0 nix/modules/home-manager/{features => }/cli/direnv.nix | 0 nix/modules/home-manager/{features => }/cli/fzf.nix | 0 nix/modules/home-manager/{features => }/cli/git.nix | 0 nix/modules/home-manager/{features => }/cli/neovim.nix | 0 nix/modules/home-manager/{features => }/cli/notes.nix | 0 nix/modules/home-manager/{features => }/cli/phpactor.nix | 0 nix/modules/home-manager/{features => }/cli/starship.nix | 0 nix/modules/home-manager/{features => }/cli/syncthing.nix | 0 .../home-manager/{features => }/cli/tmux-sessionizer.nix | 0 nix/modules/home-manager/{features => }/cli/tmux.nix | 0 nix/modules/home-manager/{features => }/cli/zsh.nix | 0 .../home-manager/{features => }/cli/zsh/abbreviations.nix | 0 .../home-manager/{features => }/cli/zsh/aliases.nix | 0 nix/modules/home-manager/default.nix | 4 ++-- nix/modules/home-manager/{features => }/desktop/copyq.nix | 0 .../home-manager/{features => }/desktop/default.nix | 0 .../home-manager/{features => }/desktop/discord.nix | 0 nix/modules/home-manager/{features => }/desktop/dwm.nix | 0 .../home-manager/{features => }/desktop/espanso.nix | 0 .../{features => }/desktop/espanso/matches/base.nix | 0 .../home-manager/{features => }/desktop/flameshot.nix | 0 nix/modules/home-manager/{features => }/desktop/gtk.nix | 0 .../home-manager/{features => }/desktop/media/default.nix | 0 .../home-manager/{features => }/desktop/media/gimp.nix | 0 .../{features => }/desktop/media/handbrake.nix | 0 .../{features => }/desktop/media/kdenlive.nix | 0 .../home-manager/{features => }/desktop/media/mpv.nix | 0 .../{features => }/desktop/media/pocket-casts.nix | 0 nix/modules/home-manager/{features => }/desktop/slack.nix | 0 nix/modules/home-manager/{features => }/desktop/zoom.nix | 0 nix/modules/nixos/{features => }/cli/default.nix | 0 nix/modules/nixos/{features => }/cli/docker.nix | 0 nix/modules/nixos/default.nix | 8 ++++---- nix/modules/nixos/{features => }/desktop/autorandr.nix | 0 nix/modules/nixos/{features => }/desktop/default.nix | 0 nix/modules/nixos/{features => }/desktop/dwm.nix | 2 -- nix/modules/nixos/{features => }/desktop/peek.nix | 0 nix/modules/nixos/{features => }/desktop/screenkey.nix | 0 nix/modules/nixos/{features => }/desktop/st.nix | 0 nix/modules/nixos/{features => }/desktop/thunar.nix | 0 nix/modules/nixos/{features => }/gaming.nix | 0 .../nixos/{features => }/homelab/audiobookshelf.nix | 0 .../{features => }/homelab/containers/beaverhabits.nix | 0 .../nixos/{features => }/homelab/containers/default.nix | 0 .../nixos/{features => }/homelab/containers/freshrss.nix | 0 .../nixos/{features => }/homelab/containers/pi-hole.nix | 0 .../{features => }/homelab/containers/tubearchivist.nix | 0 nix/modules/nixos/{features => }/homelab/default.nix | 0 nix/modules/nixos/{features => }/homelab/forgejo.nix | 0 nix/modules/nixos/{features => }/homelab/gitea.nix | 0 nix/modules/nixos/{features => }/homelab/immich.nix | 0 nix/modules/nixos/{features => }/homelab/jellyfin.nix | 0 nix/modules/nixos/{features => }/homelab/paperless.nix | 0 nix/modules/nixos/{features => }/homelab/vaultwarden.nix | 0 57 files changed, 6 insertions(+), 8 deletions(-) rename nix/modules/home-manager/{features => }/cli/bin.nix (100%) rename nix/modules/home-manager/{features => }/cli/bluetuith.nix (100%) rename nix/modules/home-manager/{features => }/cli/default.nix (100%) rename nix/modules/home-manager/{features => }/cli/direnv.nix (100%) rename nix/modules/home-manager/{features => }/cli/fzf.nix (100%) rename nix/modules/home-manager/{features => }/cli/git.nix (100%) rename nix/modules/home-manager/{features => }/cli/neovim.nix (100%) rename nix/modules/home-manager/{features => }/cli/notes.nix (100%) rename nix/modules/home-manager/{features => }/cli/phpactor.nix (100%) rename nix/modules/home-manager/{features => }/cli/starship.nix (100%) rename nix/modules/home-manager/{features => }/cli/syncthing.nix (100%) rename nix/modules/home-manager/{features => }/cli/tmux-sessionizer.nix (100%) rename nix/modules/home-manager/{features => }/cli/tmux.nix (100%) rename nix/modules/home-manager/{features => }/cli/zsh.nix (100%) rename nix/modules/home-manager/{features => }/cli/zsh/abbreviations.nix (100%) rename nix/modules/home-manager/{features => }/cli/zsh/aliases.nix (100%) rename nix/modules/home-manager/{features => }/desktop/copyq.nix (100%) rename nix/modules/home-manager/{features => }/desktop/default.nix (100%) rename nix/modules/home-manager/{features => }/desktop/discord.nix (100%) rename nix/modules/home-manager/{features => }/desktop/dwm.nix (100%) rename nix/modules/home-manager/{features => }/desktop/espanso.nix (100%) rename nix/modules/home-manager/{features => }/desktop/espanso/matches/base.nix (100%) rename nix/modules/home-manager/{features => }/desktop/flameshot.nix (100%) rename nix/modules/home-manager/{features => }/desktop/gtk.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/default.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/gimp.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/handbrake.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/kdenlive.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/mpv.nix (100%) rename nix/modules/home-manager/{features => }/desktop/media/pocket-casts.nix (100%) rename nix/modules/home-manager/{features => }/desktop/slack.nix (100%) rename nix/modules/home-manager/{features => }/desktop/zoom.nix (100%) rename nix/modules/nixos/{features => }/cli/default.nix (100%) rename nix/modules/nixos/{features => }/cli/docker.nix (100%) rename nix/modules/nixos/{features => }/desktop/autorandr.nix (100%) rename nix/modules/nixos/{features => }/desktop/default.nix (100%) rename nix/modules/nixos/{features => }/desktop/dwm.nix (99%) rename nix/modules/nixos/{features => }/desktop/peek.nix (100%) rename nix/modules/nixos/{features => }/desktop/screenkey.nix (100%) rename nix/modules/nixos/{features => }/desktop/st.nix (100%) rename nix/modules/nixos/{features => }/desktop/thunar.nix (100%) rename nix/modules/nixos/{features => }/gaming.nix (100%) rename nix/modules/nixos/{features => }/homelab/audiobookshelf.nix (100%) rename nix/modules/nixos/{features => }/homelab/containers/beaverhabits.nix (100%) rename nix/modules/nixos/{features => }/homelab/containers/default.nix (100%) rename nix/modules/nixos/{features => }/homelab/containers/freshrss.nix (100%) rename nix/modules/nixos/{features => }/homelab/containers/pi-hole.nix (100%) rename nix/modules/nixos/{features => }/homelab/containers/tubearchivist.nix (100%) rename nix/modules/nixos/{features => }/homelab/default.nix (100%) rename nix/modules/nixos/{features => }/homelab/forgejo.nix (100%) rename nix/modules/nixos/{features => }/homelab/gitea.nix (100%) rename nix/modules/nixos/{features => }/homelab/immich.nix (100%) rename nix/modules/nixos/{features => }/homelab/jellyfin.nix (100%) rename nix/modules/nixos/{features => }/homelab/paperless.nix (100%) rename nix/modules/nixos/{features => }/homelab/vaultwarden.nix (100%) diff --git a/nix/modules/home-manager/features/cli/bin.nix b/nix/modules/home-manager/cli/bin.nix similarity index 100% rename from nix/modules/home-manager/features/cli/bin.nix rename to nix/modules/home-manager/cli/bin.nix diff --git a/nix/modules/home-manager/features/cli/bluetuith.nix b/nix/modules/home-manager/cli/bluetuith.nix similarity index 100% rename from nix/modules/home-manager/features/cli/bluetuith.nix rename to nix/modules/home-manager/cli/bluetuith.nix diff --git a/nix/modules/home-manager/features/cli/default.nix b/nix/modules/home-manager/cli/default.nix similarity index 100% rename from nix/modules/home-manager/features/cli/default.nix rename to nix/modules/home-manager/cli/default.nix diff --git a/nix/modules/home-manager/features/cli/direnv.nix b/nix/modules/home-manager/cli/direnv.nix similarity index 100% rename from nix/modules/home-manager/features/cli/direnv.nix rename to nix/modules/home-manager/cli/direnv.nix diff --git a/nix/modules/home-manager/features/cli/fzf.nix b/nix/modules/home-manager/cli/fzf.nix similarity index 100% rename from nix/modules/home-manager/features/cli/fzf.nix rename to nix/modules/home-manager/cli/fzf.nix diff --git a/nix/modules/home-manager/features/cli/git.nix b/nix/modules/home-manager/cli/git.nix similarity index 100% rename from nix/modules/home-manager/features/cli/git.nix rename to nix/modules/home-manager/cli/git.nix diff --git a/nix/modules/home-manager/features/cli/neovim.nix b/nix/modules/home-manager/cli/neovim.nix similarity index 100% rename from nix/modules/home-manager/features/cli/neovim.nix rename to nix/modules/home-manager/cli/neovim.nix diff --git a/nix/modules/home-manager/features/cli/notes.nix b/nix/modules/home-manager/cli/notes.nix similarity index 100% rename from nix/modules/home-manager/features/cli/notes.nix rename to nix/modules/home-manager/cli/notes.nix diff --git a/nix/modules/home-manager/features/cli/phpactor.nix b/nix/modules/home-manager/cli/phpactor.nix similarity index 100% rename from nix/modules/home-manager/features/cli/phpactor.nix rename to nix/modules/home-manager/cli/phpactor.nix diff --git a/nix/modules/home-manager/features/cli/starship.nix b/nix/modules/home-manager/cli/starship.nix similarity index 100% rename from nix/modules/home-manager/features/cli/starship.nix rename to nix/modules/home-manager/cli/starship.nix diff --git a/nix/modules/home-manager/features/cli/syncthing.nix b/nix/modules/home-manager/cli/syncthing.nix similarity index 100% rename from nix/modules/home-manager/features/cli/syncthing.nix rename to nix/modules/home-manager/cli/syncthing.nix diff --git a/nix/modules/home-manager/features/cli/tmux-sessionizer.nix b/nix/modules/home-manager/cli/tmux-sessionizer.nix similarity index 100% rename from nix/modules/home-manager/features/cli/tmux-sessionizer.nix rename to nix/modules/home-manager/cli/tmux-sessionizer.nix diff --git a/nix/modules/home-manager/features/cli/tmux.nix b/nix/modules/home-manager/cli/tmux.nix similarity index 100% rename from nix/modules/home-manager/features/cli/tmux.nix rename to nix/modules/home-manager/cli/tmux.nix diff --git a/nix/modules/home-manager/features/cli/zsh.nix b/nix/modules/home-manager/cli/zsh.nix similarity index 100% rename from nix/modules/home-manager/features/cli/zsh.nix rename to nix/modules/home-manager/cli/zsh.nix diff --git a/nix/modules/home-manager/features/cli/zsh/abbreviations.nix b/nix/modules/home-manager/cli/zsh/abbreviations.nix similarity index 100% rename from nix/modules/home-manager/features/cli/zsh/abbreviations.nix rename to nix/modules/home-manager/cli/zsh/abbreviations.nix diff --git a/nix/modules/home-manager/features/cli/zsh/aliases.nix b/nix/modules/home-manager/cli/zsh/aliases.nix similarity index 100% rename from nix/modules/home-manager/features/cli/zsh/aliases.nix rename to nix/modules/home-manager/cli/zsh/aliases.nix diff --git a/nix/modules/home-manager/default.nix b/nix/modules/home-manager/default.nix index 075bcdb..0cd6a84 100644 --- a/nix/modules/home-manager/default.nix +++ b/nix/modules/home-manager/default.nix @@ -9,7 +9,7 @@ { imports = [ - (import ./features/cli { + (import ./cli { inherit config inputs @@ -19,6 +19,6 @@ ; }) - ./features/desktop + ./desktop ]; } diff --git a/nix/modules/home-manager/features/desktop/copyq.nix b/nix/modules/home-manager/desktop/copyq.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/copyq.nix rename to nix/modules/home-manager/desktop/copyq.nix diff --git a/nix/modules/home-manager/features/desktop/default.nix b/nix/modules/home-manager/desktop/default.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/default.nix rename to nix/modules/home-manager/desktop/default.nix diff --git a/nix/modules/home-manager/features/desktop/discord.nix b/nix/modules/home-manager/desktop/discord.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/discord.nix rename to nix/modules/home-manager/desktop/discord.nix diff --git a/nix/modules/home-manager/features/desktop/dwm.nix b/nix/modules/home-manager/desktop/dwm.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/dwm.nix rename to nix/modules/home-manager/desktop/dwm.nix diff --git a/nix/modules/home-manager/features/desktop/espanso.nix b/nix/modules/home-manager/desktop/espanso.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/espanso.nix rename to nix/modules/home-manager/desktop/espanso.nix diff --git a/nix/modules/home-manager/features/desktop/espanso/matches/base.nix b/nix/modules/home-manager/desktop/espanso/matches/base.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/espanso/matches/base.nix rename to nix/modules/home-manager/desktop/espanso/matches/base.nix diff --git a/nix/modules/home-manager/features/desktop/flameshot.nix b/nix/modules/home-manager/desktop/flameshot.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/flameshot.nix rename to nix/modules/home-manager/desktop/flameshot.nix diff --git a/nix/modules/home-manager/features/desktop/gtk.nix b/nix/modules/home-manager/desktop/gtk.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/gtk.nix rename to nix/modules/home-manager/desktop/gtk.nix diff --git a/nix/modules/home-manager/features/desktop/media/default.nix b/nix/modules/home-manager/desktop/media/default.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/default.nix rename to nix/modules/home-manager/desktop/media/default.nix diff --git a/nix/modules/home-manager/features/desktop/media/gimp.nix b/nix/modules/home-manager/desktop/media/gimp.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/gimp.nix rename to nix/modules/home-manager/desktop/media/gimp.nix diff --git a/nix/modules/home-manager/features/desktop/media/handbrake.nix b/nix/modules/home-manager/desktop/media/handbrake.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/handbrake.nix rename to nix/modules/home-manager/desktop/media/handbrake.nix diff --git a/nix/modules/home-manager/features/desktop/media/kdenlive.nix b/nix/modules/home-manager/desktop/media/kdenlive.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/kdenlive.nix rename to nix/modules/home-manager/desktop/media/kdenlive.nix diff --git a/nix/modules/home-manager/features/desktop/media/mpv.nix b/nix/modules/home-manager/desktop/media/mpv.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/mpv.nix rename to nix/modules/home-manager/desktop/media/mpv.nix diff --git a/nix/modules/home-manager/features/desktop/media/pocket-casts.nix b/nix/modules/home-manager/desktop/media/pocket-casts.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/media/pocket-casts.nix rename to nix/modules/home-manager/desktop/media/pocket-casts.nix diff --git a/nix/modules/home-manager/features/desktop/slack.nix b/nix/modules/home-manager/desktop/slack.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/slack.nix rename to nix/modules/home-manager/desktop/slack.nix diff --git a/nix/modules/home-manager/features/desktop/zoom.nix b/nix/modules/home-manager/desktop/zoom.nix similarity index 100% rename from nix/modules/home-manager/features/desktop/zoom.nix rename to nix/modules/home-manager/desktop/zoom.nix diff --git a/nix/modules/nixos/features/cli/default.nix b/nix/modules/nixos/cli/default.nix similarity index 100% rename from nix/modules/nixos/features/cli/default.nix rename to nix/modules/nixos/cli/default.nix diff --git a/nix/modules/nixos/features/cli/docker.nix b/nix/modules/nixos/cli/docker.nix similarity index 100% rename from nix/modules/nixos/features/cli/docker.nix rename to nix/modules/nixos/cli/docker.nix diff --git a/nix/modules/nixos/default.nix b/nix/modules/nixos/default.nix index f3c5b02..928462a 100644 --- a/nix/modules/nixos/default.nix +++ b/nix/modules/nixos/default.nix @@ -1,9 +1,9 @@ { imports = [ - ./features/cli - ./features/desktop - ./features/gaming.nix - ./features/homelab + ./cli + ./desktop + ./gaming.nix + ./homelab ./fonts.nix ./rsnapshot.nix ./xbanish.nix diff --git a/nix/modules/nixos/features/desktop/autorandr.nix b/nix/modules/nixos/desktop/autorandr.nix similarity index 100% rename from nix/modules/nixos/features/desktop/autorandr.nix rename to nix/modules/nixos/desktop/autorandr.nix diff --git a/nix/modules/nixos/features/desktop/default.nix b/nix/modules/nixos/desktop/default.nix similarity index 100% rename from nix/modules/nixos/features/desktop/default.nix rename to nix/modules/nixos/desktop/default.nix diff --git a/nix/modules/nixos/features/desktop/dwm.nix b/nix/modules/nixos/desktop/dwm.nix similarity index 99% rename from nix/modules/nixos/features/desktop/dwm.nix rename to nix/modules/nixos/desktop/dwm.nix index d17f4d4..6654f10 100644 --- a/nix/modules/nixos/features/desktop/dwm.nix +++ b/nix/modules/nixos/desktop/dwm.nix @@ -17,9 +17,7 @@ with lib; order = [ "audio" - "backlight" "battery" - "cpu_load" "network" "time" ]; diff --git a/nix/modules/nixos/features/desktop/peek.nix b/nix/modules/nixos/desktop/peek.nix similarity index 100% rename from nix/modules/nixos/features/desktop/peek.nix rename to nix/modules/nixos/desktop/peek.nix diff --git a/nix/modules/nixos/features/desktop/screenkey.nix b/nix/modules/nixos/desktop/screenkey.nix similarity index 100% rename from nix/modules/nixos/features/desktop/screenkey.nix rename to nix/modules/nixos/desktop/screenkey.nix diff --git a/nix/modules/nixos/features/desktop/st.nix b/nix/modules/nixos/desktop/st.nix similarity index 100% rename from nix/modules/nixos/features/desktop/st.nix rename to nix/modules/nixos/desktop/st.nix diff --git a/nix/modules/nixos/features/desktop/thunar.nix b/nix/modules/nixos/desktop/thunar.nix similarity index 100% rename from nix/modules/nixos/features/desktop/thunar.nix rename to nix/modules/nixos/desktop/thunar.nix diff --git a/nix/modules/nixos/features/gaming.nix b/nix/modules/nixos/gaming.nix similarity index 100% rename from nix/modules/nixos/features/gaming.nix rename to nix/modules/nixos/gaming.nix diff --git a/nix/modules/nixos/features/homelab/audiobookshelf.nix b/nix/modules/nixos/homelab/audiobookshelf.nix similarity index 100% rename from nix/modules/nixos/features/homelab/audiobookshelf.nix rename to nix/modules/nixos/homelab/audiobookshelf.nix diff --git a/nix/modules/nixos/features/homelab/containers/beaverhabits.nix b/nix/modules/nixos/homelab/containers/beaverhabits.nix similarity index 100% rename from nix/modules/nixos/features/homelab/containers/beaverhabits.nix rename to nix/modules/nixos/homelab/containers/beaverhabits.nix diff --git a/nix/modules/nixos/features/homelab/containers/default.nix b/nix/modules/nixos/homelab/containers/default.nix similarity index 100% rename from nix/modules/nixos/features/homelab/containers/default.nix rename to nix/modules/nixos/homelab/containers/default.nix diff --git a/nix/modules/nixos/features/homelab/containers/freshrss.nix b/nix/modules/nixos/homelab/containers/freshrss.nix similarity index 100% rename from nix/modules/nixos/features/homelab/containers/freshrss.nix rename to nix/modules/nixos/homelab/containers/freshrss.nix diff --git a/nix/modules/nixos/features/homelab/containers/pi-hole.nix b/nix/modules/nixos/homelab/containers/pi-hole.nix similarity index 100% rename from nix/modules/nixos/features/homelab/containers/pi-hole.nix rename to nix/modules/nixos/homelab/containers/pi-hole.nix diff --git a/nix/modules/nixos/features/homelab/containers/tubearchivist.nix b/nix/modules/nixos/homelab/containers/tubearchivist.nix similarity index 100% rename from nix/modules/nixos/features/homelab/containers/tubearchivist.nix rename to nix/modules/nixos/homelab/containers/tubearchivist.nix diff --git a/nix/modules/nixos/features/homelab/default.nix b/nix/modules/nixos/homelab/default.nix similarity index 100% rename from nix/modules/nixos/features/homelab/default.nix rename to nix/modules/nixos/homelab/default.nix diff --git a/nix/modules/nixos/features/homelab/forgejo.nix b/nix/modules/nixos/homelab/forgejo.nix similarity index 100% rename from nix/modules/nixos/features/homelab/forgejo.nix rename to nix/modules/nixos/homelab/forgejo.nix diff --git a/nix/modules/nixos/features/homelab/gitea.nix b/nix/modules/nixos/homelab/gitea.nix similarity index 100% rename from nix/modules/nixos/features/homelab/gitea.nix rename to nix/modules/nixos/homelab/gitea.nix diff --git a/nix/modules/nixos/features/homelab/immich.nix b/nix/modules/nixos/homelab/immich.nix similarity index 100% rename from nix/modules/nixos/features/homelab/immich.nix rename to nix/modules/nixos/homelab/immich.nix diff --git a/nix/modules/nixos/features/homelab/jellyfin.nix b/nix/modules/nixos/homelab/jellyfin.nix similarity index 100% rename from nix/modules/nixos/features/homelab/jellyfin.nix rename to nix/modules/nixos/homelab/jellyfin.nix diff --git a/nix/modules/nixos/features/homelab/paperless.nix b/nix/modules/nixos/homelab/paperless.nix similarity index 100% rename from nix/modules/nixos/features/homelab/paperless.nix rename to nix/modules/nixos/homelab/paperless.nix diff --git a/nix/modules/nixos/features/homelab/vaultwarden.nix b/nix/modules/nixos/homelab/vaultwarden.nix similarity index 100% rename from nix/modules/nixos/features/homelab/vaultwarden.nix rename to nix/modules/nixos/homelab/vaultwarden.nix