diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix index 0251d5bc1..1a8b061cc 100644 --- a/modules/accounts/calendar.nix +++ b/modules/accounts/calendar.nix @@ -149,9 +149,9 @@ in type = types.attrsOf ( types.submodule [ calendarOpts - (import ../programs/vdirsyncer-accounts.nix) - (import ../programs/khal-accounts.nix) - (import ../programs/khal-calendar-accounts.nix) + (import ../programs/vdirsyncer/accounts.nix) + (import ../programs/khal/accounts.nix) + (import ../programs/khal/calendar-accounts.nix) ] ); default = { }; diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix index 6b42151cd..6e0833618 100644 --- a/modules/accounts/contacts.nix +++ b/modules/accounts/contacts.nix @@ -140,9 +140,9 @@ in type = types.attrsOf ( types.submodule [ contactOpts - (import ../programs/vdirsyncer-accounts.nix) - (import ../programs/khal-accounts.nix) - (import ../programs/khal-contact-accounts.nix) + (import ../programs/vdirsyncer/accounts.nix) + (import ../programs/khal/accounts.nix) + (import ../programs/khal/contact-accounts.nix) ] ); default = { }; diff --git a/modules/modules.nix b/modules/modules.nix index 7525a5168..5094b7760 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -57,457 +57,6 @@ let ./misc/xdg-user-dirs.nix ./misc/xdg.nix ./misc/xfconf.nix - ./programs/abook.nix - ./programs/aerc.nix - ./programs/aerospace.nix - ./programs/afew.nix - ./programs/aichat.nix - ./programs/alacritty.nix - ./programs/alot.nix - ./programs/antidote.nix - ./programs/anyrun.nix - ./programs/aria2.nix - ./programs/ashell.nix - ./programs/astroid.nix - ./programs/atuin.nix - ./programs/autojump.nix - ./programs/autorandr.nix - ./programs/awscli.nix - ./programs/bacon.nix - ./programs/bash.nix - ./programs/bashmount.nix - ./programs/bat.nix - ./programs/beets.nix - ./programs/bemenu.nix - ./programs/borgmatic.nix - ./programs/bottom.nix - ./programs/boxxy.nix - ./programs/broot.nix - ./programs/browserpass.nix - ./programs/btop.nix - ./programs/bun.nix - ./programs/carapace.nix - ./programs/cava.nix - ./programs/cavalier.nix - ./programs/chawan.nix - ./programs/chromium.nix - ./programs/clock-rs.nix - ./programs/cmus.nix - ./programs/codex.nix - ./programs/command-not-found/command-not-found.nix - ./programs/comodoro.nix - ./programs/darcs.nix - ./programs/dircolors.nix - ./programs/direnv.nix - ./programs/discocss.nix - ./programs/distrobox.nix - ./programs/earthly.nix - ./programs/eclipse.nix - ./programs/element-desktop.nix - ./programs/emacs.nix - ./programs/eww.nix - ./programs/eza.nix - ./programs/fastfetch.nix - ./programs/fd.nix - ./programs/feh.nix - ./programs/firefox.nix - ./programs/fish.nix - ./programs/floorp.nix - ./programs/foliate.nix - ./programs/foot.nix - ./programs/freetube.nix - ./programs/fuzzel.nix - ./programs/fzf.nix - ./programs/gallery-dl.nix - ./programs/getmail.nix - ./programs/gh-dash.nix - ./programs/gh.nix - ./programs/ghostty.nix - ./programs/git-cliff.nix - ./programs/git-credential-oauth.nix - ./programs/git-worktree-switcher.nix - ./programs/git.nix - ./programs/gitui.nix - ./programs/gnome-shell.nix - ./programs/gnome-terminal.nix - ./programs/go.nix - ./programs/gpg.nix - ./programs/gradle.nix - ./programs/granted.nix - ./programs/halloy.nix - ./programs/havoc.nix - ./programs/helix.nix - ./programs/hexchat.nix - ./programs/himalaya.nix - ./programs/home-manager.nix - ./programs/hstr.nix - ./programs/htop.nix - ./programs/hwatch.nix - ./programs/hyfetch.nix - ./programs/hyprlock.nix - ./programs/i3bar-river.nix - ./programs/i3blocks.nix - ./programs/i3status-rust.nix - ./programs/i3status.nix - ./programs/iamb.nix - ./programs/imv.nix - ./programs/info.nix - ./programs/inori.nix - ./programs/ion.nix - ./programs/irssi.nix - ./programs/java.nix - ./programs/jetbrains-remote.nix - ./programs/joplin-desktop.nix - ./programs/joshuto.nix - ./programs/jq.nix - ./programs/jqp.nix - ./programs/jujutsu.nix - ./programs/just.nix - ./programs/k9s.nix - ./programs/kakoune.nix - ./programs/keepassxc.nix - ./programs/keychain.nix - ./programs/khal.nix - ./programs/khard.nix - ./programs/kickoff.nix - ./programs/kitty.nix - ./programs/kodi.nix - ./programs/kubecolor.nix - ./programs/lapce.nix - ./programs/lazydocker.nix - ./programs/lazygit.nix - ./programs/lazysql.nix - ./programs/ledger.nix - ./programs/less.nix - ./programs/lesspipe.nix - ./programs/lf.nix - ./programs/librewolf.nix - ./programs/lieer.nix - ./programs/looking-glass-client.nix - ./programs/lsd.nix - ./programs/lutris.nix - ./programs/man.nix - ./programs/mangohud.nix - ./programs/matplotlib.nix - ./programs/mbsync.nix - ./programs/mc.nix - ./programs/mcfly.nix - ./programs/meli.nix - ./programs/mercurial.nix - ./programs/mergiraf.nix - ./programs/micro.nix - ./programs/mise.nix - ./programs/mods.nix - ./programs/mpv.nix - ./programs/mpvpaper.nix - ./programs/mr.nix - ./programs/msmtp.nix - ./programs/mu.nix - ./programs/mujmap.nix - ./programs/navi.nix - ./programs/ncmpcpp.nix - ./programs/ncspot.nix - ./programs/ne.nix - ./programs/neomutt.nix - ./programs/neovide.nix - ./programs/neovim.nix - ./programs/newsboat.nix - ./programs/nh.nix - ./programs/nheko.nix - ./programs/niriswitcher.nix - ./programs/nix-index.nix - ./programs/nix-init.nix - ./programs/nix-your-shell.nix - ./programs/nnn.nix - ./programs/noti.nix - ./programs/notmuch.nix - ./programs/numbat.nix - ./programs/nushell.nix - ./programs/nyxt.nix - ./programs/obs-studio.nix - ./programs/obsidian.nix - ./programs/octant.nix - ./programs/offlineimap.nix - ./programs/oh-my-posh.nix - ./programs/onagre.nix - ./programs/onedrive.nix - ./programs/onlyoffice.nix - ./programs/opam.nix - ./programs/openstackclient.nix - ./programs/pandoc.nix - ./programs/papis.nix - ./programs/password-store.nix - ./programs/pay-respects.nix - ./programs/pazi.nix - ./programs/pet.nix - ./programs/pgcli.nix - ./programs/pidgin.nix - ./programs/pistol.nix - ./programs/piston-cli.nix - ./programs/pls.nix - ./programs/poetry.nix - ./programs/powerline-go.nix - ./programs/pqiv.nix - ./programs/ptyxis.nix - ./programs/pubs.nix - ./programs/pyenv.nix - ./programs/pylint.nix - ./programs/pywal.nix - ./programs/qcal.nix - ./programs/qutebrowser.nix - ./programs/ranger.nix - ./programs/rbenv.nix - ./programs/rbw.nix - ./programs/rclone.nix - ./programs/readline.nix - ./programs/rio.nix - ./programs/ripgrep-all.nix - ./programs/ripgrep.nix - ./programs/rmpc.nix - ./programs/rofi-pass.nix - ./programs/rofi.nix - ./programs/rtorrent.nix - ./programs/ruff.nix - ./programs/sagemath.nix - ./programs/sapling.nix - ./programs/sbt.nix - ./programs/scmpuff.nix - ./programs/script-directory.nix - ./programs/senpai.nix - ./programs/sesh.nix - ./programs/sftpman.nix - ./programs/sioyek.nix - ./programs/sketchybar.nix - ./programs/skim.nix - ./programs/sm64ex.nix - ./programs/smug.nix - ./programs/spotify-player.nix - ./programs/sqls.nix - ./programs/ssh.nix - ./programs/starship.nix - ./programs/streamlink.nix - ./programs/superfile.nix - ./programs/sway-easyfocus.nix - ./programs/swayimg.nix - ./programs/swaylock.nix - ./programs/swayr.nix - ./programs/taskwarrior.nix - ./programs/tealdeer.nix - ./programs/television.nix - ./programs/terminator.nix - ./programs/termite.nix - ./programs/tex-fmt.nix - ./programs/texlive.nix - ./programs/thefuck.nix - ./programs/thunderbird.nix - ./programs/timidity.nix - ./programs/tint2.nix - ./programs/tiny.nix - ./programs/tmate.nix - ./programs/tmux.nix - ./programs/todoman.nix - ./programs/tofi.nix - ./programs/topgrade.nix - ./programs/translate-shell.nix - ./programs/urxvt.nix - ./programs/uv.nix - ./programs/vdirsyncer.nix - ./programs/vesktop.nix - ./programs/vifm.nix - ./programs/vim-vint.nix - ./programs/vim.nix - ./programs/vinegar.nix - ./programs/visidata.nix - ./programs/vscode.nix - ./programs/vscode/haskell.nix - ./programs/wallust.nix - ./programs/watson.nix - ./programs/waveterm.nix - ./programs/waybar.nix - ./programs/waylogout.nix - ./programs/wayprompt.nix - ./programs/wezterm.nix - ./programs/wlogout.nix - ./programs/wofi.nix - ./programs/xmobar.nix - ./programs/xplr.nix - ./programs/yambar.nix - ./programs/yazi.nix - ./programs/yt-dlp.nix - ./programs/z-lua.nix - ./programs/zathura.nix - ./programs/zed-editor.nix - ./programs/zellij.nix - ./programs/zk.nix - ./programs/zoxide.nix - ./programs/zplug.nix - ./programs/zsh.nix - ./programs/zsh/prezto.nix - ./programs/zsh/zsh-abbr.nix - ./services/activitywatch.nix - ./services/amberol.nix - ./services/arrpc.nix - ./services/autorandr.nix - ./services/avizo.nix - ./services/barrier.nix - ./services/batsignal.nix - ./services/betterlockscreen.nix - ./services/blanket.nix - ./services/blueman-applet.nix - ./services/borgmatic.nix - ./services/cachix-agent.nix - ./services/caffeine.nix - ./services/cbatticon.nix - ./services/clipcat.nix - ./services/cliphist.nix - ./services/clipman.nix - ./services/clipmenu.nix - ./services/clipse.nix - ./services/comodoro.nix - ./services/conky.nix - ./services/copyq.nix - ./services/darkman.nix - ./services/davmail.nix - ./services/devilspie2.nix - ./services/dropbox.nix - ./services/dunst.nix - ./services/dwm-status.nix - ./services/easyeffects.nix - ./services/emacs.nix - ./services/espanso.nix - ./services/etesync-dav.nix - ./services/flameshot.nix - ./services/fluidsynth.nix - ./services/fnott.nix - ./services/fusuma.nix - ./services/getmail.nix - ./services/git-sync.nix - ./services/glance.nix - ./services/gnome-keyring.nix - ./services/gpg-agent.nix - ./services/grobi.nix - ./services/gromit-mpx.nix - ./services/home-manager-auto-expire.nix - ./services/home-manager-auto-upgrade.nix - ./services/hound.nix - ./services/hypridle.nix - ./services/hyprpaper.nix - ./services/hyprpolkitagent.nix - ./services/hyprsunset.nix - ./services/imapnotify.nix - ./services/jankyborders.nix - ./services/jellyfin-mpv-shim.nix - ./services/kanshi.nix - ./services/kbfs.nix - ./services/kdeconnect.nix - ./services/keybase.nix - ./services/keynav.nix - ./services/librespot.nix - ./services/lieer.nix - ./services/linux-wallpaperengine.nix - ./services/listenbrainz-mpd.nix - ./services/lorri.nix - ./services/ludusavi.nix - ./services/lxqt-policykit-agent.nix - ./services/macos-remap-keys - ./services/mako.nix - ./services/mbsync.nix - ./services/megasync.nix - ./services/mopidy.nix - ./services/mpd-discord-rpc.nix - ./services/mpd-mpris.nix - ./services/mpd.nix - ./services/mpdris2.nix - ./services/mpdscribble.nix - ./services/mpris-proxy.nix - ./services/muchsync.nix - ./services/network-manager-applet.nix - ./services/nextcloud-client.nix - ./services/nix-gc.nix - ./services/notify-osd.nix - ./services/ollama.nix - ./services/opensnitch-ui.nix - ./services/osmscout-server.nix - ./services/owncloud-client.nix - ./services/pantalaimon.nix - ./services/parcellite.nix - ./services/pass-secret-service.nix - ./services/pasystray.nix - ./services/pbgopy.nix - ./services/picom.nix - ./services/plan9port.nix - ./services/playerctld.nix - ./services/plex-mpv-shim.nix - ./services/podman-linux - ./services/polkit-gnome.nix - ./services/polybar.nix - ./services/poweralertd.nix - ./services/psd.nix - ./services/pueue.nix - ./services/pulseeffects.nix - ./services/random-background.nix - ./services/recoll.nix - ./services/redshift-gammastep/gammastep.nix - ./services/redshift-gammastep/redshift.nix - ./services/remmina.nix - ./services/restic.nix - ./services/rsibreak.nix - ./services/safeeyes.nix - ./services/screen-locker.nix - ./services/sctd.nix - ./services/shikane.nix - ./services/signaturepdf.nix - ./services/skhd.nix - ./services/snixembed.nix - ./services/spotifyd.nix - ./services/ssh-agent.nix - ./services/stalonetray.nix - ./services/status-notifier-watcher.nix - ./services/swayidle.nix - ./services/swaync.nix - ./services/swayosd.nix - ./services/swww.nix - ./services/sxhkd.nix - ./services/syncthing.nix - ./services/systembus-notify.nix - ./services/taffybar.nix - ./services/tahoe-lafs.nix - ./services/taskwarrior-sync.nix - ./services/tldr-update.nix - ./services/trayer.nix - ./services/trayscale.nix - ./services/twmn.nix - ./services/udiskie.nix - ./services/unclutter.nix - ./services/unison.nix - ./services/vdirsyncer.nix - ./services/volnoti.nix - ./services/way-displays.nix - ./services/wayvnc.nix - ./services/window-managers/awesome.nix - ./services/window-managers/bspwm/default.nix - ./services/window-managers/fluxbox.nix - ./services/window-managers/herbstluftwm.nix - ./services/window-managers/hyprland.nix - ./services/window-managers/i3-sway/i3.nix - ./services/window-managers/i3-sway/sway.nix - ./services/window-managers/i3-sway/swaynag.nix - ./services/window-managers/labwc/labwc.nix - ./services/window-managers/river.nix - ./services/window-managers/spectrwm.nix - ./services/window-managers/wayfire.nix - ./services/window-managers/xmonad.nix - ./services/wlsunset.nix - ./services/wluma.nix - ./services/wob.nix - ./services/wpaperd.nix - ./services/xcape.nix - ./services/xembed-sni-proxy.nix - ./services/xidlehook.nix - ./services/xscreensaver.nix - ./services/xsettingsd.nix - ./services/xsuspender.nix - ./services/yubikey-agent.nix ./systemd.nix ./targets/darwin ./targets/generic-linux.nix @@ -525,6 +74,20 @@ let KeePassX is no longer maintained. '') ] + ++ (lib.concatMap + ( + dir: + lib.pipe dir [ + builtins.readDir + (lib.filterAttrs (_path: kind: kind == "directory")) + (lib.mapAttrsToList (path: _kind: lib.path.append dir path)) + ] + ) + [ + ./services + ./programs + ] + ) ++ lib.optional useNixpkgsModule ./misc/nixpkgs.nix ++ lib.optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix; diff --git a/modules/programs/abook.nix b/modules/programs/abook/default.nix similarity index 100% rename from modules/programs/abook.nix rename to modules/programs/abook/default.nix diff --git a/modules/programs/aerc-accounts.nix b/modules/programs/aerc/accounts.nix similarity index 100% rename from modules/programs/aerc-accounts.nix rename to modules/programs/aerc/accounts.nix diff --git a/modules/programs/aerc.nix b/modules/programs/aerc/default.nix similarity index 99% rename from modules/programs/aerc.nix rename to modules/programs/aerc/default.nix index 03ad890d2..8ee5546a1 100644 --- a/modules/programs/aerc.nix +++ b/modules/programs/aerc/default.nix @@ -37,7 +37,7 @@ let sectionsOrLines = types.either types.lines confSections; - accounts = import ./aerc-accounts.nix { + accounts = import ./accounts.nix { inherit config pkgs diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace/default.nix similarity index 100% rename from modules/programs/aerospace.nix rename to modules/programs/aerospace/default.nix diff --git a/modules/programs/afew.nix b/modules/programs/afew/default.nix similarity index 100% rename from modules/programs/afew.nix rename to modules/programs/afew/default.nix diff --git a/modules/programs/aichat.nix b/modules/programs/aichat/default.nix similarity index 100% rename from modules/programs/aichat.nix rename to modules/programs/aichat/default.nix diff --git a/modules/programs/alacritty.nix b/modules/programs/alacritty/default.nix similarity index 100% rename from modules/programs/alacritty.nix rename to modules/programs/alacritty/default.nix diff --git a/modules/programs/alot-accounts.nix b/modules/programs/alot/accounts.nix similarity index 100% rename from modules/programs/alot-accounts.nix rename to modules/programs/alot/accounts.nix diff --git a/modules/programs/alot.nix b/modules/programs/alot/default.nix similarity index 98% rename from modules/programs/alot.nix rename to modules/programs/alot/default.nix index 84175f99c..25ca17b3c 100644 --- a/modules/programs/alot.nix +++ b/modules/programs/alot/default.nix @@ -271,7 +271,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./alot-accounts.nix pkgs)); + type = with types; attrsOf (submodule (import ./accounts.nix pkgs)); }; }; diff --git a/modules/programs/antidote.nix b/modules/programs/antidote/default.nix similarity index 100% rename from modules/programs/antidote.nix rename to modules/programs/antidote/default.nix diff --git a/modules/programs/anyrun.nix b/modules/programs/anyrun/default.nix similarity index 100% rename from modules/programs/anyrun.nix rename to modules/programs/anyrun/default.nix diff --git a/modules/programs/aria2.nix b/modules/programs/aria2/default.nix similarity index 100% rename from modules/programs/aria2.nix rename to modules/programs/aria2/default.nix diff --git a/modules/programs/ashell.nix b/modules/programs/ashell/default.nix similarity index 100% rename from modules/programs/ashell.nix rename to modules/programs/ashell/default.nix diff --git a/modules/programs/astroid-accounts.nix b/modules/programs/astroid/accounts.nix similarity index 100% rename from modules/programs/astroid-accounts.nix rename to modules/programs/astroid/accounts.nix diff --git a/modules/programs/astroid-config-template.json b/modules/programs/astroid/astroid-config-template.json similarity index 100% rename from modules/programs/astroid-config-template.json rename to modules/programs/astroid/astroid-config-template.json diff --git a/modules/programs/astroid.nix b/modules/programs/astroid/default.nix similarity index 97% rename from modules/programs/astroid.nix rename to modules/programs/astroid/default.nix index 7196fe782..1ad5b8515 100644 --- a/modules/programs/astroid.nix +++ b/modules/programs/astroid/default.nix @@ -120,7 +120,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./astroid-accounts.nix)); + type = with types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/atuin.nix b/modules/programs/atuin/default.nix similarity index 100% rename from modules/programs/atuin.nix rename to modules/programs/atuin/default.nix diff --git a/modules/programs/autojump.nix b/modules/programs/autojump/default.nix similarity index 100% rename from modules/programs/autojump.nix rename to modules/programs/autojump/default.nix diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr/default.nix similarity index 100% rename from modules/programs/autorandr.nix rename to modules/programs/autorandr/default.nix diff --git a/modules/programs/awscli.nix b/modules/programs/awscli/default.nix similarity index 100% rename from modules/programs/awscli.nix rename to modules/programs/awscli/default.nix diff --git a/modules/programs/bacon.nix b/modules/programs/bacon/default.nix similarity index 100% rename from modules/programs/bacon.nix rename to modules/programs/bacon/default.nix diff --git a/modules/programs/bash.nix b/modules/programs/bash/default.nix similarity index 100% rename from modules/programs/bash.nix rename to modules/programs/bash/default.nix diff --git a/modules/programs/bashmount.nix b/modules/programs/bashmount/default.nix similarity index 100% rename from modules/programs/bashmount.nix rename to modules/programs/bashmount/default.nix diff --git a/modules/programs/bat.nix b/modules/programs/bat/default.nix similarity index 100% rename from modules/programs/bat.nix rename to modules/programs/bat/default.nix diff --git a/modules/programs/beets.nix b/modules/programs/beets/default.nix similarity index 100% rename from modules/programs/beets.nix rename to modules/programs/beets/default.nix diff --git a/modules/programs/bemenu.nix b/modules/programs/bemenu/default.nix similarity index 100% rename from modules/programs/bemenu.nix rename to modules/programs/bemenu/default.nix diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic/default.nix similarity index 100% rename from modules/programs/borgmatic.nix rename to modules/programs/borgmatic/default.nix diff --git a/modules/programs/bottom.nix b/modules/programs/bottom/default.nix similarity index 100% rename from modules/programs/bottom.nix rename to modules/programs/bottom/default.nix diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy/default.nix similarity index 100% rename from modules/programs/boxxy.nix rename to modules/programs/boxxy/default.nix diff --git a/modules/programs/broot.nix b/modules/programs/broot/default.nix similarity index 100% rename from modules/programs/broot.nix rename to modules/programs/broot/default.nix diff --git a/modules/programs/browserpass.nix b/modules/programs/browserpass/default.nix similarity index 100% rename from modules/programs/browserpass.nix rename to modules/programs/browserpass/default.nix diff --git a/modules/programs/btop.nix b/modules/programs/btop/default.nix similarity index 100% rename from modules/programs/btop.nix rename to modules/programs/btop/default.nix diff --git a/modules/programs/bun.nix b/modules/programs/bun/default.nix similarity index 100% rename from modules/programs/bun.nix rename to modules/programs/bun/default.nix diff --git a/modules/programs/carapace.nix b/modules/programs/carapace/default.nix similarity index 100% rename from modules/programs/carapace.nix rename to modules/programs/carapace/default.nix diff --git a/modules/programs/cava.nix b/modules/programs/cava/default.nix similarity index 100% rename from modules/programs/cava.nix rename to modules/programs/cava/default.nix diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier/default.nix similarity index 100% rename from modules/programs/cavalier.nix rename to modules/programs/cavalier/default.nix diff --git a/modules/programs/chawan.nix b/modules/programs/chawan/default.nix similarity index 100% rename from modules/programs/chawan.nix rename to modules/programs/chawan/default.nix diff --git a/modules/programs/chromium.nix b/modules/programs/chromium/default.nix similarity index 100% rename from modules/programs/chromium.nix rename to modules/programs/chromium/default.nix diff --git a/modules/programs/clock-rs.nix b/modules/programs/clock-rs/default.nix similarity index 100% rename from modules/programs/clock-rs.nix rename to modules/programs/clock-rs/default.nix diff --git a/modules/programs/cmus.nix b/modules/programs/cmus/default.nix similarity index 100% rename from modules/programs/cmus.nix rename to modules/programs/cmus/default.nix diff --git a/modules/programs/codex.nix b/modules/programs/codex/default.nix similarity index 100% rename from modules/programs/codex.nix rename to modules/programs/codex/default.nix diff --git a/modules/programs/command-not-found/command-not-found.nix b/modules/programs/command-not-found/default.nix similarity index 100% rename from modules/programs/command-not-found/command-not-found.nix rename to modules/programs/command-not-found/default.nix diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro/default.nix similarity index 100% rename from modules/programs/comodoro.nix rename to modules/programs/comodoro/default.nix diff --git a/modules/programs/darcs.nix b/modules/programs/darcs/default.nix similarity index 100% rename from modules/programs/darcs.nix rename to modules/programs/darcs/default.nix diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors/default.nix similarity index 100% rename from modules/programs/dircolors.nix rename to modules/programs/dircolors/default.nix diff --git a/modules/programs/direnv.nix b/modules/programs/direnv/default.nix similarity index 100% rename from modules/programs/direnv.nix rename to modules/programs/direnv/default.nix diff --git a/modules/programs/discocss.nix b/modules/programs/discocss/default.nix similarity index 100% rename from modules/programs/discocss.nix rename to modules/programs/discocss/default.nix diff --git a/modules/programs/distrobox.nix b/modules/programs/distrobox/default.nix similarity index 100% rename from modules/programs/distrobox.nix rename to modules/programs/distrobox/default.nix diff --git a/modules/programs/earthly.nix b/modules/programs/earthly/default.nix similarity index 100% rename from modules/programs/earthly.nix rename to modules/programs/earthly/default.nix diff --git a/modules/programs/eclipse.nix b/modules/programs/eclipse/default.nix similarity index 100% rename from modules/programs/eclipse.nix rename to modules/programs/eclipse/default.nix diff --git a/modules/programs/element-desktop.nix b/modules/programs/element-desktop/default.nix similarity index 100% rename from modules/programs/element-desktop.nix rename to modules/programs/element-desktop/default.nix diff --git a/modules/programs/emacs.nix b/modules/programs/emacs/default.nix similarity index 100% rename from modules/programs/emacs.nix rename to modules/programs/emacs/default.nix diff --git a/modules/programs/eww.nix b/modules/programs/eww/default.nix similarity index 100% rename from modules/programs/eww.nix rename to modules/programs/eww/default.nix diff --git a/modules/programs/eza.nix b/modules/programs/eza/default.nix similarity index 100% rename from modules/programs/eza.nix rename to modules/programs/eza/default.nix diff --git a/modules/programs/fastfetch.nix b/modules/programs/fastfetch/default.nix similarity index 100% rename from modules/programs/fastfetch.nix rename to modules/programs/fastfetch/default.nix diff --git a/modules/programs/fd.nix b/modules/programs/fd/default.nix similarity index 100% rename from modules/programs/fd.nix rename to modules/programs/fd/default.nix diff --git a/modules/programs/feh.nix b/modules/programs/feh/default.nix similarity index 100% rename from modules/programs/feh.nix rename to modules/programs/feh/default.nix diff --git a/modules/programs/firefox.nix b/modules/programs/firefox/default.nix similarity index 96% rename from modules/programs/firefox.nix rename to modules/programs/firefox/default.nix index fec23840c..166ac5713 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox/default.nix @@ -11,7 +11,7 @@ let moduleName = lib.concatStringsSep "." modulePath; - mkFirefoxModule = import ./firefox/mkFirefoxModule.nix; + mkFirefoxModule = import ./mkFirefoxModule.nix; in { meta.maintainers = [ diff --git a/modules/programs/fish.nix b/modules/programs/fish/default.nix similarity index 100% rename from modules/programs/fish.nix rename to modules/programs/fish/default.nix diff --git a/modules/programs/floorp.nix b/modules/programs/floorp/default.nix similarity index 93% rename from modules/programs/floorp.nix rename to modules/programs/floorp/default.nix index 50e52d76d..bbc7e51d8 100644 --- a/modules/programs/floorp.nix +++ b/modules/programs/floorp/default.nix @@ -7,7 +7,7 @@ let cfg = config.programs.floorp; - mkFirefoxModule = import ./firefox/mkFirefoxModule.nix; + mkFirefoxModule = import ../firefox/mkFirefoxModule.nix; in { meta.maintainers = [ lib.hm.maintainers.bricked ]; diff --git a/modules/programs/foliate.nix b/modules/programs/foliate/default.nix similarity index 100% rename from modules/programs/foliate.nix rename to modules/programs/foliate/default.nix diff --git a/modules/programs/foot.nix b/modules/programs/foot/default.nix similarity index 100% rename from modules/programs/foot.nix rename to modules/programs/foot/default.nix diff --git a/modules/programs/freetube.nix b/modules/programs/freetube/default.nix similarity index 100% rename from modules/programs/freetube.nix rename to modules/programs/freetube/default.nix diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel/default.nix similarity index 100% rename from modules/programs/fuzzel.nix rename to modules/programs/fuzzel/default.nix diff --git a/modules/programs/fzf.nix b/modules/programs/fzf/default.nix similarity index 100% rename from modules/programs/fzf.nix rename to modules/programs/fzf/default.nix diff --git a/modules/programs/gallery-dl.nix b/modules/programs/gallery-dl/default.nix similarity index 100% rename from modules/programs/gallery-dl.nix rename to modules/programs/gallery-dl/default.nix diff --git a/modules/programs/getmail-accounts.nix b/modules/programs/getmail/accounts.nix similarity index 100% rename from modules/programs/getmail-accounts.nix rename to modules/programs/getmail/accounts.nix diff --git a/modules/programs/getmail.nix b/modules/programs/getmail/default.nix similarity index 96% rename from modules/programs/getmail.nix rename to modules/programs/getmail/default.nix index 465420c77..04ada2e4c 100644 --- a/modules/programs/getmail.nix +++ b/modules/programs/getmail/default.nix @@ -53,7 +53,7 @@ in { options = { accounts.email.accounts = lib.mkOption { - type = with lib.types; attrsOf (submodule (import ./getmail-accounts.nix)); + type = with lib.types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/gh-dash.nix b/modules/programs/gh-dash/default.nix similarity index 100% rename from modules/programs/gh-dash.nix rename to modules/programs/gh-dash/default.nix diff --git a/modules/programs/gh.nix b/modules/programs/gh/default.nix similarity index 100% rename from modules/programs/gh.nix rename to modules/programs/gh/default.nix diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty/default.nix similarity index 100% rename from modules/programs/ghostty.nix rename to modules/programs/ghostty/default.nix diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff/default.nix similarity index 100% rename from modules/programs/git-cliff.nix rename to modules/programs/git-cliff/default.nix diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth/default.nix similarity index 100% rename from modules/programs/git-credential-oauth.nix rename to modules/programs/git-credential-oauth/default.nix diff --git a/modules/programs/git-worktree-switcher.nix b/modules/programs/git-worktree-switcher/default.nix similarity index 100% rename from modules/programs/git-worktree-switcher.nix rename to modules/programs/git-worktree-switcher/default.nix diff --git a/modules/programs/git.nix b/modules/programs/git/default.nix similarity index 100% rename from modules/programs/git.nix rename to modules/programs/git/default.nix diff --git a/modules/programs/gitui.nix b/modules/programs/gitui/default.nix similarity index 100% rename from modules/programs/gitui.nix rename to modules/programs/gitui/default.nix diff --git a/modules/programs/gnome-shell.nix b/modules/programs/gnome-shell/default.nix similarity index 100% rename from modules/programs/gnome-shell.nix rename to modules/programs/gnome-shell/default.nix diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal/default.nix similarity index 100% rename from modules/programs/gnome-terminal.nix rename to modules/programs/gnome-terminal/default.nix diff --git a/modules/programs/go.nix b/modules/programs/go/default.nix similarity index 100% rename from modules/programs/go.nix rename to modules/programs/go/default.nix diff --git a/modules/programs/gpg.nix b/modules/programs/gpg/default.nix similarity index 100% rename from modules/programs/gpg.nix rename to modules/programs/gpg/default.nix diff --git a/modules/programs/gradle.nix b/modules/programs/gradle/default.nix similarity index 100% rename from modules/programs/gradle.nix rename to modules/programs/gradle/default.nix diff --git a/modules/programs/granted.nix b/modules/programs/granted/default.nix similarity index 100% rename from modules/programs/granted.nix rename to modules/programs/granted/default.nix diff --git a/modules/programs/halloy.nix b/modules/programs/halloy/default.nix similarity index 100% rename from modules/programs/halloy.nix rename to modules/programs/halloy/default.nix diff --git a/modules/programs/havoc.nix b/modules/programs/havoc/default.nix similarity index 100% rename from modules/programs/havoc.nix rename to modules/programs/havoc/default.nix diff --git a/modules/programs/helix.nix b/modules/programs/helix/default.nix similarity index 100% rename from modules/programs/helix.nix rename to modules/programs/helix/default.nix diff --git a/modules/programs/hexchat.nix b/modules/programs/hexchat/default.nix similarity index 100% rename from modules/programs/hexchat.nix rename to modules/programs/hexchat/default.nix diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya/default.nix similarity index 100% rename from modules/programs/himalaya.nix rename to modules/programs/himalaya/default.nix diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager/default.nix similarity index 100% rename from modules/programs/home-manager.nix rename to modules/programs/home-manager/default.nix diff --git a/modules/programs/hstr.nix b/modules/programs/hstr/default.nix similarity index 100% rename from modules/programs/hstr.nix rename to modules/programs/hstr/default.nix diff --git a/modules/programs/htop.nix b/modules/programs/htop/default.nix similarity index 100% rename from modules/programs/htop.nix rename to modules/programs/htop/default.nix diff --git a/modules/programs/hwatch.nix b/modules/programs/hwatch/default.nix similarity index 100% rename from modules/programs/hwatch.nix rename to modules/programs/hwatch/default.nix diff --git a/modules/programs/hyfetch.nix b/modules/programs/hyfetch/default.nix similarity index 100% rename from modules/programs/hyfetch.nix rename to modules/programs/hyfetch/default.nix diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock/default.nix similarity index 100% rename from modules/programs/hyprlock.nix rename to modules/programs/hyprlock/default.nix diff --git a/modules/programs/i3bar-river.nix b/modules/programs/i3bar-river/default.nix similarity index 100% rename from modules/programs/i3bar-river.nix rename to modules/programs/i3bar-river/default.nix diff --git a/modules/programs/i3blocks.nix b/modules/programs/i3blocks/default.nix similarity index 100% rename from modules/programs/i3blocks.nix rename to modules/programs/i3blocks/default.nix diff --git a/modules/programs/i3status-rust.nix b/modules/programs/i3status-rust/default.nix similarity index 100% rename from modules/programs/i3status-rust.nix rename to modules/programs/i3status-rust/default.nix diff --git a/modules/programs/i3status.nix b/modules/programs/i3status/default.nix similarity index 100% rename from modules/programs/i3status.nix rename to modules/programs/i3status/default.nix diff --git a/modules/programs/iamb.nix b/modules/programs/iamb/default.nix similarity index 100% rename from modules/programs/iamb.nix rename to modules/programs/iamb/default.nix diff --git a/modules/programs/imv.nix b/modules/programs/imv/default.nix similarity index 100% rename from modules/programs/imv.nix rename to modules/programs/imv/default.nix diff --git a/modules/programs/info.nix b/modules/programs/info/default.nix similarity index 100% rename from modules/programs/info.nix rename to modules/programs/info/default.nix diff --git a/modules/programs/inori.nix b/modules/programs/inori/default.nix similarity index 100% rename from modules/programs/inori.nix rename to modules/programs/inori/default.nix diff --git a/modules/programs/ion.nix b/modules/programs/ion/default.nix similarity index 100% rename from modules/programs/ion.nix rename to modules/programs/ion/default.nix diff --git a/modules/programs/irssi.nix b/modules/programs/irssi/default.nix similarity index 100% rename from modules/programs/irssi.nix rename to modules/programs/irssi/default.nix diff --git a/modules/programs/java.nix b/modules/programs/java/default.nix similarity index 100% rename from modules/programs/java.nix rename to modules/programs/java/default.nix diff --git a/modules/programs/jetbrains-remote.nix b/modules/programs/jetbrains-remote/default.nix similarity index 100% rename from modules/programs/jetbrains-remote.nix rename to modules/programs/jetbrains-remote/default.nix diff --git a/modules/programs/joplin-desktop.nix b/modules/programs/joplin-desktop/default.nix similarity index 100% rename from modules/programs/joplin-desktop.nix rename to modules/programs/joplin-desktop/default.nix diff --git a/modules/programs/joshuto.nix b/modules/programs/joshuto/default.nix similarity index 100% rename from modules/programs/joshuto.nix rename to modules/programs/joshuto/default.nix diff --git a/modules/programs/jq.nix b/modules/programs/jq/default.nix similarity index 100% rename from modules/programs/jq.nix rename to modules/programs/jq/default.nix diff --git a/modules/programs/jqp.nix b/modules/programs/jqp/default.nix similarity index 100% rename from modules/programs/jqp.nix rename to modules/programs/jqp/default.nix diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu/default.nix similarity index 100% rename from modules/programs/jujutsu.nix rename to modules/programs/jujutsu/default.nix diff --git a/modules/programs/just.nix b/modules/programs/just/default.nix similarity index 100% rename from modules/programs/just.nix rename to modules/programs/just/default.nix diff --git a/modules/programs/k9s.nix b/modules/programs/k9s/default.nix similarity index 100% rename from modules/programs/k9s.nix rename to modules/programs/k9s/default.nix diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune/default.nix similarity index 100% rename from modules/programs/kakoune.nix rename to modules/programs/kakoune/default.nix diff --git a/modules/programs/keepassxc.nix b/modules/programs/keepassxc/default.nix similarity index 100% rename from modules/programs/keepassxc.nix rename to modules/programs/keepassxc/default.nix diff --git a/modules/programs/keychain.nix b/modules/programs/keychain/default.nix similarity index 100% rename from modules/programs/keychain.nix rename to modules/programs/keychain/default.nix diff --git a/modules/programs/khal-accounts.nix b/modules/programs/khal/accounts.nix similarity index 100% rename from modules/programs/khal-accounts.nix rename to modules/programs/khal/accounts.nix diff --git a/modules/programs/khal-calendar-accounts.nix b/modules/programs/khal/calendar-accounts.nix similarity index 100% rename from modules/programs/khal-calendar-accounts.nix rename to modules/programs/khal/calendar-accounts.nix diff --git a/modules/programs/khal-contact-accounts.nix b/modules/programs/khal/contact-accounts.nix similarity index 100% rename from modules/programs/khal-contact-accounts.nix rename to modules/programs/khal/contact-accounts.nix diff --git a/modules/programs/khal.nix b/modules/programs/khal/default.nix similarity index 100% rename from modules/programs/khal.nix rename to modules/programs/khal/default.nix diff --git a/modules/programs/khard.nix b/modules/programs/khard/default.nix similarity index 100% rename from modules/programs/khard.nix rename to modules/programs/khard/default.nix diff --git a/modules/programs/kickoff.nix b/modules/programs/kickoff/default.nix similarity index 100% rename from modules/programs/kickoff.nix rename to modules/programs/kickoff/default.nix diff --git a/modules/programs/kitty.nix b/modules/programs/kitty/default.nix similarity index 100% rename from modules/programs/kitty.nix rename to modules/programs/kitty/default.nix diff --git a/modules/programs/kodi.nix b/modules/programs/kodi/default.nix similarity index 100% rename from modules/programs/kodi.nix rename to modules/programs/kodi/default.nix diff --git a/modules/programs/kubecolor.nix b/modules/programs/kubecolor/default.nix similarity index 100% rename from modules/programs/kubecolor.nix rename to modules/programs/kubecolor/default.nix diff --git a/modules/programs/lapce.nix b/modules/programs/lapce/default.nix similarity index 100% rename from modules/programs/lapce.nix rename to modules/programs/lapce/default.nix diff --git a/modules/programs/lazydocker.nix b/modules/programs/lazydocker/default.nix similarity index 100% rename from modules/programs/lazydocker.nix rename to modules/programs/lazydocker/default.nix diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit/default.nix similarity index 100% rename from modules/programs/lazygit.nix rename to modules/programs/lazygit/default.nix diff --git a/modules/programs/lazysql.nix b/modules/programs/lazysql/default.nix similarity index 100% rename from modules/programs/lazysql.nix rename to modules/programs/lazysql/default.nix diff --git a/modules/programs/ledger.nix b/modules/programs/ledger/default.nix similarity index 100% rename from modules/programs/ledger.nix rename to modules/programs/ledger/default.nix diff --git a/modules/programs/less.nix b/modules/programs/less/default.nix similarity index 100% rename from modules/programs/less.nix rename to modules/programs/less/default.nix diff --git a/modules/programs/lesspipe.nix b/modules/programs/lesspipe/default.nix similarity index 100% rename from modules/programs/lesspipe.nix rename to modules/programs/lesspipe/default.nix diff --git a/modules/programs/lf.nix b/modules/programs/lf/default.nix similarity index 100% rename from modules/programs/lf.nix rename to modules/programs/lf/default.nix diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf/default.nix similarity index 96% rename from modules/programs/librewolf.nix rename to modules/programs/librewolf/default.nix index 2f0620fbb..e762aff34 100644 --- a/modules/programs/librewolf.nix +++ b/modules/programs/librewolf/default.nix @@ -18,7 +18,7 @@ let "librewolf" ]; - mkFirefoxModule = import ./firefox/mkFirefoxModule.nix; + mkFirefoxModule = import ../firefox/mkFirefoxModule.nix; in { diff --git a/modules/programs/lieer.nix b/modules/programs/lieer/default.nix similarity index 100% rename from modules/programs/lieer.nix rename to modules/programs/lieer/default.nix diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client/default.nix similarity index 100% rename from modules/programs/looking-glass-client.nix rename to modules/programs/looking-glass-client/default.nix diff --git a/modules/programs/lsd.nix b/modules/programs/lsd/default.nix similarity index 100% rename from modules/programs/lsd.nix rename to modules/programs/lsd/default.nix diff --git a/modules/programs/lutris.nix b/modules/programs/lutris/default.nix similarity index 100% rename from modules/programs/lutris.nix rename to modules/programs/lutris/default.nix diff --git a/modules/programs/man.nix b/modules/programs/man/default.nix similarity index 100% rename from modules/programs/man.nix rename to modules/programs/man/default.nix diff --git a/modules/programs/mangohud.nix b/modules/programs/mangohud/default.nix similarity index 100% rename from modules/programs/mangohud.nix rename to modules/programs/mangohud/default.nix diff --git a/modules/programs/matplotlib.nix b/modules/programs/matplotlib/default.nix similarity index 100% rename from modules/programs/matplotlib.nix rename to modules/programs/matplotlib/default.nix diff --git a/modules/programs/mbsync-accounts.nix b/modules/programs/mbsync/accounts.nix similarity index 100% rename from modules/programs/mbsync-accounts.nix rename to modules/programs/mbsync/accounts.nix diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync/default.nix similarity index 99% rename from modules/programs/mbsync.nix rename to modules/programs/mbsync/default.nix index 80e965298..96f8513b4 100644 --- a/modules/programs/mbsync.nix +++ b/modules/programs/mbsync/default.nix @@ -282,7 +282,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./mbsync-accounts.nix)); + type = with types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/mc.nix b/modules/programs/mc/default.nix similarity index 100% rename from modules/programs/mc.nix rename to modules/programs/mc/default.nix diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly/default.nix similarity index 100% rename from modules/programs/mcfly.nix rename to modules/programs/mcfly/default.nix diff --git a/modules/programs/meli.nix b/modules/programs/meli/default.nix similarity index 100% rename from modules/programs/meli.nix rename to modules/programs/meli/default.nix diff --git a/modules/programs/mercurial.nix b/modules/programs/mercurial/default.nix similarity index 100% rename from modules/programs/mercurial.nix rename to modules/programs/mercurial/default.nix diff --git a/modules/programs/mergiraf.nix b/modules/programs/mergiraf/default.nix similarity index 100% rename from modules/programs/mergiraf.nix rename to modules/programs/mergiraf/default.nix diff --git a/modules/programs/micro.nix b/modules/programs/micro/default.nix similarity index 100% rename from modules/programs/micro.nix rename to modules/programs/micro/default.nix diff --git a/modules/programs/mise.nix b/modules/programs/mise/default.nix similarity index 100% rename from modules/programs/mise.nix rename to modules/programs/mise/default.nix diff --git a/modules/programs/mods.nix b/modules/programs/mods/default.nix similarity index 100% rename from modules/programs/mods.nix rename to modules/programs/mods/default.nix diff --git a/modules/programs/mpv.nix b/modules/programs/mpv/default.nix similarity index 100% rename from modules/programs/mpv.nix rename to modules/programs/mpv/default.nix diff --git a/modules/programs/mpvpaper.nix b/modules/programs/mpvpaper/default.nix similarity index 100% rename from modules/programs/mpvpaper.nix rename to modules/programs/mpvpaper/default.nix diff --git a/modules/programs/mr.nix b/modules/programs/mr/default.nix similarity index 100% rename from modules/programs/mr.nix rename to modules/programs/mr/default.nix diff --git a/modules/programs/msmtp-accounts.nix b/modules/programs/msmtp/accounts.nix similarity index 100% rename from modules/programs/msmtp-accounts.nix rename to modules/programs/msmtp/accounts.nix diff --git a/modules/programs/msmtp.nix b/modules/programs/msmtp/default.nix similarity index 97% rename from modules/programs/msmtp.nix rename to modules/programs/msmtp/default.nix index 31f42a3e7..137864879 100644 --- a/modules/programs/msmtp.nix +++ b/modules/programs/msmtp/default.nix @@ -91,7 +91,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./msmtp-accounts.nix)); + type = with types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/mu.nix b/modules/programs/mu/default.nix similarity index 100% rename from modules/programs/mu.nix rename to modules/programs/mu/default.nix diff --git a/modules/programs/mujmap.nix b/modules/programs/mujmap/default.nix similarity index 100% rename from modules/programs/mujmap.nix rename to modules/programs/mujmap/default.nix diff --git a/modules/programs/navi.nix b/modules/programs/navi/default.nix similarity index 100% rename from modules/programs/navi.nix rename to modules/programs/navi/default.nix diff --git a/modules/programs/ncmpcpp.nix b/modules/programs/ncmpcpp/default.nix similarity index 100% rename from modules/programs/ncmpcpp.nix rename to modules/programs/ncmpcpp/default.nix diff --git a/modules/programs/ncspot.nix b/modules/programs/ncspot/default.nix similarity index 100% rename from modules/programs/ncspot.nix rename to modules/programs/ncspot/default.nix diff --git a/modules/programs/ne.nix b/modules/programs/ne/default.nix similarity index 100% rename from modules/programs/ne.nix rename to modules/programs/ne/default.nix diff --git a/modules/programs/neomutt-accounts.nix b/modules/programs/neomutt/accounts.nix similarity index 97% rename from modules/programs/neomutt-accounts.nix rename to modules/programs/neomutt/accounts.nix index 36a09acd9..b7160a395 100644 --- a/modules/programs/neomutt-accounts.nix +++ b/modules/programs/neomutt/accounts.nix @@ -39,7 +39,7 @@ in }; virtualMailboxes = mkOption { - type = types.listOf (types.submodule ./notmuch-virtual-mailbox.nix); + type = types.listOf (types.submodule ../notmuch/virtual-mailbox.nix); example = [ { name = "My INBOX"; diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt/default.nix similarity index 99% rename from modules/programs/neomutt.nix rename to modules/programs/neomutt/default.nix index 30fb446b0..29da7c800 100644 --- a/modules/programs/neomutt.nix +++ b/modules/programs/neomutt/default.nix @@ -476,7 +476,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./neomutt-accounts.nix)); + type = with types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/neovide.nix b/modules/programs/neovide/default.nix similarity index 100% rename from modules/programs/neovide.nix rename to modules/programs/neovide/default.nix diff --git a/modules/programs/neovim.nix b/modules/programs/neovim/default.nix similarity index 99% rename from modules/programs/neovim.nix rename to modules/programs/neovim/default.nix index 7c5baafe8..4d44a1ab9 100644 --- a/modules/programs/neovim.nix +++ b/modules/programs/neovim/default.nix @@ -18,7 +18,7 @@ let cfg = config.programs.neovim; fileType = - (import ../lib/file-type.nix { + (import ../../lib/file-type.nix { inherit (config.home) homeDirectory; inherit lib pkgs; }).fileType; diff --git a/modules/programs/newsboat.nix b/modules/programs/newsboat/default.nix similarity index 100% rename from modules/programs/newsboat.nix rename to modules/programs/newsboat/default.nix diff --git a/modules/programs/nh.nix b/modules/programs/nh/default.nix similarity index 100% rename from modules/programs/nh.nix rename to modules/programs/nh/default.nix diff --git a/modules/programs/nheko.nix b/modules/programs/nheko/default.nix similarity index 100% rename from modules/programs/nheko.nix rename to modules/programs/nheko/default.nix diff --git a/modules/programs/niriswitcher.nix b/modules/programs/niriswitcher/default.nix similarity index 100% rename from modules/programs/niriswitcher.nix rename to modules/programs/niriswitcher/default.nix diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index/default.nix similarity index 100% rename from modules/programs/nix-index.nix rename to modules/programs/nix-index/default.nix diff --git a/modules/programs/nix-init.nix b/modules/programs/nix-init/default.nix similarity index 100% rename from modules/programs/nix-init.nix rename to modules/programs/nix-init/default.nix diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell/default.nix similarity index 100% rename from modules/programs/nix-your-shell.nix rename to modules/programs/nix-your-shell/default.nix diff --git a/modules/programs/nnn.nix b/modules/programs/nnn/default.nix similarity index 100% rename from modules/programs/nnn.nix rename to modules/programs/nnn/default.nix diff --git a/modules/programs/noti.nix b/modules/programs/noti/default.nix similarity index 100% rename from modules/programs/noti.nix rename to modules/programs/noti/default.nix diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch/default.nix similarity index 100% rename from modules/programs/notmuch.nix rename to modules/programs/notmuch/default.nix diff --git a/modules/programs/notmuch-virtual-mailbox.nix b/modules/programs/notmuch/virtual-mailbox.nix similarity index 100% rename from modules/programs/notmuch-virtual-mailbox.nix rename to modules/programs/notmuch/virtual-mailbox.nix diff --git a/modules/programs/numbat.nix b/modules/programs/numbat/default.nix similarity index 100% rename from modules/programs/numbat.nix rename to modules/programs/numbat/default.nix diff --git a/modules/programs/nushell.nix b/modules/programs/nushell/default.nix similarity index 100% rename from modules/programs/nushell.nix rename to modules/programs/nushell/default.nix diff --git a/modules/programs/nyxt.nix b/modules/programs/nyxt/default.nix similarity index 100% rename from modules/programs/nyxt.nix rename to modules/programs/nyxt/default.nix diff --git a/modules/programs/obs-studio.nix b/modules/programs/obs-studio/default.nix similarity index 100% rename from modules/programs/obs-studio.nix rename to modules/programs/obs-studio/default.nix diff --git a/modules/programs/obsidian.nix b/modules/programs/obsidian/default.nix similarity index 100% rename from modules/programs/obsidian.nix rename to modules/programs/obsidian/default.nix diff --git a/modules/programs/octant.nix b/modules/programs/octant/default.nix similarity index 100% rename from modules/programs/octant.nix rename to modules/programs/octant/default.nix diff --git a/modules/programs/offlineimap-accounts.nix b/modules/programs/offlineimap/accounts.nix similarity index 100% rename from modules/programs/offlineimap-accounts.nix rename to modules/programs/offlineimap/accounts.nix diff --git a/modules/programs/offlineimap.nix b/modules/programs/offlineimap/default.nix similarity index 98% rename from modules/programs/offlineimap.nix rename to modules/programs/offlineimap/default.nix index 5fbfc01ee..022f28110 100644 --- a/modules/programs/offlineimap.nix +++ b/modules/programs/offlineimap/default.nix @@ -167,7 +167,7 @@ in }; accounts.email.accounts = mkOption { - type = with lib.types; attrsOf (submodule (import ./offlineimap-accounts.nix)); + type = with lib.types; attrsOf (submodule (import ./accounts.nix)); }; }; diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh/default.nix similarity index 100% rename from modules/programs/oh-my-posh.nix rename to modules/programs/oh-my-posh/default.nix diff --git a/modules/programs/onagre.nix b/modules/programs/onagre/default.nix similarity index 100% rename from modules/programs/onagre.nix rename to modules/programs/onagre/default.nix diff --git a/modules/programs/onedrive.nix b/modules/programs/onedrive/default.nix similarity index 100% rename from modules/programs/onedrive.nix rename to modules/programs/onedrive/default.nix diff --git a/modules/programs/onlyoffice.nix b/modules/programs/onlyoffice/default.nix similarity index 100% rename from modules/programs/onlyoffice.nix rename to modules/programs/onlyoffice/default.nix diff --git a/modules/programs/opam.nix b/modules/programs/opam/default.nix similarity index 100% rename from modules/programs/opam.nix rename to modules/programs/opam/default.nix diff --git a/modules/programs/openstackclient.nix b/modules/programs/openstackclient/default.nix similarity index 100% rename from modules/programs/openstackclient.nix rename to modules/programs/openstackclient/default.nix diff --git a/modules/programs/pandoc.nix b/modules/programs/pandoc/default.nix similarity index 100% rename from modules/programs/pandoc.nix rename to modules/programs/pandoc/default.nix diff --git a/modules/programs/papis.nix b/modules/programs/papis/default.nix similarity index 100% rename from modules/programs/papis.nix rename to modules/programs/papis/default.nix diff --git a/modules/programs/password-store.nix b/modules/programs/password-store/default.nix similarity index 100% rename from modules/programs/password-store.nix rename to modules/programs/password-store/default.nix diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects/default.nix similarity index 100% rename from modules/programs/pay-respects.nix rename to modules/programs/pay-respects/default.nix diff --git a/modules/programs/pazi.nix b/modules/programs/pazi/default.nix similarity index 100% rename from modules/programs/pazi.nix rename to modules/programs/pazi/default.nix diff --git a/modules/programs/pet.nix b/modules/programs/pet/default.nix similarity index 100% rename from modules/programs/pet.nix rename to modules/programs/pet/default.nix diff --git a/modules/programs/pgcli.nix b/modules/programs/pgcli/default.nix similarity index 100% rename from modules/programs/pgcli.nix rename to modules/programs/pgcli/default.nix diff --git a/modules/programs/pidgin.nix b/modules/programs/pidgin/default.nix similarity index 100% rename from modules/programs/pidgin.nix rename to modules/programs/pidgin/default.nix diff --git a/modules/programs/pistol.nix b/modules/programs/pistol/default.nix similarity index 100% rename from modules/programs/pistol.nix rename to modules/programs/pistol/default.nix diff --git a/modules/programs/piston-cli.nix b/modules/programs/piston-cli/default.nix similarity index 100% rename from modules/programs/piston-cli.nix rename to modules/programs/piston-cli/default.nix diff --git a/modules/programs/pls.nix b/modules/programs/pls/default.nix similarity index 100% rename from modules/programs/pls.nix rename to modules/programs/pls/default.nix diff --git a/modules/programs/poetry.nix b/modules/programs/poetry/default.nix similarity index 100% rename from modules/programs/poetry.nix rename to modules/programs/poetry/default.nix diff --git a/modules/programs/powerline-go.nix b/modules/programs/powerline-go/default.nix similarity index 100% rename from modules/programs/powerline-go.nix rename to modules/programs/powerline-go/default.nix diff --git a/modules/programs/pqiv.nix b/modules/programs/pqiv/default.nix similarity index 100% rename from modules/programs/pqiv.nix rename to modules/programs/pqiv/default.nix diff --git a/modules/programs/ptyxis.nix b/modules/programs/ptyxis/default.nix similarity index 100% rename from modules/programs/ptyxis.nix rename to modules/programs/ptyxis/default.nix diff --git a/modules/programs/pubs.nix b/modules/programs/pubs/default.nix similarity index 100% rename from modules/programs/pubs.nix rename to modules/programs/pubs/default.nix diff --git a/modules/programs/pyenv.nix b/modules/programs/pyenv/default.nix similarity index 100% rename from modules/programs/pyenv.nix rename to modules/programs/pyenv/default.nix diff --git a/modules/programs/pylint.nix b/modules/programs/pylint/default.nix similarity index 100% rename from modules/programs/pylint.nix rename to modules/programs/pylint/default.nix diff --git a/modules/programs/pywal.nix b/modules/programs/pywal/default.nix similarity index 100% rename from modules/programs/pywal.nix rename to modules/programs/pywal/default.nix diff --git a/modules/programs/qcal.nix b/modules/programs/qcal/default.nix similarity index 100% rename from modules/programs/qcal.nix rename to modules/programs/qcal/default.nix diff --git a/modules/programs/qutebrowser.nix b/modules/programs/qutebrowser/default.nix similarity index 100% rename from modules/programs/qutebrowser.nix rename to modules/programs/qutebrowser/default.nix diff --git a/modules/programs/ranger.nix b/modules/programs/ranger/default.nix similarity index 100% rename from modules/programs/ranger.nix rename to modules/programs/ranger/default.nix diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv/default.nix similarity index 100% rename from modules/programs/rbenv.nix rename to modules/programs/rbenv/default.nix diff --git a/modules/programs/rbw.nix b/modules/programs/rbw/default.nix similarity index 100% rename from modules/programs/rbw.nix rename to modules/programs/rbw/default.nix diff --git a/modules/programs/rclone.nix b/modules/programs/rclone/default.nix similarity index 100% rename from modules/programs/rclone.nix rename to modules/programs/rclone/default.nix diff --git a/modules/programs/readline.nix b/modules/programs/readline/default.nix similarity index 100% rename from modules/programs/readline.nix rename to modules/programs/readline/default.nix diff --git a/modules/programs/rio.nix b/modules/programs/rio/default.nix similarity index 100% rename from modules/programs/rio.nix rename to modules/programs/rio/default.nix diff --git a/modules/programs/ripgrep-all.nix b/modules/programs/ripgrep-all/default.nix similarity index 100% rename from modules/programs/ripgrep-all.nix rename to modules/programs/ripgrep-all/default.nix diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep/default.nix similarity index 100% rename from modules/programs/ripgrep.nix rename to modules/programs/ripgrep/default.nix diff --git a/modules/programs/rmpc.nix b/modules/programs/rmpc/default.nix similarity index 100% rename from modules/programs/rmpc.nix rename to modules/programs/rmpc/default.nix diff --git a/modules/programs/rofi-pass.nix b/modules/programs/rofi-pass/default.nix similarity index 100% rename from modules/programs/rofi-pass.nix rename to modules/programs/rofi-pass/default.nix diff --git a/modules/programs/rofi.nix b/modules/programs/rofi/default.nix similarity index 100% rename from modules/programs/rofi.nix rename to modules/programs/rofi/default.nix diff --git a/modules/programs/rtorrent.nix b/modules/programs/rtorrent/default.nix similarity index 100% rename from modules/programs/rtorrent.nix rename to modules/programs/rtorrent/default.nix diff --git a/modules/programs/ruff.nix b/modules/programs/ruff/default.nix similarity index 100% rename from modules/programs/ruff.nix rename to modules/programs/ruff/default.nix diff --git a/modules/programs/sagemath.nix b/modules/programs/sagemath/default.nix similarity index 100% rename from modules/programs/sagemath.nix rename to modules/programs/sagemath/default.nix diff --git a/modules/programs/sapling.nix b/modules/programs/sapling/default.nix similarity index 100% rename from modules/programs/sapling.nix rename to modules/programs/sapling/default.nix diff --git a/modules/programs/sbt.nix b/modules/programs/sbt/default.nix similarity index 100% rename from modules/programs/sbt.nix rename to modules/programs/sbt/default.nix diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff/default.nix similarity index 100% rename from modules/programs/scmpuff.nix rename to modules/programs/scmpuff/default.nix diff --git a/modules/programs/script-directory.nix b/modules/programs/script-directory/default.nix similarity index 100% rename from modules/programs/script-directory.nix rename to modules/programs/script-directory/default.nix diff --git a/modules/programs/senpai.nix b/modules/programs/senpai/default.nix similarity index 100% rename from modules/programs/senpai.nix rename to modules/programs/senpai/default.nix diff --git a/modules/programs/sesh.nix b/modules/programs/sesh/default.nix similarity index 100% rename from modules/programs/sesh.nix rename to modules/programs/sesh/default.nix diff --git a/modules/programs/sftpman.nix b/modules/programs/sftpman/default.nix similarity index 100% rename from modules/programs/sftpman.nix rename to modules/programs/sftpman/default.nix diff --git a/modules/programs/sioyek.nix b/modules/programs/sioyek/default.nix similarity index 100% rename from modules/programs/sioyek.nix rename to modules/programs/sioyek/default.nix diff --git a/modules/programs/sketchybar.nix b/modules/programs/sketchybar/default.nix similarity index 100% rename from modules/programs/sketchybar.nix rename to modules/programs/sketchybar/default.nix diff --git a/modules/programs/skim.nix b/modules/programs/skim/default.nix similarity index 100% rename from modules/programs/skim.nix rename to modules/programs/skim/default.nix diff --git a/modules/programs/sm64ex.nix b/modules/programs/sm64ex/default.nix similarity index 100% rename from modules/programs/sm64ex.nix rename to modules/programs/sm64ex/default.nix diff --git a/modules/programs/smug.nix b/modules/programs/smug/default.nix similarity index 100% rename from modules/programs/smug.nix rename to modules/programs/smug/default.nix diff --git a/modules/programs/spotify-player.nix b/modules/programs/spotify-player/default.nix similarity index 100% rename from modules/programs/spotify-player.nix rename to modules/programs/spotify-player/default.nix diff --git a/modules/programs/sqls.nix b/modules/programs/sqls/default.nix similarity index 100% rename from modules/programs/sqls.nix rename to modules/programs/sqls/default.nix diff --git a/modules/programs/ssh.nix b/modules/programs/ssh/default.nix similarity index 100% rename from modules/programs/ssh.nix rename to modules/programs/ssh/default.nix diff --git a/modules/programs/starship.nix b/modules/programs/starship/default.nix similarity index 100% rename from modules/programs/starship.nix rename to modules/programs/starship/default.nix diff --git a/modules/programs/streamlink.nix b/modules/programs/streamlink/default.nix similarity index 100% rename from modules/programs/streamlink.nix rename to modules/programs/streamlink/default.nix diff --git a/modules/programs/superfile.nix b/modules/programs/superfile/default.nix similarity index 100% rename from modules/programs/superfile.nix rename to modules/programs/superfile/default.nix diff --git a/modules/programs/sway-easyfocus.nix b/modules/programs/sway-easyfocus/default.nix similarity index 100% rename from modules/programs/sway-easyfocus.nix rename to modules/programs/sway-easyfocus/default.nix diff --git a/modules/programs/swayimg.nix b/modules/programs/swayimg/default.nix similarity index 100% rename from modules/programs/swayimg.nix rename to modules/programs/swayimg/default.nix diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock/default.nix similarity index 100% rename from modules/programs/swaylock.nix rename to modules/programs/swaylock/default.nix diff --git a/modules/programs/swayr.nix b/modules/programs/swayr/default.nix similarity index 100% rename from modules/programs/swayr.nix rename to modules/programs/swayr/default.nix diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior/default.nix similarity index 100% rename from modules/programs/taskwarrior.nix rename to modules/programs/taskwarrior/default.nix diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer/default.nix similarity index 100% rename from modules/programs/tealdeer.nix rename to modules/programs/tealdeer/default.nix diff --git a/modules/programs/television.nix b/modules/programs/television/default.nix similarity index 100% rename from modules/programs/television.nix rename to modules/programs/television/default.nix diff --git a/modules/programs/terminator.nix b/modules/programs/terminator/default.nix similarity index 100% rename from modules/programs/terminator.nix rename to modules/programs/terminator/default.nix diff --git a/modules/programs/termite.nix b/modules/programs/termite/default.nix similarity index 100% rename from modules/programs/termite.nix rename to modules/programs/termite/default.nix diff --git a/modules/programs/tex-fmt.nix b/modules/programs/tex-fmt/default.nix similarity index 100% rename from modules/programs/tex-fmt.nix rename to modules/programs/tex-fmt/default.nix diff --git a/modules/programs/texlive.nix b/modules/programs/texlive/default.nix similarity index 100% rename from modules/programs/texlive.nix rename to modules/programs/texlive/default.nix diff --git a/modules/programs/thefuck.nix b/modules/programs/thefuck/default.nix similarity index 100% rename from modules/programs/thefuck.nix rename to modules/programs/thefuck/default.nix diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird/default.nix similarity index 99% rename from modules/programs/thunderbird.nix rename to modules/programs/thunderbird/default.nix index bfc3ac1b7..55595eded 100644 --- a/modules/programs/thunderbird.nix +++ b/modules/programs/thunderbird/default.nix @@ -440,7 +440,7 @@ in search = mkOption { type = types.submodule ( args: - import ./firefox/profiles/search.nix { + import ../firefox/profiles/search.nix { inherit (args) config; inherit lib pkgs; appName = "Thunderbird"; diff --git a/modules/programs/timidity.nix b/modules/programs/timidity/default.nix similarity index 100% rename from modules/programs/timidity.nix rename to modules/programs/timidity/default.nix diff --git a/modules/programs/tint2.nix b/modules/programs/tint2/default.nix similarity index 100% rename from modules/programs/tint2.nix rename to modules/programs/tint2/default.nix diff --git a/modules/programs/tiny.nix b/modules/programs/tiny/default.nix similarity index 100% rename from modules/programs/tiny.nix rename to modules/programs/tiny/default.nix diff --git a/modules/programs/tmate.nix b/modules/programs/tmate/default.nix similarity index 100% rename from modules/programs/tmate.nix rename to modules/programs/tmate/default.nix diff --git a/modules/programs/tmux.nix b/modules/programs/tmux/default.nix similarity index 100% rename from modules/programs/tmux.nix rename to modules/programs/tmux/default.nix diff --git a/modules/programs/todoman.nix b/modules/programs/todoman/default.nix similarity index 100% rename from modules/programs/todoman.nix rename to modules/programs/todoman/default.nix diff --git a/modules/programs/tofi.nix b/modules/programs/tofi/default.nix similarity index 100% rename from modules/programs/tofi.nix rename to modules/programs/tofi/default.nix diff --git a/modules/programs/topgrade.nix b/modules/programs/topgrade/default.nix similarity index 100% rename from modules/programs/topgrade.nix rename to modules/programs/topgrade/default.nix diff --git a/modules/programs/translate-shell.nix b/modules/programs/translate-shell/default.nix similarity index 100% rename from modules/programs/translate-shell.nix rename to modules/programs/translate-shell/default.nix diff --git a/modules/programs/urxvt.nix b/modules/programs/urxvt/default.nix similarity index 100% rename from modules/programs/urxvt.nix rename to modules/programs/urxvt/default.nix diff --git a/modules/programs/uv.nix b/modules/programs/uv/default.nix similarity index 100% rename from modules/programs/uv.nix rename to modules/programs/uv/default.nix diff --git a/modules/programs/vdirsyncer-accounts.nix b/modules/programs/vdirsyncer/accounts.nix similarity index 100% rename from modules/programs/vdirsyncer-accounts.nix rename to modules/programs/vdirsyncer/accounts.nix diff --git a/modules/programs/vdirsyncer.nix b/modules/programs/vdirsyncer/default.nix similarity index 99% rename from modules/programs/vdirsyncer.nix rename to modules/programs/vdirsyncer/default.nix index 469499c10..06ad33d0d 100644 --- a/modules/programs/vdirsyncer.nix +++ b/modules/programs/vdirsyncer/default.nix @@ -184,6 +184,10 @@ let in { + imports = [ + ./accounts.nix + ]; + options = { programs.vdirsyncer = { enable = lib.mkEnableOption "vdirsyncer"; diff --git a/modules/programs/vesktop.nix b/modules/programs/vesktop/default.nix similarity index 100% rename from modules/programs/vesktop.nix rename to modules/programs/vesktop/default.nix diff --git a/modules/programs/vifm.nix b/modules/programs/vifm/default.nix similarity index 100% rename from modules/programs/vifm.nix rename to modules/programs/vifm/default.nix diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint/default.nix similarity index 100% rename from modules/programs/vim-vint.nix rename to modules/programs/vim-vint/default.nix diff --git a/modules/programs/vim.nix b/modules/programs/vim/default.nix similarity index 100% rename from modules/programs/vim.nix rename to modules/programs/vim/default.nix diff --git a/modules/programs/vinegar.nix b/modules/programs/vinegar/default.nix similarity index 100% rename from modules/programs/vinegar.nix rename to modules/programs/vinegar/default.nix diff --git a/modules/programs/visidata.nix b/modules/programs/visidata/default.nix similarity index 100% rename from modules/programs/visidata.nix rename to modules/programs/visidata/default.nix diff --git a/modules/programs/vscode.nix b/modules/programs/vscode/default.nix similarity index 99% rename from modules/programs/vscode.nix rename to modules/programs/vscode/default.nix index 4c7df05b9..e961ab5f9 100644 --- a/modules/programs/vscode.nix +++ b/modules/programs/vscode/default.nix @@ -241,6 +241,7 @@ in { imports = [ + ./haskell.nix (lib.mkChangedOptionModule [ "programs" diff --git a/modules/programs/wallust.nix b/modules/programs/wallust/default.nix similarity index 100% rename from modules/programs/wallust.nix rename to modules/programs/wallust/default.nix diff --git a/modules/programs/watson.nix b/modules/programs/watson/default.nix similarity index 100% rename from modules/programs/watson.nix rename to modules/programs/watson/default.nix diff --git a/modules/programs/waveterm.nix b/modules/programs/waveterm/default.nix similarity index 100% rename from modules/programs/waveterm.nix rename to modules/programs/waveterm/default.nix diff --git a/modules/programs/waybar.nix b/modules/programs/waybar/default.nix similarity index 100% rename from modules/programs/waybar.nix rename to modules/programs/waybar/default.nix diff --git a/modules/programs/waylogout.nix b/modules/programs/waylogout/default.nix similarity index 100% rename from modules/programs/waylogout.nix rename to modules/programs/waylogout/default.nix diff --git a/modules/programs/wayprompt.nix b/modules/programs/wayprompt/default.nix similarity index 100% rename from modules/programs/wayprompt.nix rename to modules/programs/wayprompt/default.nix diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm/default.nix similarity index 100% rename from modules/programs/wezterm.nix rename to modules/programs/wezterm/default.nix diff --git a/modules/programs/wlogout.nix b/modules/programs/wlogout/default.nix similarity index 100% rename from modules/programs/wlogout.nix rename to modules/programs/wlogout/default.nix diff --git a/modules/programs/wofi.nix b/modules/programs/wofi/default.nix similarity index 100% rename from modules/programs/wofi.nix rename to modules/programs/wofi/default.nix diff --git a/modules/programs/xmobar.nix b/modules/programs/xmobar/default.nix similarity index 100% rename from modules/programs/xmobar.nix rename to modules/programs/xmobar/default.nix diff --git a/modules/programs/xplr.nix b/modules/programs/xplr/default.nix similarity index 100% rename from modules/programs/xplr.nix rename to modules/programs/xplr/default.nix diff --git a/modules/programs/yambar.nix b/modules/programs/yambar/default.nix similarity index 100% rename from modules/programs/yambar.nix rename to modules/programs/yambar/default.nix diff --git a/modules/programs/yazi.nix b/modules/programs/yazi/default.nix similarity index 100% rename from modules/programs/yazi.nix rename to modules/programs/yazi/default.nix diff --git a/modules/programs/yt-dlp.nix b/modules/programs/yt-dlp/default.nix similarity index 100% rename from modules/programs/yt-dlp.nix rename to modules/programs/yt-dlp/default.nix diff --git a/modules/programs/z-lua.nix b/modules/programs/z-lua/default.nix similarity index 100% rename from modules/programs/z-lua.nix rename to modules/programs/z-lua/default.nix diff --git a/modules/programs/zathura.nix b/modules/programs/zathura/default.nix similarity index 100% rename from modules/programs/zathura.nix rename to modules/programs/zathura/default.nix diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor/default.nix similarity index 100% rename from modules/programs/zed-editor.nix rename to modules/programs/zed-editor/default.nix diff --git a/modules/programs/zellij.nix b/modules/programs/zellij/default.nix similarity index 100% rename from modules/programs/zellij.nix rename to modules/programs/zellij/default.nix diff --git a/modules/programs/zk.nix b/modules/programs/zk/default.nix similarity index 100% rename from modules/programs/zk.nix rename to modules/programs/zk/default.nix diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide/default.nix similarity index 100% rename from modules/programs/zoxide.nix rename to modules/programs/zoxide/default.nix diff --git a/modules/programs/zplug.nix b/modules/programs/zplug/default.nix similarity index 100% rename from modules/programs/zplug.nix rename to modules/programs/zplug/default.nix diff --git a/modules/programs/zsh.nix b/modules/programs/zsh/default.nix similarity index 99% rename from modules/programs/zsh.nix rename to modules/programs/zsh/default.nix index 9239849e2..9a1b801b6 100644 --- a/modules/programs/zsh.nix +++ b/modules/programs/zsh/default.nix @@ -30,6 +30,8 @@ let in { imports = [ + ./prezto.nix + ./zsh-abbr.nix (lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ] diff --git a/modules/services/activitywatch.nix b/modules/services/activitywatch/default.nix similarity index 100% rename from modules/services/activitywatch.nix rename to modules/services/activitywatch/default.nix diff --git a/modules/services/amberol.nix b/modules/services/amberol/default.nix similarity index 100% rename from modules/services/amberol.nix rename to modules/services/amberol/default.nix diff --git a/modules/services/arrpc.nix b/modules/services/arrpc/default.nix similarity index 100% rename from modules/services/arrpc.nix rename to modules/services/arrpc/default.nix diff --git a/modules/services/autorandr.nix b/modules/services/autorandr/default.nix similarity index 100% rename from modules/services/autorandr.nix rename to modules/services/autorandr/default.nix diff --git a/modules/services/avizo.nix b/modules/services/avizo/default.nix similarity index 100% rename from modules/services/avizo.nix rename to modules/services/avizo/default.nix diff --git a/modules/services/barrier.nix b/modules/services/barrier/default.nix similarity index 100% rename from modules/services/barrier.nix rename to modules/services/barrier/default.nix diff --git a/modules/services/batsignal.nix b/modules/services/batsignal/default.nix similarity index 100% rename from modules/services/batsignal.nix rename to modules/services/batsignal/default.nix diff --git a/modules/services/betterlockscreen.nix b/modules/services/betterlockscreen/default.nix similarity index 100% rename from modules/services/betterlockscreen.nix rename to modules/services/betterlockscreen/default.nix diff --git a/modules/services/blanket.nix b/modules/services/blanket/default.nix similarity index 100% rename from modules/services/blanket.nix rename to modules/services/blanket/default.nix diff --git a/modules/services/blueman-applet.nix b/modules/services/blueman-applet/default.nix similarity index 100% rename from modules/services/blueman-applet.nix rename to modules/services/blueman-applet/default.nix diff --git a/modules/services/borgmatic.nix b/modules/services/borgmatic/default.nix similarity index 100% rename from modules/services/borgmatic.nix rename to modules/services/borgmatic/default.nix diff --git a/modules/services/cachix-agent.nix b/modules/services/cachix-agent/default.nix similarity index 100% rename from modules/services/cachix-agent.nix rename to modules/services/cachix-agent/default.nix diff --git a/modules/services/caffeine.nix b/modules/services/caffeine/default.nix similarity index 100% rename from modules/services/caffeine.nix rename to modules/services/caffeine/default.nix diff --git a/modules/services/cbatticon.nix b/modules/services/cbatticon/default.nix similarity index 100% rename from modules/services/cbatticon.nix rename to modules/services/cbatticon/default.nix diff --git a/modules/services/clipcat.nix b/modules/services/clipcat/default.nix similarity index 100% rename from modules/services/clipcat.nix rename to modules/services/clipcat/default.nix diff --git a/modules/services/cliphist.nix b/modules/services/cliphist/default.nix similarity index 100% rename from modules/services/cliphist.nix rename to modules/services/cliphist/default.nix diff --git a/modules/services/clipman.nix b/modules/services/clipman/default.nix similarity index 100% rename from modules/services/clipman.nix rename to modules/services/clipman/default.nix diff --git a/modules/services/clipmenu.nix b/modules/services/clipmenu/default.nix similarity index 100% rename from modules/services/clipmenu.nix rename to modules/services/clipmenu/default.nix diff --git a/modules/services/clipse.nix b/modules/services/clipse/default.nix similarity index 100% rename from modules/services/clipse.nix rename to modules/services/clipse/default.nix diff --git a/modules/services/comodoro.nix b/modules/services/comodoro/default.nix similarity index 100% rename from modules/services/comodoro.nix rename to modules/services/comodoro/default.nix diff --git a/modules/services/conky.nix b/modules/services/conky/default.nix similarity index 100% rename from modules/services/conky.nix rename to modules/services/conky/default.nix diff --git a/modules/services/copyq.nix b/modules/services/copyq/default.nix similarity index 100% rename from modules/services/copyq.nix rename to modules/services/copyq/default.nix diff --git a/modules/services/darkman.nix b/modules/services/darkman/default.nix similarity index 100% rename from modules/services/darkman.nix rename to modules/services/darkman/default.nix diff --git a/modules/services/davmail.nix b/modules/services/davmail/default.nix similarity index 100% rename from modules/services/davmail.nix rename to modules/services/davmail/default.nix diff --git a/modules/services/devilspie2.nix b/modules/services/devilspie2/default.nix similarity index 100% rename from modules/services/devilspie2.nix rename to modules/services/devilspie2/default.nix diff --git a/modules/services/dropbox.nix b/modules/services/dropbox/default.nix similarity index 100% rename from modules/services/dropbox.nix rename to modules/services/dropbox/default.nix diff --git a/modules/services/dunst.nix b/modules/services/dunst/default.nix similarity index 100% rename from modules/services/dunst.nix rename to modules/services/dunst/default.nix diff --git a/modules/services/dwm-status.nix b/modules/services/dwm-status/default.nix similarity index 100% rename from modules/services/dwm-status.nix rename to modules/services/dwm-status/default.nix diff --git a/modules/services/easyeffects.nix b/modules/services/easyeffects/default.nix similarity index 100% rename from modules/services/easyeffects.nix rename to modules/services/easyeffects/default.nix diff --git a/modules/services/emacs.nix b/modules/services/emacs/default.nix similarity index 100% rename from modules/services/emacs.nix rename to modules/services/emacs/default.nix diff --git a/modules/services/espanso.nix b/modules/services/espanso/default.nix similarity index 100% rename from modules/services/espanso.nix rename to modules/services/espanso/default.nix diff --git a/modules/services/etesync-dav.nix b/modules/services/etesync-dav/default.nix similarity index 100% rename from modules/services/etesync-dav.nix rename to modules/services/etesync-dav/default.nix diff --git a/modules/services/flameshot.nix b/modules/services/flameshot/default.nix similarity index 100% rename from modules/services/flameshot.nix rename to modules/services/flameshot/default.nix diff --git a/modules/services/fluidsynth.nix b/modules/services/fluidsynth/default.nix similarity index 100% rename from modules/services/fluidsynth.nix rename to modules/services/fluidsynth/default.nix diff --git a/modules/services/fnott.nix b/modules/services/fnott/default.nix similarity index 100% rename from modules/services/fnott.nix rename to modules/services/fnott/default.nix diff --git a/modules/services/fusuma.nix b/modules/services/fusuma/default.nix similarity index 100% rename from modules/services/fusuma.nix rename to modules/services/fusuma/default.nix diff --git a/modules/services/getmail.nix b/modules/services/getmail/default.nix similarity index 100% rename from modules/services/getmail.nix rename to modules/services/getmail/default.nix diff --git a/modules/services/git-sync.nix b/modules/services/git-sync/default.nix similarity index 100% rename from modules/services/git-sync.nix rename to modules/services/git-sync/default.nix diff --git a/modules/services/glance.nix b/modules/services/glance/default.nix similarity index 100% rename from modules/services/glance.nix rename to modules/services/glance/default.nix diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring/default.nix similarity index 100% rename from modules/services/gnome-keyring.nix rename to modules/services/gnome-keyring/default.nix diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent/default.nix similarity index 100% rename from modules/services/gpg-agent.nix rename to modules/services/gpg-agent/default.nix diff --git a/modules/services/grobi.nix b/modules/services/grobi/default.nix similarity index 100% rename from modules/services/grobi.nix rename to modules/services/grobi/default.nix diff --git a/modules/services/gromit-mpx.nix b/modules/services/gromit-mpx/default.nix similarity index 100% rename from modules/services/gromit-mpx.nix rename to modules/services/gromit-mpx/default.nix diff --git a/modules/services/home-manager-auto-expire.nix b/modules/services/home-manager-auto-expire/default.nix similarity index 98% rename from modules/services/home-manager-auto-expire.nix rename to modules/services/home-manager-auto-expire/default.nix index 2f98d2051..d6c5af70d 100644 --- a/modules/services/home-manager-auto-expire.nix +++ b/modules/services/home-manager-auto-expire/default.nix @@ -9,7 +9,7 @@ let cfg = config.services.home-manager.autoExpire; - homeManagerPackage = pkgs.callPackage ../../home-manager { + homeManagerPackage = pkgs.callPackage ../../../home-manager { path = config.programs.home-manager.path; }; diff --git a/modules/services/home-manager-auto-upgrade.nix b/modules/services/home-manager-auto-upgrade/default.nix similarity index 96% rename from modules/services/home-manager-auto-upgrade.nix rename to modules/services/home-manager-auto-upgrade/default.nix index bf5aa9ac9..3e88d1aac 100644 --- a/modules/services/home-manager-auto-upgrade.nix +++ b/modules/services/home-manager-auto-upgrade/default.nix @@ -9,7 +9,7 @@ let cfg = config.services.home-manager.autoUpgrade; - homeManagerPackage = pkgs.callPackage ../../home-manager { + homeManagerPackage = pkgs.callPackage ../../../home-manager { path = config.programs.home-manager.path; }; diff --git a/modules/services/hound.nix b/modules/services/hound/default.nix similarity index 100% rename from modules/services/hound.nix rename to modules/services/hound/default.nix diff --git a/modules/services/hypridle.nix b/modules/services/hypridle/default.nix similarity index 100% rename from modules/services/hypridle.nix rename to modules/services/hypridle/default.nix diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper/default.nix similarity index 100% rename from modules/services/hyprpaper.nix rename to modules/services/hyprpaper/default.nix diff --git a/modules/services/hyprpolkitagent.nix b/modules/services/hyprpolkitagent/default.nix similarity index 100% rename from modules/services/hyprpolkitagent.nix rename to modules/services/hyprpolkitagent/default.nix diff --git a/modules/services/hyprsunset.nix b/modules/services/hyprsunset/default.nix similarity index 100% rename from modules/services/hyprsunset.nix rename to modules/services/hyprsunset/default.nix diff --git a/modules/services/imapnotify-accounts.nix b/modules/services/imapnotify/accounts.nix similarity index 100% rename from modules/services/imapnotify-accounts.nix rename to modules/services/imapnotify/accounts.nix diff --git a/modules/services/imapnotify.nix b/modules/services/imapnotify/default.nix similarity index 98% rename from modules/services/imapnotify.nix rename to modules/services/imapnotify/default.nix index 2a089f388..e5d1311bb 100644 --- a/modules/services/imapnotify.nix +++ b/modules/services/imapnotify/default.nix @@ -143,7 +143,7 @@ in }; accounts.email.accounts = mkOption { - type = with types; attrsOf (submodule (import ./imapnotify-accounts.nix { inherit pkgs lib; })); + type = with types; attrsOf (submodule (import ./accounts.nix { inherit pkgs lib; })); }; }; diff --git a/modules/services/jankyborders.nix b/modules/services/jankyborders/default.nix similarity index 100% rename from modules/services/jankyborders.nix rename to modules/services/jankyborders/default.nix diff --git a/modules/services/jellyfin-mpv-shim.nix b/modules/services/jellyfin-mpv-shim/default.nix similarity index 100% rename from modules/services/jellyfin-mpv-shim.nix rename to modules/services/jellyfin-mpv-shim/default.nix diff --git a/modules/services/kanshi.nix b/modules/services/kanshi/default.nix similarity index 100% rename from modules/services/kanshi.nix rename to modules/services/kanshi/default.nix diff --git a/modules/services/kbfs.nix b/modules/services/kbfs/default.nix similarity index 100% rename from modules/services/kbfs.nix rename to modules/services/kbfs/default.nix diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect/default.nix similarity index 100% rename from modules/services/kdeconnect.nix rename to modules/services/kdeconnect/default.nix diff --git a/modules/services/keybase.nix b/modules/services/keybase/default.nix similarity index 100% rename from modules/services/keybase.nix rename to modules/services/keybase/default.nix diff --git a/modules/services/keynav.nix b/modules/services/keynav/default.nix similarity index 100% rename from modules/services/keynav.nix rename to modules/services/keynav/default.nix diff --git a/modules/services/librespot.nix b/modules/services/librespot/default.nix similarity index 100% rename from modules/services/librespot.nix rename to modules/services/librespot/default.nix diff --git a/modules/services/lieer.nix b/modules/services/lieer/default.nix similarity index 100% rename from modules/services/lieer.nix rename to modules/services/lieer/default.nix diff --git a/modules/services/linux-wallpaperengine.nix b/modules/services/linux-wallpaperengine/default.nix similarity index 100% rename from modules/services/linux-wallpaperengine.nix rename to modules/services/linux-wallpaperengine/default.nix diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd/default.nix similarity index 100% rename from modules/services/listenbrainz-mpd.nix rename to modules/services/listenbrainz-mpd/default.nix diff --git a/modules/services/lorri.nix b/modules/services/lorri/default.nix similarity index 100% rename from modules/services/lorri.nix rename to modules/services/lorri/default.nix diff --git a/modules/services/ludusavi.nix b/modules/services/ludusavi/default.nix similarity index 100% rename from modules/services/ludusavi.nix rename to modules/services/ludusavi/default.nix diff --git a/modules/services/lxqt-policykit-agent.nix b/modules/services/lxqt-policykit-agent/default.nix similarity index 100% rename from modules/services/lxqt-policykit-agent.nix rename to modules/services/lxqt-policykit-agent/default.nix diff --git a/modules/services/mako.nix b/modules/services/mako/default.nix similarity index 100% rename from modules/services/mako.nix rename to modules/services/mako/default.nix diff --git a/modules/services/mbsync.nix b/modules/services/mbsync/default.nix similarity index 100% rename from modules/services/mbsync.nix rename to modules/services/mbsync/default.nix diff --git a/modules/services/megasync.nix b/modules/services/megasync/default.nix similarity index 100% rename from modules/services/megasync.nix rename to modules/services/megasync/default.nix diff --git a/modules/services/mopidy.nix b/modules/services/mopidy/default.nix similarity index 100% rename from modules/services/mopidy.nix rename to modules/services/mopidy/default.nix diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc/default.nix similarity index 100% rename from modules/services/mpd-discord-rpc.nix rename to modules/services/mpd-discord-rpc/default.nix diff --git a/modules/services/mpd-mpris.nix b/modules/services/mpd-mpris/default.nix similarity index 100% rename from modules/services/mpd-mpris.nix rename to modules/services/mpd-mpris/default.nix diff --git a/modules/services/mpd.nix b/modules/services/mpd/default.nix similarity index 100% rename from modules/services/mpd.nix rename to modules/services/mpd/default.nix diff --git a/modules/services/mpdris2.nix b/modules/services/mpdris2/default.nix similarity index 100% rename from modules/services/mpdris2.nix rename to modules/services/mpdris2/default.nix diff --git a/modules/services/mpdscribble.nix b/modules/services/mpdscribble/default.nix similarity index 100% rename from modules/services/mpdscribble.nix rename to modules/services/mpdscribble/default.nix diff --git a/modules/services/mpris-proxy.nix b/modules/services/mpris-proxy/default.nix similarity index 100% rename from modules/services/mpris-proxy.nix rename to modules/services/mpris-proxy/default.nix diff --git a/modules/services/muchsync.nix b/modules/services/muchsync/default.nix similarity index 100% rename from modules/services/muchsync.nix rename to modules/services/muchsync/default.nix diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet/default.nix similarity index 100% rename from modules/services/network-manager-applet.nix rename to modules/services/network-manager-applet/default.nix diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client/default.nix similarity index 100% rename from modules/services/nextcloud-client.nix rename to modules/services/nextcloud-client/default.nix diff --git a/modules/services/nix-gc.nix b/modules/services/nix-gc/default.nix similarity index 100% rename from modules/services/nix-gc.nix rename to modules/services/nix-gc/default.nix diff --git a/modules/services/notify-osd.nix b/modules/services/notify-osd/default.nix similarity index 100% rename from modules/services/notify-osd.nix rename to modules/services/notify-osd/default.nix diff --git a/modules/services/ollama.nix b/modules/services/ollama/default.nix similarity index 100% rename from modules/services/ollama.nix rename to modules/services/ollama/default.nix diff --git a/modules/services/opensnitch-ui.nix b/modules/services/opensnitch-ui/default.nix similarity index 100% rename from modules/services/opensnitch-ui.nix rename to modules/services/opensnitch-ui/default.nix diff --git a/modules/services/osmscout-server.nix b/modules/services/osmscout-server/default.nix similarity index 100% rename from modules/services/osmscout-server.nix rename to modules/services/osmscout-server/default.nix diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client/default.nix similarity index 100% rename from modules/services/owncloud-client.nix rename to modules/services/owncloud-client/default.nix diff --git a/modules/services/pantalaimon.nix b/modules/services/pantalaimon/default.nix similarity index 100% rename from modules/services/pantalaimon.nix rename to modules/services/pantalaimon/default.nix diff --git a/modules/services/parcellite.nix b/modules/services/parcellite/default.nix similarity index 100% rename from modules/services/parcellite.nix rename to modules/services/parcellite/default.nix diff --git a/modules/services/pass-secret-service.nix b/modules/services/pass-secret-service/default.nix similarity index 100% rename from modules/services/pass-secret-service.nix rename to modules/services/pass-secret-service/default.nix diff --git a/modules/services/pasystray.nix b/modules/services/pasystray/default.nix similarity index 100% rename from modules/services/pasystray.nix rename to modules/services/pasystray/default.nix diff --git a/modules/services/pbgopy.nix b/modules/services/pbgopy/default.nix similarity index 100% rename from modules/services/pbgopy.nix rename to modules/services/pbgopy/default.nix diff --git a/modules/services/picom.nix b/modules/services/picom/default.nix similarity index 100% rename from modules/services/picom.nix rename to modules/services/picom/default.nix diff --git a/modules/services/plan9port.nix b/modules/services/plan9port/default.nix similarity index 100% rename from modules/services/plan9port.nix rename to modules/services/plan9port/default.nix diff --git a/modules/services/playerctld.nix b/modules/services/playerctld/default.nix similarity index 100% rename from modules/services/playerctld.nix rename to modules/services/playerctld/default.nix diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim/default.nix similarity index 100% rename from modules/services/plex-mpv-shim.nix rename to modules/services/plex-mpv-shim/default.nix diff --git a/modules/services/polkit-gnome.nix b/modules/services/polkit-gnome/default.nix similarity index 100% rename from modules/services/polkit-gnome.nix rename to modules/services/polkit-gnome/default.nix diff --git a/modules/services/polybar.nix b/modules/services/polybar/default.nix similarity index 100% rename from modules/services/polybar.nix rename to modules/services/polybar/default.nix diff --git a/modules/services/poweralertd.nix b/modules/services/poweralertd/default.nix similarity index 100% rename from modules/services/poweralertd.nix rename to modules/services/poweralertd/default.nix diff --git a/modules/services/psd.nix b/modules/services/psd/default.nix similarity index 100% rename from modules/services/psd.nix rename to modules/services/psd/default.nix diff --git a/modules/services/pueue.nix b/modules/services/pueue/default.nix similarity index 100% rename from modules/services/pueue.nix rename to modules/services/pueue/default.nix diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects/default.nix similarity index 100% rename from modules/services/pulseeffects.nix rename to modules/services/pulseeffects/default.nix diff --git a/modules/services/random-background.nix b/modules/services/random-background/default.nix similarity index 100% rename from modules/services/random-background.nix rename to modules/services/random-background/default.nix diff --git a/modules/services/recoll.nix b/modules/services/recoll/default.nix similarity index 100% rename from modules/services/recoll.nix rename to modules/services/recoll/default.nix diff --git a/modules/services/redshift-gammastep/default.nix b/modules/services/redshift-gammastep/default.nix new file mode 100644 index 000000000..f292a2e55 --- /dev/null +++ b/modules/services/redshift-gammastep/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./gammastep.nix + ./redshift.nix + ]; +} diff --git a/modules/services/remmina.nix b/modules/services/remmina/default.nix similarity index 100% rename from modules/services/remmina.nix rename to modules/services/remmina/default.nix diff --git a/modules/services/restic.nix b/modules/services/restic/default.nix similarity index 100% rename from modules/services/restic.nix rename to modules/services/restic/default.nix diff --git a/modules/services/rsibreak.nix b/modules/services/rsibreak/default.nix similarity index 100% rename from modules/services/rsibreak.nix rename to modules/services/rsibreak/default.nix diff --git a/modules/services/safeeyes.nix b/modules/services/safeeyes/default.nix similarity index 100% rename from modules/services/safeeyes.nix rename to modules/services/safeeyes/default.nix diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker/default.nix similarity index 100% rename from modules/services/screen-locker.nix rename to modules/services/screen-locker/default.nix diff --git a/modules/services/sctd.nix b/modules/services/sctd/default.nix similarity index 100% rename from modules/services/sctd.nix rename to modules/services/sctd/default.nix diff --git a/modules/services/shikane.nix b/modules/services/shikane/default.nix similarity index 100% rename from modules/services/shikane.nix rename to modules/services/shikane/default.nix diff --git a/modules/services/signaturepdf.nix b/modules/services/signaturepdf/default.nix similarity index 100% rename from modules/services/signaturepdf.nix rename to modules/services/signaturepdf/default.nix diff --git a/modules/services/skhd.nix b/modules/services/skhd/default.nix similarity index 100% rename from modules/services/skhd.nix rename to modules/services/skhd/default.nix diff --git a/modules/services/snixembed.nix b/modules/services/snixembed/default.nix similarity index 100% rename from modules/services/snixembed.nix rename to modules/services/snixembed/default.nix diff --git a/modules/services/spotifyd.nix b/modules/services/spotifyd/default.nix similarity index 100% rename from modules/services/spotifyd.nix rename to modules/services/spotifyd/default.nix diff --git a/modules/services/ssh-agent.nix b/modules/services/ssh-agent/default.nix similarity index 100% rename from modules/services/ssh-agent.nix rename to modules/services/ssh-agent/default.nix diff --git a/modules/services/stalonetray.nix b/modules/services/stalonetray/default.nix similarity index 100% rename from modules/services/stalonetray.nix rename to modules/services/stalonetray/default.nix diff --git a/modules/services/status-notifier-watcher.nix b/modules/services/status-notifier-watcher/default.nix similarity index 100% rename from modules/services/status-notifier-watcher.nix rename to modules/services/status-notifier-watcher/default.nix diff --git a/modules/services/swayidle.nix b/modules/services/swayidle/default.nix similarity index 100% rename from modules/services/swayidle.nix rename to modules/services/swayidle/default.nix diff --git a/modules/services/swaync.nix b/modules/services/swaync/default.nix similarity index 100% rename from modules/services/swaync.nix rename to modules/services/swaync/default.nix diff --git a/modules/services/swayosd.nix b/modules/services/swayosd/default.nix similarity index 100% rename from modules/services/swayosd.nix rename to modules/services/swayosd/default.nix diff --git a/modules/services/swww.nix b/modules/services/swww/default.nix similarity index 100% rename from modules/services/swww.nix rename to modules/services/swww/default.nix diff --git a/modules/services/sxhkd.nix b/modules/services/sxhkd/default.nix similarity index 100% rename from modules/services/sxhkd.nix rename to modules/services/sxhkd/default.nix diff --git a/modules/services/syncthing.nix b/modules/services/syncthing/default.nix similarity index 100% rename from modules/services/syncthing.nix rename to modules/services/syncthing/default.nix diff --git a/modules/services/systembus-notify.nix b/modules/services/systembus-notify/default.nix similarity index 100% rename from modules/services/systembus-notify.nix rename to modules/services/systembus-notify/default.nix diff --git a/modules/services/taffybar.nix b/modules/services/taffybar/default.nix similarity index 100% rename from modules/services/taffybar.nix rename to modules/services/taffybar/default.nix diff --git a/modules/services/tahoe-lafs.nix b/modules/services/tahoe-lafs/default.nix similarity index 100% rename from modules/services/tahoe-lafs.nix rename to modules/services/tahoe-lafs/default.nix diff --git a/modules/services/taskwarrior-sync.nix b/modules/services/taskwarrior-sync/default.nix similarity index 100% rename from modules/services/taskwarrior-sync.nix rename to modules/services/taskwarrior-sync/default.nix diff --git a/modules/services/tldr-update.nix b/modules/services/tldr-update/default.nix similarity index 100% rename from modules/services/tldr-update.nix rename to modules/services/tldr-update/default.nix diff --git a/modules/services/trayer.nix b/modules/services/trayer/default.nix similarity index 100% rename from modules/services/trayer.nix rename to modules/services/trayer/default.nix diff --git a/modules/services/trayscale.nix b/modules/services/trayscale/default.nix similarity index 100% rename from modules/services/trayscale.nix rename to modules/services/trayscale/default.nix diff --git a/modules/services/twmn.nix b/modules/services/twmn/default.nix similarity index 100% rename from modules/services/twmn.nix rename to modules/services/twmn/default.nix diff --git a/modules/services/udiskie.nix b/modules/services/udiskie/default.nix similarity index 100% rename from modules/services/udiskie.nix rename to modules/services/udiskie/default.nix diff --git a/modules/services/unclutter.nix b/modules/services/unclutter/default.nix similarity index 100% rename from modules/services/unclutter.nix rename to modules/services/unclutter/default.nix diff --git a/modules/services/unison.nix b/modules/services/unison/default.nix similarity index 100% rename from modules/services/unison.nix rename to modules/services/unison/default.nix diff --git a/modules/services/vdirsyncer.nix b/modules/services/vdirsyncer/default.nix similarity index 100% rename from modules/services/vdirsyncer.nix rename to modules/services/vdirsyncer/default.nix diff --git a/modules/services/volnoti.nix b/modules/services/volnoti/default.nix similarity index 100% rename from modules/services/volnoti.nix rename to modules/services/volnoti/default.nix diff --git a/modules/services/way-displays.nix b/modules/services/way-displays/default.nix similarity index 100% rename from modules/services/way-displays.nix rename to modules/services/way-displays/default.nix diff --git a/modules/services/wayvnc.nix b/modules/services/wayvnc/default.nix similarity index 100% rename from modules/services/wayvnc.nix rename to modules/services/wayvnc/default.nix diff --git a/modules/services/window-managers/awesome.nix b/modules/services/window-managers/awesome/default.nix similarity index 100% rename from modules/services/window-managers/awesome.nix rename to modules/services/window-managers/awesome/default.nix diff --git a/modules/services/window-managers/default.nix b/modules/services/window-managers/default.nix new file mode 100644 index 000000000..cdb2d7a2e --- /dev/null +++ b/modules/services/window-managers/default.nix @@ -0,0 +1,15 @@ +{ + imports = [ + ./awesome + ./bspwm + ./fluxbox + ./herbstluftwm + ./hyprland + ./i3-sway + ./labwc + ./river + ./spectrwm + ./wayfire + ./xmonad + ]; +} diff --git a/modules/services/window-managers/fluxbox.nix b/modules/services/window-managers/fluxbox/default.nix similarity index 100% rename from modules/services/window-managers/fluxbox.nix rename to modules/services/window-managers/fluxbox/default.nix diff --git a/modules/services/window-managers/herbstluftwm.nix b/modules/services/window-managers/herbstluftwm/default.nix similarity index 100% rename from modules/services/window-managers/herbstluftwm.nix rename to modules/services/window-managers/herbstluftwm/default.nix diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland/default.nix similarity index 100% rename from modules/services/window-managers/hyprland.nix rename to modules/services/window-managers/hyprland/default.nix diff --git a/modules/services/window-managers/i3-sway/default.nix b/modules/services/window-managers/i3-sway/default.nix new file mode 100644 index 000000000..3f5f33402 --- /dev/null +++ b/modules/services/window-managers/i3-sway/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./i3.nix + ./sway.nix + ./swaynag.nix + ]; +} diff --git a/modules/services/window-managers/labwc/labwc.nix b/modules/services/window-managers/labwc/default.nix similarity index 100% rename from modules/services/window-managers/labwc/labwc.nix rename to modules/services/window-managers/labwc/default.nix diff --git a/modules/services/window-managers/river.nix b/modules/services/window-managers/river/default.nix similarity index 100% rename from modules/services/window-managers/river.nix rename to modules/services/window-managers/river/default.nix diff --git a/modules/services/window-managers/spectrwm.nix b/modules/services/window-managers/spectrwm/default.nix similarity index 100% rename from modules/services/window-managers/spectrwm.nix rename to modules/services/window-managers/spectrwm/default.nix diff --git a/modules/services/window-managers/wayfire.nix b/modules/services/window-managers/wayfire/default.nix similarity index 100% rename from modules/services/window-managers/wayfire.nix rename to modules/services/window-managers/wayfire/default.nix diff --git a/modules/services/window-managers/xmonad.nix b/modules/services/window-managers/xmonad/default.nix similarity index 100% rename from modules/services/window-managers/xmonad.nix rename to modules/services/window-managers/xmonad/default.nix diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset/default.nix similarity index 100% rename from modules/services/wlsunset.nix rename to modules/services/wlsunset/default.nix diff --git a/modules/services/wluma.nix b/modules/services/wluma/default.nix similarity index 100% rename from modules/services/wluma.nix rename to modules/services/wluma/default.nix diff --git a/modules/services/wob.nix b/modules/services/wob/default.nix similarity index 100% rename from modules/services/wob.nix rename to modules/services/wob/default.nix diff --git a/modules/services/wpaperd.nix b/modules/services/wpaperd/default.nix similarity index 100% rename from modules/services/wpaperd.nix rename to modules/services/wpaperd/default.nix diff --git a/modules/services/xcape.nix b/modules/services/xcape/default.nix similarity index 100% rename from modules/services/xcape.nix rename to modules/services/xcape/default.nix diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy/default.nix similarity index 100% rename from modules/services/xembed-sni-proxy.nix rename to modules/services/xembed-sni-proxy/default.nix diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook/default.nix similarity index 100% rename from modules/services/xidlehook.nix rename to modules/services/xidlehook/default.nix diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver/default.nix similarity index 100% rename from modules/services/xscreensaver.nix rename to modules/services/xscreensaver/default.nix diff --git a/modules/services/xsettingsd.nix b/modules/services/xsettingsd/default.nix similarity index 100% rename from modules/services/xsettingsd.nix rename to modules/services/xsettingsd/default.nix diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender/default.nix similarity index 100% rename from modules/services/xsuspender.nix rename to modules/services/xsuspender/default.nix diff --git a/modules/services/yubikey-agent.nix b/modules/services/yubikey-agent/default.nix similarity index 100% rename from modules/services/yubikey-agent.nix rename to modules/services/yubikey-agent/default.nix