From 86402a17b6c67b07c5536354da5d56c14196de46 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Jun 2025 10:56:23 -0500
Subject: [PATCH] treewide: flatten single file modules

Some files don't need nesting and can be root level again to reduce
conflicts with other PRs.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../programs/{abook/default.nix => abook.nix}    |  0
 .../{aerospace/default.nix => aerospace.nix}     |  0
 modules/programs/{afew/default.nix => afew.nix}  |  0
 .../programs/{aichat/default.nix => aichat.nix}  |  0
 .../{alacritty/default.nix => alacritty.nix}     |  0
 .../{antidote/default.nix => antidote.nix}       |  0
 .../programs/{anyrun/default.nix => anyrun.nix}  |  0
 .../programs/{aria2/default.nix => aria2.nix}    |  0
 .../programs/{ashell/default.nix => ashell.nix}  |  0
 .../programs/{atuin/default.nix => atuin.nix}    |  0
 .../{autojump/default.nix => autojump.nix}       |  0
 .../{autorandr/default.nix => autorandr.nix}     |  0
 .../programs/{awscli/default.nix => awscli.nix}  |  0
 .../programs/{bacon/default.nix => bacon.nix}    |  0
 modules/programs/{bash/default.nix => bash.nix}  |  0
 .../{bashmount/default.nix => bashmount.nix}     |  0
 modules/programs/{bat/default.nix => bat.nix}    |  0
 .../programs/{beets/default.nix => beets.nix}    |  0
 .../programs/{bemenu/default.nix => bemenu.nix}  |  0
 .../{borgmatic/default.nix => borgmatic.nix}     |  0
 .../programs/{bottom/default.nix => bottom.nix}  |  0
 .../programs/{boxxy/default.nix => boxxy.nix}    |  0
 .../programs/{broot/default.nix => broot.nix}    |  0
 .../{browserpass/default.nix => browserpass.nix} |  0
 modules/programs/{btop/default.nix => btop.nix}  |  0
 modules/programs/{bun/default.nix => bun.nix}    |  0
 .../{carapace/default.nix => carapace.nix}       |  0
 modules/programs/{cava/default.nix => cava.nix}  |  0
 .../{cavalier/default.nix => cavalier.nix}       |  0
 .../programs/{chawan/default.nix => chawan.nix}  |  0
 .../{chromium/default.nix => chromium.nix}       |  0
 .../{clock-rs/default.nix => clock-rs.nix}       |  0
 modules/programs/{cmus/default.nix => cmus.nix}  |  0
 .../programs/{codex/default.nix => codex.nix}    |  0
 .../{comodoro/default.nix => comodoro.nix}       |  0
 .../programs/{darcs/default.nix => darcs.nix}    |  0
 .../{dircolors/default.nix => dircolors.nix}     |  0
 .../programs/{direnv/default.nix => direnv.nix}  |  0
 .../{discocss/default.nix => discocss.nix}       |  0
 .../{distrobox/default.nix => distrobox.nix}     |  0
 .../{earthly/default.nix => earthly.nix}         |  0
 .../{eclipse/default.nix => eclipse.nix}         |  0
 .../default.nix => element-desktop.nix}          |  0
 .../programs/{emacs/default.nix => emacs.nix}    |  0
 modules/programs/{eww/default.nix => eww.nix}    |  0
 modules/programs/{eza/default.nix => eza.nix}    |  0
 .../{fastfetch/default.nix => fastfetch.nix}     |  0
 modules/programs/{fd/default.nix => fd.nix}      |  0
 modules/programs/{feh/default.nix => feh.nix}    |  0
 modules/programs/{fish/default.nix => fish.nix}  |  0
 .../programs/{floorp/default.nix => floorp.nix}  |  2 +-
 .../{foliate/default.nix => foliate.nix}         |  0
 modules/programs/{foot/default.nix => foot.nix}  |  0
 .../{freetube/default.nix => freetube.nix}       |  0
 .../programs/{fuzzel/default.nix => fuzzel.nix}  |  0
 modules/programs/{fzf/default.nix => fzf.nix}    |  0
 .../{gallery-dl/default.nix => gallery-dl.nix}   |  0
 .../{gh-dash/default.nix => gh-dash.nix}         |  0
 modules/programs/{gh/default.nix => gh.nix}      |  0
 .../{ghostty/default.nix => ghostty.nix}         |  0
 .../{git-cliff/default.nix => git-cliff.nix}     |  0
 .../default.nix => git-credential-oauth.nix}     |  0
 .../default.nix => git-worktree-switcher.nix}    |  0
 modules/programs/{git/default.nix => git.nix}    |  0
 .../programs/{gitui/default.nix => gitui.nix}    |  0
 .../{gnome-shell/default.nix => gnome-shell.nix} |  0
 .../default.nix => gnome-terminal.nix}           |  0
 modules/programs/{go/default.nix => go.nix}      |  0
 modules/programs/{gpg/default.nix => gpg.nix}    |  0
 .../programs/{gradle/default.nix => gradle.nix}  |  0
 .../{granted/default.nix => granted.nix}         |  0
 .../programs/{halloy/default.nix => halloy.nix}  |  0
 .../programs/{havoc/default.nix => havoc.nix}    |  0
 .../programs/{helix/default.nix => helix.nix}    |  0
 .../{hexchat/default.nix => hexchat.nix}         |  0
 .../{himalaya/default.nix => himalaya.nix}       |  0
 .../default.nix => home-manager.nix}             |  2 +-
 modules/programs/{hstr/default.nix => hstr.nix}  |  0
 modules/programs/{htop/default.nix => htop.nix}  |  0
 .../programs/{hwatch/default.nix => hwatch.nix}  |  0
 .../{hyfetch/default.nix => hyfetch.nix}         |  0
 .../{hyprlock/default.nix => hyprlock.nix}       |  0
 .../{i3bar-river/default.nix => i3bar-river.nix} |  0
 .../{i3blocks/default.nix => i3blocks.nix}       |  0
 .../default.nix => i3status-rust.nix}            |  0
 .../{i3status/default.nix => i3status.nix}       |  0
 modules/programs/{iamb/default.nix => iamb.nix}  |  0
 modules/programs/{imv/default.nix => imv.nix}    |  0
 modules/programs/{info/default.nix => info.nix}  |  0
 .../programs/{inori/default.nix => inori.nix}    |  0
 modules/programs/{ion/default.nix => ion.nix}    |  0
 .../programs/{irssi/default.nix => irssi.nix}    |  0
 modules/programs/{java/default.nix => java.nix}  |  0
 .../default.nix => jetbrains-remote.nix}         |  0
 .../default.nix => joplin-desktop.nix}           |  0
 .../{joshuto/default.nix => joshuto.nix}         |  0
 modules/programs/{jq/default.nix => jq.nix}      |  0
 modules/programs/{jqp/default.nix => jqp.nix}    |  0
 .../{jujutsu/default.nix => jujutsu.nix}         |  0
 modules/programs/{just/default.nix => just.nix}  |  0
 modules/programs/{k9s/default.nix => k9s.nix}    |  0
 .../{kakoune/default.nix => kakoune.nix}         |  0
 .../{keepassxc/default.nix => keepassxc.nix}     |  0
 .../{keychain/default.nix => keychain.nix}       |  0
 .../programs/{khard/default.nix => khard.nix}    |  0
 .../{kickoff/default.nix => kickoff.nix}         |  0
 .../programs/{kitty/default.nix => kitty.nix}    |  0
 modules/programs/{kodi/default.nix => kodi.nix}  |  0
 .../{kubecolor/default.nix => kubecolor.nix}     |  0
 .../programs/{lapce/default.nix => lapce.nix}    |  0
 .../{lazydocker/default.nix => lazydocker.nix}   |  0
 .../{lazygit/default.nix => lazygit.nix}         |  0
 .../{lazysql/default.nix => lazysql.nix}         |  0
 .../programs/{ledger/default.nix => ledger.nix}  |  0
 modules/programs/{less/default.nix => less.nix}  |  0
 .../{lesspipe/default.nix => lesspipe.nix}       |  0
 modules/programs/{lf/default.nix => lf.nix}      |  0
 .../{librewolf/default.nix => librewolf.nix}     |  2 +-
 .../programs/{lieer/default.nix => lieer.nix}    |  0
 .../default.nix => looking-glass-client.nix}     |  0
 modules/programs/{lsd/default.nix => lsd.nix}    |  0
 .../programs/{lutris/default.nix => lutris.nix}  |  0
 modules/programs/{man/default.nix => man.nix}    |  0
 .../{mangohud/default.nix => mangohud.nix}       |  0
 .../{matplotlib/default.nix => matplotlib.nix}   |  0
 modules/programs/{mc/default.nix => mc.nix}      |  0
 .../programs/{mcfly/default.nix => mcfly.nix}    |  0
 modules/programs/{meli/default.nix => meli.nix}  |  0
 .../{mercurial/default.nix => mercurial.nix}     |  0
 .../{mergiraf/default.nix => mergiraf.nix}       |  0
 .../programs/{micro/default.nix => micro.nix}    |  0
 modules/programs/{mise/default.nix => mise.nix}  |  0
 modules/programs/{mods/default.nix => mods.nix}  |  0
 modules/programs/{mpv/default.nix => mpv.nix}    |  0
 .../{mpvpaper/default.nix => mpvpaper.nix}       |  0
 modules/programs/{mr/default.nix => mr.nix}      |  0
 modules/programs/{mu/default.nix => mu.nix}      |  0
 .../programs/{mujmap/default.nix => mujmap.nix}  |  0
 modules/programs/{navi/default.nix => navi.nix}  |  0
 .../{ncmpcpp/default.nix => ncmpcpp.nix}         |  0
 .../programs/{ncspot/default.nix => ncspot.nix}  |  0
 modules/programs/{ne/default.nix => ne.nix}      |  0
 .../{neovide/default.nix => neovide.nix}         |  0
 .../programs/{neovim/default.nix => neovim.nix}  |  2 +-
 .../{newsboat/default.nix => newsboat.nix}       |  0
 modules/programs/{nh/default.nix => nh.nix}      |  0
 .../programs/{nheko/default.nix => nheko.nix}    |  0
 .../default.nix => niriswitcher.nix}             |  0
 .../{nix-index/default.nix => nix-index.nix}     |  0
 .../{nix-init/default.nix => nix-init.nix}       |  0
 .../default.nix => nix-your-shell.nix}           |  0
 modules/programs/{nnn/default.nix => nnn.nix}    |  0
 modules/programs/{noti/default.nix => noti.nix}  |  0
 .../programs/{numbat/default.nix => numbat.nix}  |  0
 .../{nushell/default.nix => nushell.nix}         |  0
 modules/programs/{nyxt/default.nix => nyxt.nix}  |  0
 .../{obs-studio/default.nix => obs-studio.nix}   |  0
 .../{obsidian/default.nix => obsidian.nix}       |  0
 .../programs/{octant/default.nix => octant.nix}  |  0
 .../{oh-my-posh/default.nix => oh-my-posh.nix}   |  0
 .../programs/{onagre/default.nix => onagre.nix}  |  0
 .../{onedrive/default.nix => onedrive.nix}       |  0
 .../{onlyoffice/default.nix => onlyoffice.nix}   |  0
 modules/programs/{opam/default.nix => opam.nix}  |  0
 .../default.nix => openstackclient.nix}          |  0
 .../programs/{pandoc/default.nix => pandoc.nix}  |  0
 .../programs/{papis/default.nix => papis.nix}    |  0
 .../default.nix => password-store.nix}           |  0
 .../default.nix => pay-respects.nix}             |  0
 modules/programs/{pazi/default.nix => pazi.nix}  |  0
 modules/programs/{pet/default.nix => pet.nix}    |  0
 .../programs/{pgcli/default.nix => pgcli.nix}    |  0
 .../programs/{pidgin/default.nix => pidgin.nix}  |  0
 .../programs/{pistol/default.nix => pistol.nix}  |  0
 .../{piston-cli/default.nix => piston-cli.nix}   |  0
 modules/programs/{pls/default.nix => pls.nix}    |  0
 .../programs/{poetry/default.nix => poetry.nix}  |  0
 .../default.nix => powerline-go.nix}             |  0
 modules/programs/{pqiv/default.nix => pqiv.nix}  |  0
 .../programs/{ptyxis/default.nix => ptyxis.nix}  |  0
 modules/programs/{pubs/default.nix => pubs.nix}  |  0
 .../programs/{pyenv/default.nix => pyenv.nix}    |  0
 .../programs/{pylint/default.nix => pylint.nix}  |  0
 .../programs/{pywal/default.nix => pywal.nix}    |  0
 modules/programs/{qcal/default.nix => qcal.nix}  |  0
 .../{qutebrowser/default.nix => qutebrowser.nix} |  0
 .../programs/{ranger/default.nix => ranger.nix}  |  0
 .../programs/{rbenv/default.nix => rbenv.nix}    |  0
 modules/programs/{rbw/default.nix => rbw.nix}    |  0
 .../programs/{rclone/default.nix => rclone.nix}  |  0
 .../{readline/default.nix => readline.nix}       |  0
 modules/programs/{rio/default.nix => rio.nix}    |  0
 .../{ripgrep-all/default.nix => ripgrep-all.nix} |  0
 .../{ripgrep/default.nix => ripgrep.nix}         |  0
 modules/programs/{rmpc/default.nix => rmpc.nix}  |  0
 .../{rofi-pass/default.nix => rofi-pass.nix}     |  0
 modules/programs/{rofi/default.nix => rofi.nix}  |  0
 .../{rtorrent/default.nix => rtorrent.nix}       |  0
 modules/programs/{ruff/default.nix => ruff.nix}  |  0
 .../{sagemath/default.nix => sagemath.nix}       |  0
 .../{sapling/default.nix => sapling.nix}         |  0
 modules/programs/{sbt/default.nix => sbt.nix}    |  0
 .../{scmpuff/default.nix => scmpuff.nix}         |  0
 .../default.nix => script-directory.nix}         |  0
 .../programs/{senpai/default.nix => senpai.nix}  |  0
 modules/programs/{sesh/default.nix => sesh.nix}  |  0
 .../{sftpman/default.nix => sftpman.nix}         |  0
 .../programs/{sioyek/default.nix => sioyek.nix}  |  0
 .../{sketchybar/default.nix => sketchybar.nix}   |  0
 modules/programs/{skim/default.nix => skim.nix}  |  0
 .../programs/{sm64ex/default.nix => sm64ex.nix}  |  0
 modules/programs/{smug/default.nix => smug.nix}  |  0
 .../default.nix => spotify-player.nix}           |  0
 modules/programs/{sqls/default.nix => sqls.nix}  |  0
 modules/programs/{ssh/default.nix => ssh.nix}    |  0
 .../{starship/default.nix => starship.nix}       |  0
 .../{streamlink/default.nix => streamlink.nix}   |  0
 .../{superfile/default.nix => superfile.nix}     |  0
 .../default.nix => sway-easyfocus.nix}           |  0
 .../{swayimg/default.nix => swayimg.nix}         |  0
 .../{swaylock/default.nix => swaylock.nix}       |  0
 .../programs/{swayr/default.nix => swayr.nix}    |  0
 .../{taskwarrior/default.nix => taskwarrior.nix} |  0
 .../{tealdeer/default.nix => tealdeer.nix}       |  0
 .../{television/default.nix => television.nix}   |  0
 .../{terminator/default.nix => terminator.nix}   |  0
 .../{termite/default.nix => termite.nix}         |  0
 .../{tex-fmt/default.nix => tex-fmt.nix}         |  0
 .../{texlive/default.nix => texlive.nix}         |  0
 .../{thefuck/default.nix => thefuck.nix}         |  0
 .../{thunderbird/default.nix => thunderbird.nix} |  2 +-
 .../{timidity/default.nix => timidity.nix}       |  0
 .../programs/{tint2/default.nix => tint2.nix}    |  0
 modules/programs/{tiny/default.nix => tiny.nix}  |  0
 .../programs/{tmate/default.nix => tmate.nix}    |  0
 modules/programs/{tmux/default.nix => tmux.nix}  |  0
 .../{todoman/default.nix => todoman.nix}         |  0
 modules/programs/{tofi/default.nix => tofi.nix}  |  0
 .../{topgrade/default.nix => topgrade.nix}       |  0
 .../default.nix => translate-shell.nix}          |  0
 .../programs/{urxvt/default.nix => urxvt.nix}    |  0
 modules/programs/{uv/default.nix => uv.nix}      |  0
 .../{vesktop/default.nix => vesktop.nix}         |  0
 modules/programs/{vifm/default.nix => vifm.nix}  |  0
 .../{vim-vint/default.nix => vim-vint.nix}       |  0
 modules/programs/{vim/default.nix => vim.nix}    |  0
 .../{vinegar/default.nix => vinegar.nix}         |  0
 .../{visidata/default.nix => visidata.nix}       |  0
 .../{wallust/default.nix => wallust.nix}         |  0
 .../programs/{watson/default.nix => watson.nix}  |  0
 .../{waveterm/default.nix => waveterm.nix}       |  0
 .../programs/{waybar/default.nix => waybar.nix}  |  0
 .../{waylogout/default.nix => waylogout.nix}     |  0
 .../{wayprompt/default.nix => wayprompt.nix}     |  0
 .../{wezterm/default.nix => wezterm.nix}         |  0
 .../{wlogout/default.nix => wlogout.nix}         |  0
 modules/programs/{wofi/default.nix => wofi.nix}  |  0
 .../programs/{xmobar/default.nix => xmobar.nix}  |  0
 modules/programs/{xplr/default.nix => xplr.nix}  |  0
 .../programs/{yambar/default.nix => yambar.nix}  |  0
 modules/programs/{yazi/default.nix => yazi.nix}  |  0
 .../programs/{yt-dlp/default.nix => yt-dlp.nix}  |  0
 .../programs/{z-lua/default.nix => z-lua.nix}    |  0
 .../{zathura/default.nix => zathura.nix}         |  0
 .../{zed-editor/default.nix => zed-editor.nix}   |  0
 .../programs/{zellij/default.nix => zellij.nix}  |  0
 modules/programs/{zk/default.nix => zk.nix}      |  0
 .../programs/{zoxide/default.nix => zoxide.nix}  |  0
 .../programs/{zplug/default.nix => zplug.nix}    |  0
 .../default.nix => activitywatch.nix}            |  0
 .../{amberol/default.nix => amberol.nix}         |  0
 .../services/{arrpc/default.nix => arrpc.nix}    |  0
 .../{autorandr/default.nix => autorandr.nix}     |  0
 .../services/{avizo/default.nix => avizo.nix}    |  0
 .../{barrier/default.nix => barrier.nix}         |  0
 .../{batsignal/default.nix => batsignal.nix}     |  0
 .../default.nix => betterlockscreen.nix}         |  0
 .../{blanket/default.nix => blanket.nix}         |  0
 .../default.nix => blueman-applet.nix}           |  0
 .../{borgmatic/default.nix => borgmatic.nix}     |  0
 .../default.nix => cachix-agent.nix}             |  0
 .../{caffeine/default.nix => caffeine.nix}       |  0
 .../{cbatticon/default.nix => cbatticon.nix}     |  0
 .../{clipcat/default.nix => clipcat.nix}         |  0
 .../{cliphist/default.nix => cliphist.nix}       |  0
 .../{clipman/default.nix => clipman.nix}         |  0
 .../{clipmenu/default.nix => clipmenu.nix}       |  0
 .../services/{clipse/default.nix => clipse.nix}  |  0
 .../{comodoro/default.nix => comodoro.nix}       |  0
 .../services/{conky/default.nix => conky.nix}    |  0
 .../services/{copyq/default.nix => copyq.nix}    |  0
 .../{darkman/default.nix => darkman.nix}         |  0
 .../{davmail/default.nix => davmail.nix}         |  0
 .../{devilspie2/default.nix => devilspie2.nix}   |  0
 .../{dropbox/default.nix => dropbox.nix}         |  0
 .../services/{dunst/default.nix => dunst.nix}    |  0
 .../{dwm-status/default.nix => dwm-status.nix}   |  0
 .../{easyeffects/default.nix => easyeffects.nix} |  0
 .../services/{emacs/default.nix => emacs.nix}    |  0
 .../{espanso/default.nix => espanso.nix}         |  0
 .../{etesync-dav/default.nix => etesync-dav.nix} |  0
 .../{flameshot/default.nix => flameshot.nix}     |  0
 .../{fluidsynth/default.nix => fluidsynth.nix}   |  0
 .../services/{fnott/default.nix => fnott.nix}    |  0
 .../services/{fusuma/default.nix => fusuma.nix}  |  0
 .../{getmail/default.nix => getmail.nix}         |  0
 .../{git-sync/default.nix => git-sync.nix}       |  0
 .../services/{glance/default.nix => glance.nix}  |  0
 .../default.nix => gnome-keyring.nix}            |  0
 .../{gpg-agent/default.nix => gpg-agent.nix}     |  0
 .../services/{grobi/default.nix => grobi.nix}    |  0
 .../{gromit-mpx/default.nix => gromit-mpx.nix}   |  0
 .../default.nix => home-manager-auto-expire.nix} |  2 +-
 ...default.nix => home-manager-auto-upgrade.nix} |  2 +-
 .../services/{hound/default.nix => hound.nix}    |  0
 .../{hypridle/default.nix => hypridle.nix}       |  0
 .../{hyprpaper/default.nix => hyprpaper.nix}     |  0
 .../default.nix => hyprpolkitagent.nix}          |  0
 .../{hyprsunset/default.nix => hyprsunset.nix}   |  0
 .../default.nix => jankyborders.nix}             |  0
 .../default.nix => jellyfin-mpv-shim.nix}        |  0
 .../services/{kanshi/default.nix => kanshi.nix}  |  0
 modules/services/{kbfs/default.nix => kbfs.nix}  |  0
 .../{kdeconnect/default.nix => kdeconnect.nix}   |  0
 .../{keybase/default.nix => keybase.nix}         |  0
 .../services/{keynav/default.nix => keynav.nix}  |  0
 .../{librespot/default.nix => librespot.nix}     |  0
 .../services/{lieer/default.nix => lieer.nix}    |  0
 .../default.nix => linux-wallpaperengine.nix}    |  0
 .../default.nix => listenbrainz-mpd.nix}         |  0
 .../services/{lorri/default.nix => lorri.nix}    |  0
 .../{ludusavi/default.nix => ludusavi.nix}       |  0
 .../default.nix => lxqt-policykit-agent.nix}     |  0
 modules/services/{mako/default.nix => mako.nix}  |  0
 .../services/{mbsync/default.nix => mbsync.nix}  |  0
 .../{megasync/default.nix => megasync.nix}       |  0
 .../services/{mopidy/default.nix => mopidy.nix}  |  0
 .../default.nix => mpd-discord-rpc.nix}          |  0
 .../{mpd-mpris/default.nix => mpd-mpris.nix}     |  0
 modules/services/{mpd/default.nix => mpd.nix}    |  0
 .../{mpdris2/default.nix => mpdris2.nix}         |  0
 .../{mpdscribble/default.nix => mpdscribble.nix} |  0
 .../{mpris-proxy/default.nix => mpris-proxy.nix} |  0
 .../{muchsync/default.nix => muchsync.nix}       |  0
 .../default.nix => network-manager-applet.nix}   |  0
 .../default.nix => nextcloud-client.nix}         |  0
 .../services/{nix-gc/default.nix => nix-gc.nix}  |  0
 .../{notify-osd/default.nix => notify-osd.nix}   |  0
 .../services/{ollama/default.nix => ollama.nix}  |  0
 .../default.nix => opensnitch-ui.nix}            |  0
 .../default.nix => osmscout-server.nix}          |  0
 .../default.nix => owncloud-client.nix}          |  0
 .../{pantalaimon/default.nix => pantalaimon.nix} |  0
 .../{parcellite/default.nix => parcellite.nix}   |  0
 .../default.nix => pass-secret-service.nix}      |  0
 .../{pasystray/default.nix => pasystray.nix}     |  0
 .../services/{pbgopy/default.nix => pbgopy.nix}  |  0
 .../services/{picom/default.nix => picom.nix}    |  0
 .../{plan9port/default.nix => plan9port.nix}     |  0
 .../{playerctld/default.nix => playerctld.nix}   |  0
 .../default.nix => plex-mpv-shim.nix}            |  0
 .../default.nix => polkit-gnome.nix}             |  0
 .../{polybar/default.nix => polybar.nix}         |  0
 .../{poweralertd/default.nix => poweralertd.nix} |  0
 modules/services/{psd/default.nix => psd.nix}    |  0
 .../services/{pueue/default.nix => pueue.nix}    |  0
 .../default.nix => pulseeffects.nix}             |  0
 .../default.nix => random-background.nix}        |  0
 .../services/{recoll/default.nix => recoll.nix}  |  0
 .../{remmina/default.nix => remmina.nix}         |  0
 .../services/{restic/default.nix => restic.nix}  |  0
 .../{rsibreak/default.nix => rsibreak.nix}       |  0
 .../{safeeyes/default.nix => safeeyes.nix}       |  0
 .../default.nix => screen-locker.nix}            |  0
 modules/services/{sctd/default.nix => sctd.nix}  |  0
 .../{shikane/default.nix => shikane.nix}         |  0
 .../default.nix => signaturepdf.nix}             |  0
 modules/services/{skhd/default.nix => skhd.nix}  |  0
 .../{snixembed/default.nix => snixembed.nix}     |  0
 .../{spotifyd/default.nix => spotifyd.nix}       |  0
 .../{ssh-agent/default.nix => ssh-agent.nix}     |  0
 .../{stalonetray/default.nix => stalonetray.nix} |  0
 .../default.nix => status-notifier-watcher.nix}  |  0
 .../{swayidle/default.nix => swayidle.nix}       |  0
 .../services/{swaync/default.nix => swaync.nix}  |  0
 .../{swayosd/default.nix => swayosd.nix}         |  0
 modules/services/{swww/default.nix => swww.nix}  |  0
 .../services/{sxhkd/default.nix => sxhkd.nix}    |  0
 .../{syncthing/default.nix => syncthing.nix}     |  0
 .../default.nix => systembus-notify.nix}         |  0
 .../{taffybar/default.nix => taffybar.nix}       |  0
 .../{tahoe-lafs/default.nix => tahoe-lafs.nix}   |  0
 .../default.nix => taskwarrior-sync.nix}         |  0
 .../{tldr-update/default.nix => tldr-update.nix} |  0
 .../services/{trayer/default.nix => trayer.nix}  |  0
 .../{trayscale/default.nix => trayscale.nix}     |  0
 modules/services/{twmn/default.nix => twmn.nix}  |  0
 .../{udiskie/default.nix => udiskie.nix}         |  0
 .../{unclutter/default.nix => unclutter.nix}     |  0
 .../services/{unison/default.nix => unison.nix}  |  0
 .../{vdirsyncer/default.nix => vdirsyncer.nix}   |  0
 .../{volnoti/default.nix => volnoti.nix}         |  0
 .../default.nix => way-displays.nix}             |  0
 .../services/{wayvnc/default.nix => wayvnc.nix}  |  0
 .../{awesome/default.nix => awesome.nix}         |  0
 modules/services/window-managers/default.nix     | 16 ++++++++--------
 .../{fluxbox/default.nix => fluxbox.nix}         |  0
 .../default.nix => herbstluftwm.nix}             |  0
 .../{hyprland/default.nix => hyprland.nix}       |  0
 .../{river/default.nix => river.nix}             |  0
 .../{spectrwm/default.nix => spectrwm.nix}       |  0
 .../{wayfire/default.nix => wayfire.nix}         |  0
 .../{xmonad/default.nix => xmonad.nix}           |  0
 .../{wlsunset/default.nix => wlsunset.nix}       |  0
 .../services/{wluma/default.nix => wluma.nix}    |  0
 modules/services/{wob/default.nix => wob.nix}    |  0
 .../{wpaperd/default.nix => wpaperd.nix}         |  0
 .../services/{xcape/default.nix => xcape.nix}    |  0
 .../default.nix => xembed-sni-proxy.nix}         |  0
 .../{xidlehook/default.nix => xidlehook.nix}     |  0
 .../default.nix => xscreensaver.nix}             |  0
 .../{xsettingsd/default.nix => xsettingsd.nix}   |  0
 .../{xsuspender/default.nix => xsuspender.nix}   |  0
 .../default.nix => yubikey-agent.nix}            |  0
 424 files changed, 15 insertions(+), 15 deletions(-)
 rename modules/programs/{abook/default.nix => abook.nix} (100%)
 rename modules/programs/{aerospace/default.nix => aerospace.nix} (100%)
 rename modules/programs/{afew/default.nix => afew.nix} (100%)
 rename modules/programs/{aichat/default.nix => aichat.nix} (100%)
 rename modules/programs/{alacritty/default.nix => alacritty.nix} (100%)
 rename modules/programs/{antidote/default.nix => antidote.nix} (100%)
 rename modules/programs/{anyrun/default.nix => anyrun.nix} (100%)
 rename modules/programs/{aria2/default.nix => aria2.nix} (100%)
 rename modules/programs/{ashell/default.nix => ashell.nix} (100%)
 rename modules/programs/{atuin/default.nix => atuin.nix} (100%)
 rename modules/programs/{autojump/default.nix => autojump.nix} (100%)
 rename modules/programs/{autorandr/default.nix => autorandr.nix} (100%)
 rename modules/programs/{awscli/default.nix => awscli.nix} (100%)
 rename modules/programs/{bacon/default.nix => bacon.nix} (100%)
 rename modules/programs/{bash/default.nix => bash.nix} (100%)
 rename modules/programs/{bashmount/default.nix => bashmount.nix} (100%)
 rename modules/programs/{bat/default.nix => bat.nix} (100%)
 rename modules/programs/{beets/default.nix => beets.nix} (100%)
 rename modules/programs/{bemenu/default.nix => bemenu.nix} (100%)
 rename modules/programs/{borgmatic/default.nix => borgmatic.nix} (100%)
 rename modules/programs/{bottom/default.nix => bottom.nix} (100%)
 rename modules/programs/{boxxy/default.nix => boxxy.nix} (100%)
 rename modules/programs/{broot/default.nix => broot.nix} (100%)
 rename modules/programs/{browserpass/default.nix => browserpass.nix} (100%)
 rename modules/programs/{btop/default.nix => btop.nix} (100%)
 rename modules/programs/{bun/default.nix => bun.nix} (100%)
 rename modules/programs/{carapace/default.nix => carapace.nix} (100%)
 rename modules/programs/{cava/default.nix => cava.nix} (100%)
 rename modules/programs/{cavalier/default.nix => cavalier.nix} (100%)
 rename modules/programs/{chawan/default.nix => chawan.nix} (100%)
 rename modules/programs/{chromium/default.nix => chromium.nix} (100%)
 rename modules/programs/{clock-rs/default.nix => clock-rs.nix} (100%)
 rename modules/programs/{cmus/default.nix => cmus.nix} (100%)
 rename modules/programs/{codex/default.nix => codex.nix} (100%)
 rename modules/programs/{comodoro/default.nix => comodoro.nix} (100%)
 rename modules/programs/{darcs/default.nix => darcs.nix} (100%)
 rename modules/programs/{dircolors/default.nix => dircolors.nix} (100%)
 rename modules/programs/{direnv/default.nix => direnv.nix} (100%)
 rename modules/programs/{discocss/default.nix => discocss.nix} (100%)
 rename modules/programs/{distrobox/default.nix => distrobox.nix} (100%)
 rename modules/programs/{earthly/default.nix => earthly.nix} (100%)
 rename modules/programs/{eclipse/default.nix => eclipse.nix} (100%)
 rename modules/programs/{element-desktop/default.nix => element-desktop.nix} (100%)
 rename modules/programs/{emacs/default.nix => emacs.nix} (100%)
 rename modules/programs/{eww/default.nix => eww.nix} (100%)
 rename modules/programs/{eza/default.nix => eza.nix} (100%)
 rename modules/programs/{fastfetch/default.nix => fastfetch.nix} (100%)
 rename modules/programs/{fd/default.nix => fd.nix} (100%)
 rename modules/programs/{feh/default.nix => feh.nix} (100%)
 rename modules/programs/{fish/default.nix => fish.nix} (100%)
 rename modules/programs/{floorp/default.nix => floorp.nix} (93%)
 rename modules/programs/{foliate/default.nix => foliate.nix} (100%)
 rename modules/programs/{foot/default.nix => foot.nix} (100%)
 rename modules/programs/{freetube/default.nix => freetube.nix} (100%)
 rename modules/programs/{fuzzel/default.nix => fuzzel.nix} (100%)
 rename modules/programs/{fzf/default.nix => fzf.nix} (100%)
 rename modules/programs/{gallery-dl/default.nix => gallery-dl.nix} (100%)
 rename modules/programs/{gh-dash/default.nix => gh-dash.nix} (100%)
 rename modules/programs/{gh/default.nix => gh.nix} (100%)
 rename modules/programs/{ghostty/default.nix => ghostty.nix} (100%)
 rename modules/programs/{git-cliff/default.nix => git-cliff.nix} (100%)
 rename modules/programs/{git-credential-oauth/default.nix => git-credential-oauth.nix} (100%)
 rename modules/programs/{git-worktree-switcher/default.nix => git-worktree-switcher.nix} (100%)
 rename modules/programs/{git/default.nix => git.nix} (100%)
 rename modules/programs/{gitui/default.nix => gitui.nix} (100%)
 rename modules/programs/{gnome-shell/default.nix => gnome-shell.nix} (100%)
 rename modules/programs/{gnome-terminal/default.nix => gnome-terminal.nix} (100%)
 rename modules/programs/{go/default.nix => go.nix} (100%)
 rename modules/programs/{gpg/default.nix => gpg.nix} (100%)
 rename modules/programs/{gradle/default.nix => gradle.nix} (100%)
 rename modules/programs/{granted/default.nix => granted.nix} (100%)
 rename modules/programs/{halloy/default.nix => halloy.nix} (100%)
 rename modules/programs/{havoc/default.nix => havoc.nix} (100%)
 rename modules/programs/{helix/default.nix => helix.nix} (100%)
 rename modules/programs/{hexchat/default.nix => hexchat.nix} (100%)
 rename modules/programs/{himalaya/default.nix => himalaya.nix} (100%)
 rename modules/programs/{home-manager/default.nix => home-manager.nix} (89%)
 rename modules/programs/{hstr/default.nix => hstr.nix} (100%)
 rename modules/programs/{htop/default.nix => htop.nix} (100%)
 rename modules/programs/{hwatch/default.nix => hwatch.nix} (100%)
 rename modules/programs/{hyfetch/default.nix => hyfetch.nix} (100%)
 rename modules/programs/{hyprlock/default.nix => hyprlock.nix} (100%)
 rename modules/programs/{i3bar-river/default.nix => i3bar-river.nix} (100%)
 rename modules/programs/{i3blocks/default.nix => i3blocks.nix} (100%)
 rename modules/programs/{i3status-rust/default.nix => i3status-rust.nix} (100%)
 rename modules/programs/{i3status/default.nix => i3status.nix} (100%)
 rename modules/programs/{iamb/default.nix => iamb.nix} (100%)
 rename modules/programs/{imv/default.nix => imv.nix} (100%)
 rename modules/programs/{info/default.nix => info.nix} (100%)
 rename modules/programs/{inori/default.nix => inori.nix} (100%)
 rename modules/programs/{ion/default.nix => ion.nix} (100%)
 rename modules/programs/{irssi/default.nix => irssi.nix} (100%)
 rename modules/programs/{java/default.nix => java.nix} (100%)
 rename modules/programs/{jetbrains-remote/default.nix => jetbrains-remote.nix} (100%)
 rename modules/programs/{joplin-desktop/default.nix => joplin-desktop.nix} (100%)
 rename modules/programs/{joshuto/default.nix => joshuto.nix} (100%)
 rename modules/programs/{jq/default.nix => jq.nix} (100%)
 rename modules/programs/{jqp/default.nix => jqp.nix} (100%)
 rename modules/programs/{jujutsu/default.nix => jujutsu.nix} (100%)
 rename modules/programs/{just/default.nix => just.nix} (100%)
 rename modules/programs/{k9s/default.nix => k9s.nix} (100%)
 rename modules/programs/{kakoune/default.nix => kakoune.nix} (100%)
 rename modules/programs/{keepassxc/default.nix => keepassxc.nix} (100%)
 rename modules/programs/{keychain/default.nix => keychain.nix} (100%)
 rename modules/programs/{khard/default.nix => khard.nix} (100%)
 rename modules/programs/{kickoff/default.nix => kickoff.nix} (100%)
 rename modules/programs/{kitty/default.nix => kitty.nix} (100%)
 rename modules/programs/{kodi/default.nix => kodi.nix} (100%)
 rename modules/programs/{kubecolor/default.nix => kubecolor.nix} (100%)
 rename modules/programs/{lapce/default.nix => lapce.nix} (100%)
 rename modules/programs/{lazydocker/default.nix => lazydocker.nix} (100%)
 rename modules/programs/{lazygit/default.nix => lazygit.nix} (100%)
 rename modules/programs/{lazysql/default.nix => lazysql.nix} (100%)
 rename modules/programs/{ledger/default.nix => ledger.nix} (100%)
 rename modules/programs/{less/default.nix => less.nix} (100%)
 rename modules/programs/{lesspipe/default.nix => lesspipe.nix} (100%)
 rename modules/programs/{lf/default.nix => lf.nix} (100%)
 rename modules/programs/{librewolf/default.nix => librewolf.nix} (96%)
 rename modules/programs/{lieer/default.nix => lieer.nix} (100%)
 rename modules/programs/{looking-glass-client/default.nix => looking-glass-client.nix} (100%)
 rename modules/programs/{lsd/default.nix => lsd.nix} (100%)
 rename modules/programs/{lutris/default.nix => lutris.nix} (100%)
 rename modules/programs/{man/default.nix => man.nix} (100%)
 rename modules/programs/{mangohud/default.nix => mangohud.nix} (100%)
 rename modules/programs/{matplotlib/default.nix => matplotlib.nix} (100%)
 rename modules/programs/{mc/default.nix => mc.nix} (100%)
 rename modules/programs/{mcfly/default.nix => mcfly.nix} (100%)
 rename modules/programs/{meli/default.nix => meli.nix} (100%)
 rename modules/programs/{mercurial/default.nix => mercurial.nix} (100%)
 rename modules/programs/{mergiraf/default.nix => mergiraf.nix} (100%)
 rename modules/programs/{micro/default.nix => micro.nix} (100%)
 rename modules/programs/{mise/default.nix => mise.nix} (100%)
 rename modules/programs/{mods/default.nix => mods.nix} (100%)
 rename modules/programs/{mpv/default.nix => mpv.nix} (100%)
 rename modules/programs/{mpvpaper/default.nix => mpvpaper.nix} (100%)
 rename modules/programs/{mr/default.nix => mr.nix} (100%)
 rename modules/programs/{mu/default.nix => mu.nix} (100%)
 rename modules/programs/{mujmap/default.nix => mujmap.nix} (100%)
 rename modules/programs/{navi/default.nix => navi.nix} (100%)
 rename modules/programs/{ncmpcpp/default.nix => ncmpcpp.nix} (100%)
 rename modules/programs/{ncspot/default.nix => ncspot.nix} (100%)
 rename modules/programs/{ne/default.nix => ne.nix} (100%)
 rename modules/programs/{neovide/default.nix => neovide.nix} (100%)
 rename modules/programs/{neovim/default.nix => neovim.nix} (99%)
 rename modules/programs/{newsboat/default.nix => newsboat.nix} (100%)
 rename modules/programs/{nh/default.nix => nh.nix} (100%)
 rename modules/programs/{nheko/default.nix => nheko.nix} (100%)
 rename modules/programs/{niriswitcher/default.nix => niriswitcher.nix} (100%)
 rename modules/programs/{nix-index/default.nix => nix-index.nix} (100%)
 rename modules/programs/{nix-init/default.nix => nix-init.nix} (100%)
 rename modules/programs/{nix-your-shell/default.nix => nix-your-shell.nix} (100%)
 rename modules/programs/{nnn/default.nix => nnn.nix} (100%)
 rename modules/programs/{noti/default.nix => noti.nix} (100%)
 rename modules/programs/{numbat/default.nix => numbat.nix} (100%)
 rename modules/programs/{nushell/default.nix => nushell.nix} (100%)
 rename modules/programs/{nyxt/default.nix => nyxt.nix} (100%)
 rename modules/programs/{obs-studio/default.nix => obs-studio.nix} (100%)
 rename modules/programs/{obsidian/default.nix => obsidian.nix} (100%)
 rename modules/programs/{octant/default.nix => octant.nix} (100%)
 rename modules/programs/{oh-my-posh/default.nix => oh-my-posh.nix} (100%)
 rename modules/programs/{onagre/default.nix => onagre.nix} (100%)
 rename modules/programs/{onedrive/default.nix => onedrive.nix} (100%)
 rename modules/programs/{onlyoffice/default.nix => onlyoffice.nix} (100%)
 rename modules/programs/{opam/default.nix => opam.nix} (100%)
 rename modules/programs/{openstackclient/default.nix => openstackclient.nix} (100%)
 rename modules/programs/{pandoc/default.nix => pandoc.nix} (100%)
 rename modules/programs/{papis/default.nix => papis.nix} (100%)
 rename modules/programs/{password-store/default.nix => password-store.nix} (100%)
 rename modules/programs/{pay-respects/default.nix => pay-respects.nix} (100%)
 rename modules/programs/{pazi/default.nix => pazi.nix} (100%)
 rename modules/programs/{pet/default.nix => pet.nix} (100%)
 rename modules/programs/{pgcli/default.nix => pgcli.nix} (100%)
 rename modules/programs/{pidgin/default.nix => pidgin.nix} (100%)
 rename modules/programs/{pistol/default.nix => pistol.nix} (100%)
 rename modules/programs/{piston-cli/default.nix => piston-cli.nix} (100%)
 rename modules/programs/{pls/default.nix => pls.nix} (100%)
 rename modules/programs/{poetry/default.nix => poetry.nix} (100%)
 rename modules/programs/{powerline-go/default.nix => powerline-go.nix} (100%)
 rename modules/programs/{pqiv/default.nix => pqiv.nix} (100%)
 rename modules/programs/{ptyxis/default.nix => ptyxis.nix} (100%)
 rename modules/programs/{pubs/default.nix => pubs.nix} (100%)
 rename modules/programs/{pyenv/default.nix => pyenv.nix} (100%)
 rename modules/programs/{pylint/default.nix => pylint.nix} (100%)
 rename modules/programs/{pywal/default.nix => pywal.nix} (100%)
 rename modules/programs/{qcal/default.nix => qcal.nix} (100%)
 rename modules/programs/{qutebrowser/default.nix => qutebrowser.nix} (100%)
 rename modules/programs/{ranger/default.nix => ranger.nix} (100%)
 rename modules/programs/{rbenv/default.nix => rbenv.nix} (100%)
 rename modules/programs/{rbw/default.nix => rbw.nix} (100%)
 rename modules/programs/{rclone/default.nix => rclone.nix} (100%)
 rename modules/programs/{readline/default.nix => readline.nix} (100%)
 rename modules/programs/{rio/default.nix => rio.nix} (100%)
 rename modules/programs/{ripgrep-all/default.nix => ripgrep-all.nix} (100%)
 rename modules/programs/{ripgrep/default.nix => ripgrep.nix} (100%)
 rename modules/programs/{rmpc/default.nix => rmpc.nix} (100%)
 rename modules/programs/{rofi-pass/default.nix => rofi-pass.nix} (100%)
 rename modules/programs/{rofi/default.nix => rofi.nix} (100%)
 rename modules/programs/{rtorrent/default.nix => rtorrent.nix} (100%)
 rename modules/programs/{ruff/default.nix => ruff.nix} (100%)
 rename modules/programs/{sagemath/default.nix => sagemath.nix} (100%)
 rename modules/programs/{sapling/default.nix => sapling.nix} (100%)
 rename modules/programs/{sbt/default.nix => sbt.nix} (100%)
 rename modules/programs/{scmpuff/default.nix => scmpuff.nix} (100%)
 rename modules/programs/{script-directory/default.nix => script-directory.nix} (100%)
 rename modules/programs/{senpai/default.nix => senpai.nix} (100%)
 rename modules/programs/{sesh/default.nix => sesh.nix} (100%)
 rename modules/programs/{sftpman/default.nix => sftpman.nix} (100%)
 rename modules/programs/{sioyek/default.nix => sioyek.nix} (100%)
 rename modules/programs/{sketchybar/default.nix => sketchybar.nix} (100%)
 rename modules/programs/{skim/default.nix => skim.nix} (100%)
 rename modules/programs/{sm64ex/default.nix => sm64ex.nix} (100%)
 rename modules/programs/{smug/default.nix => smug.nix} (100%)
 rename modules/programs/{spotify-player/default.nix => spotify-player.nix} (100%)
 rename modules/programs/{sqls/default.nix => sqls.nix} (100%)
 rename modules/programs/{ssh/default.nix => ssh.nix} (100%)
 rename modules/programs/{starship/default.nix => starship.nix} (100%)
 rename modules/programs/{streamlink/default.nix => streamlink.nix} (100%)
 rename modules/programs/{superfile/default.nix => superfile.nix} (100%)
 rename modules/programs/{sway-easyfocus/default.nix => sway-easyfocus.nix} (100%)
 rename modules/programs/{swayimg/default.nix => swayimg.nix} (100%)
 rename modules/programs/{swaylock/default.nix => swaylock.nix} (100%)
 rename modules/programs/{swayr/default.nix => swayr.nix} (100%)
 rename modules/programs/{taskwarrior/default.nix => taskwarrior.nix} (100%)
 rename modules/programs/{tealdeer/default.nix => tealdeer.nix} (100%)
 rename modules/programs/{television/default.nix => television.nix} (100%)
 rename modules/programs/{terminator/default.nix => terminator.nix} (100%)
 rename modules/programs/{termite/default.nix => termite.nix} (100%)
 rename modules/programs/{tex-fmt/default.nix => tex-fmt.nix} (100%)
 rename modules/programs/{texlive/default.nix => texlive.nix} (100%)
 rename modules/programs/{thefuck/default.nix => thefuck.nix} (100%)
 rename modules/programs/{thunderbird/default.nix => thunderbird.nix} (99%)
 rename modules/programs/{timidity/default.nix => timidity.nix} (100%)
 rename modules/programs/{tint2/default.nix => tint2.nix} (100%)
 rename modules/programs/{tiny/default.nix => tiny.nix} (100%)
 rename modules/programs/{tmate/default.nix => tmate.nix} (100%)
 rename modules/programs/{tmux/default.nix => tmux.nix} (100%)
 rename modules/programs/{todoman/default.nix => todoman.nix} (100%)
 rename modules/programs/{tofi/default.nix => tofi.nix} (100%)
 rename modules/programs/{topgrade/default.nix => topgrade.nix} (100%)
 rename modules/programs/{translate-shell/default.nix => translate-shell.nix} (100%)
 rename modules/programs/{urxvt/default.nix => urxvt.nix} (100%)
 rename modules/programs/{uv/default.nix => uv.nix} (100%)
 rename modules/programs/{vesktop/default.nix => vesktop.nix} (100%)
 rename modules/programs/{vifm/default.nix => vifm.nix} (100%)
 rename modules/programs/{vim-vint/default.nix => vim-vint.nix} (100%)
 rename modules/programs/{vim/default.nix => vim.nix} (100%)
 rename modules/programs/{vinegar/default.nix => vinegar.nix} (100%)
 rename modules/programs/{visidata/default.nix => visidata.nix} (100%)
 rename modules/programs/{wallust/default.nix => wallust.nix} (100%)
 rename modules/programs/{watson/default.nix => watson.nix} (100%)
 rename modules/programs/{waveterm/default.nix => waveterm.nix} (100%)
 rename modules/programs/{waybar/default.nix => waybar.nix} (100%)
 rename modules/programs/{waylogout/default.nix => waylogout.nix} (100%)
 rename modules/programs/{wayprompt/default.nix => wayprompt.nix} (100%)
 rename modules/programs/{wezterm/default.nix => wezterm.nix} (100%)
 rename modules/programs/{wlogout/default.nix => wlogout.nix} (100%)
 rename modules/programs/{wofi/default.nix => wofi.nix} (100%)
 rename modules/programs/{xmobar/default.nix => xmobar.nix} (100%)
 rename modules/programs/{xplr/default.nix => xplr.nix} (100%)
 rename modules/programs/{yambar/default.nix => yambar.nix} (100%)
 rename modules/programs/{yazi/default.nix => yazi.nix} (100%)
 rename modules/programs/{yt-dlp/default.nix => yt-dlp.nix} (100%)
 rename modules/programs/{z-lua/default.nix => z-lua.nix} (100%)
 rename modules/programs/{zathura/default.nix => zathura.nix} (100%)
 rename modules/programs/{zed-editor/default.nix => zed-editor.nix} (100%)
 rename modules/programs/{zellij/default.nix => zellij.nix} (100%)
 rename modules/programs/{zk/default.nix => zk.nix} (100%)
 rename modules/programs/{zoxide/default.nix => zoxide.nix} (100%)
 rename modules/programs/{zplug/default.nix => zplug.nix} (100%)
 rename modules/services/{activitywatch/default.nix => activitywatch.nix} (100%)
 rename modules/services/{amberol/default.nix => amberol.nix} (100%)
 rename modules/services/{arrpc/default.nix => arrpc.nix} (100%)
 rename modules/services/{autorandr/default.nix => autorandr.nix} (100%)
 rename modules/services/{avizo/default.nix => avizo.nix} (100%)
 rename modules/services/{barrier/default.nix => barrier.nix} (100%)
 rename modules/services/{batsignal/default.nix => batsignal.nix} (100%)
 rename modules/services/{betterlockscreen/default.nix => betterlockscreen.nix} (100%)
 rename modules/services/{blanket/default.nix => blanket.nix} (100%)
 rename modules/services/{blueman-applet/default.nix => blueman-applet.nix} (100%)
 rename modules/services/{borgmatic/default.nix => borgmatic.nix} (100%)
 rename modules/services/{cachix-agent/default.nix => cachix-agent.nix} (100%)
 rename modules/services/{caffeine/default.nix => caffeine.nix} (100%)
 rename modules/services/{cbatticon/default.nix => cbatticon.nix} (100%)
 rename modules/services/{clipcat/default.nix => clipcat.nix} (100%)
 rename modules/services/{cliphist/default.nix => cliphist.nix} (100%)
 rename modules/services/{clipman/default.nix => clipman.nix} (100%)
 rename modules/services/{clipmenu/default.nix => clipmenu.nix} (100%)
 rename modules/services/{clipse/default.nix => clipse.nix} (100%)
 rename modules/services/{comodoro/default.nix => comodoro.nix} (100%)
 rename modules/services/{conky/default.nix => conky.nix} (100%)
 rename modules/services/{copyq/default.nix => copyq.nix} (100%)
 rename modules/services/{darkman/default.nix => darkman.nix} (100%)
 rename modules/services/{davmail/default.nix => davmail.nix} (100%)
 rename modules/services/{devilspie2/default.nix => devilspie2.nix} (100%)
 rename modules/services/{dropbox/default.nix => dropbox.nix} (100%)
 rename modules/services/{dunst/default.nix => dunst.nix} (100%)
 rename modules/services/{dwm-status/default.nix => dwm-status.nix} (100%)
 rename modules/services/{easyeffects/default.nix => easyeffects.nix} (100%)
 rename modules/services/{emacs/default.nix => emacs.nix} (100%)
 rename modules/services/{espanso/default.nix => espanso.nix} (100%)
 rename modules/services/{etesync-dav/default.nix => etesync-dav.nix} (100%)
 rename modules/services/{flameshot/default.nix => flameshot.nix} (100%)
 rename modules/services/{fluidsynth/default.nix => fluidsynth.nix} (100%)
 rename modules/services/{fnott/default.nix => fnott.nix} (100%)
 rename modules/services/{fusuma/default.nix => fusuma.nix} (100%)
 rename modules/services/{getmail/default.nix => getmail.nix} (100%)
 rename modules/services/{git-sync/default.nix => git-sync.nix} (100%)
 rename modules/services/{glance/default.nix => glance.nix} (100%)
 rename modules/services/{gnome-keyring/default.nix => gnome-keyring.nix} (100%)
 rename modules/services/{gpg-agent/default.nix => gpg-agent.nix} (100%)
 rename modules/services/{grobi/default.nix => grobi.nix} (100%)
 rename modules/services/{gromit-mpx/default.nix => gromit-mpx.nix} (100%)
 rename modules/services/{home-manager-auto-expire/default.nix => home-manager-auto-expire.nix} (98%)
 rename modules/services/{home-manager-auto-upgrade/default.nix => home-manager-auto-upgrade.nix} (96%)
 rename modules/services/{hound/default.nix => hound.nix} (100%)
 rename modules/services/{hypridle/default.nix => hypridle.nix} (100%)
 rename modules/services/{hyprpaper/default.nix => hyprpaper.nix} (100%)
 rename modules/services/{hyprpolkitagent/default.nix => hyprpolkitagent.nix} (100%)
 rename modules/services/{hyprsunset/default.nix => hyprsunset.nix} (100%)
 rename modules/services/{jankyborders/default.nix => jankyborders.nix} (100%)
 rename modules/services/{jellyfin-mpv-shim/default.nix => jellyfin-mpv-shim.nix} (100%)
 rename modules/services/{kanshi/default.nix => kanshi.nix} (100%)
 rename modules/services/{kbfs/default.nix => kbfs.nix} (100%)
 rename modules/services/{kdeconnect/default.nix => kdeconnect.nix} (100%)
 rename modules/services/{keybase/default.nix => keybase.nix} (100%)
 rename modules/services/{keynav/default.nix => keynav.nix} (100%)
 rename modules/services/{librespot/default.nix => librespot.nix} (100%)
 rename modules/services/{lieer/default.nix => lieer.nix} (100%)
 rename modules/services/{linux-wallpaperengine/default.nix => linux-wallpaperengine.nix} (100%)
 rename modules/services/{listenbrainz-mpd/default.nix => listenbrainz-mpd.nix} (100%)
 rename modules/services/{lorri/default.nix => lorri.nix} (100%)
 rename modules/services/{ludusavi/default.nix => ludusavi.nix} (100%)
 rename modules/services/{lxqt-policykit-agent/default.nix => lxqt-policykit-agent.nix} (100%)
 rename modules/services/{mako/default.nix => mako.nix} (100%)
 rename modules/services/{mbsync/default.nix => mbsync.nix} (100%)
 rename modules/services/{megasync/default.nix => megasync.nix} (100%)
 rename modules/services/{mopidy/default.nix => mopidy.nix} (100%)
 rename modules/services/{mpd-discord-rpc/default.nix => mpd-discord-rpc.nix} (100%)
 rename modules/services/{mpd-mpris/default.nix => mpd-mpris.nix} (100%)
 rename modules/services/{mpd/default.nix => mpd.nix} (100%)
 rename modules/services/{mpdris2/default.nix => mpdris2.nix} (100%)
 rename modules/services/{mpdscribble/default.nix => mpdscribble.nix} (100%)
 rename modules/services/{mpris-proxy/default.nix => mpris-proxy.nix} (100%)
 rename modules/services/{muchsync/default.nix => muchsync.nix} (100%)
 rename modules/services/{network-manager-applet/default.nix => network-manager-applet.nix} (100%)
 rename modules/services/{nextcloud-client/default.nix => nextcloud-client.nix} (100%)
 rename modules/services/{nix-gc/default.nix => nix-gc.nix} (100%)
 rename modules/services/{notify-osd/default.nix => notify-osd.nix} (100%)
 rename modules/services/{ollama/default.nix => ollama.nix} (100%)
 rename modules/services/{opensnitch-ui/default.nix => opensnitch-ui.nix} (100%)
 rename modules/services/{osmscout-server/default.nix => osmscout-server.nix} (100%)
 rename modules/services/{owncloud-client/default.nix => owncloud-client.nix} (100%)
 rename modules/services/{pantalaimon/default.nix => pantalaimon.nix} (100%)
 rename modules/services/{parcellite/default.nix => parcellite.nix} (100%)
 rename modules/services/{pass-secret-service/default.nix => pass-secret-service.nix} (100%)
 rename modules/services/{pasystray/default.nix => pasystray.nix} (100%)
 rename modules/services/{pbgopy/default.nix => pbgopy.nix} (100%)
 rename modules/services/{picom/default.nix => picom.nix} (100%)
 rename modules/services/{plan9port/default.nix => plan9port.nix} (100%)
 rename modules/services/{playerctld/default.nix => playerctld.nix} (100%)
 rename modules/services/{plex-mpv-shim/default.nix => plex-mpv-shim.nix} (100%)
 rename modules/services/{polkit-gnome/default.nix => polkit-gnome.nix} (100%)
 rename modules/services/{polybar/default.nix => polybar.nix} (100%)
 rename modules/services/{poweralertd/default.nix => poweralertd.nix} (100%)
 rename modules/services/{psd/default.nix => psd.nix} (100%)
 rename modules/services/{pueue/default.nix => pueue.nix} (100%)
 rename modules/services/{pulseeffects/default.nix => pulseeffects.nix} (100%)
 rename modules/services/{random-background/default.nix => random-background.nix} (100%)
 rename modules/services/{recoll/default.nix => recoll.nix} (100%)
 rename modules/services/{remmina/default.nix => remmina.nix} (100%)
 rename modules/services/{restic/default.nix => restic.nix} (100%)
 rename modules/services/{rsibreak/default.nix => rsibreak.nix} (100%)
 rename modules/services/{safeeyes/default.nix => safeeyes.nix} (100%)
 rename modules/services/{screen-locker/default.nix => screen-locker.nix} (100%)
 rename modules/services/{sctd/default.nix => sctd.nix} (100%)
 rename modules/services/{shikane/default.nix => shikane.nix} (100%)
 rename modules/services/{signaturepdf/default.nix => signaturepdf.nix} (100%)
 rename modules/services/{skhd/default.nix => skhd.nix} (100%)
 rename modules/services/{snixembed/default.nix => snixembed.nix} (100%)
 rename modules/services/{spotifyd/default.nix => spotifyd.nix} (100%)
 rename modules/services/{ssh-agent/default.nix => ssh-agent.nix} (100%)
 rename modules/services/{stalonetray/default.nix => stalonetray.nix} (100%)
 rename modules/services/{status-notifier-watcher/default.nix => status-notifier-watcher.nix} (100%)
 rename modules/services/{swayidle/default.nix => swayidle.nix} (100%)
 rename modules/services/{swaync/default.nix => swaync.nix} (100%)
 rename modules/services/{swayosd/default.nix => swayosd.nix} (100%)
 rename modules/services/{swww/default.nix => swww.nix} (100%)
 rename modules/services/{sxhkd/default.nix => sxhkd.nix} (100%)
 rename modules/services/{syncthing/default.nix => syncthing.nix} (100%)
 rename modules/services/{systembus-notify/default.nix => systembus-notify.nix} (100%)
 rename modules/services/{taffybar/default.nix => taffybar.nix} (100%)
 rename modules/services/{tahoe-lafs/default.nix => tahoe-lafs.nix} (100%)
 rename modules/services/{taskwarrior-sync/default.nix => taskwarrior-sync.nix} (100%)
 rename modules/services/{tldr-update/default.nix => tldr-update.nix} (100%)
 rename modules/services/{trayer/default.nix => trayer.nix} (100%)
 rename modules/services/{trayscale/default.nix => trayscale.nix} (100%)
 rename modules/services/{twmn/default.nix => twmn.nix} (100%)
 rename modules/services/{udiskie/default.nix => udiskie.nix} (100%)
 rename modules/services/{unclutter/default.nix => unclutter.nix} (100%)
 rename modules/services/{unison/default.nix => unison.nix} (100%)
 rename modules/services/{vdirsyncer/default.nix => vdirsyncer.nix} (100%)
 rename modules/services/{volnoti/default.nix => volnoti.nix} (100%)
 rename modules/services/{way-displays/default.nix => way-displays.nix} (100%)
 rename modules/services/{wayvnc/default.nix => wayvnc.nix} (100%)
 rename modules/services/window-managers/{awesome/default.nix => awesome.nix} (100%)
 rename modules/services/window-managers/{fluxbox/default.nix => fluxbox.nix} (100%)
 rename modules/services/window-managers/{herbstluftwm/default.nix => herbstluftwm.nix} (100%)
 rename modules/services/window-managers/{hyprland/default.nix => hyprland.nix} (100%)
 rename modules/services/window-managers/{river/default.nix => river.nix} (100%)
 rename modules/services/window-managers/{spectrwm/default.nix => spectrwm.nix} (100%)
 rename modules/services/window-managers/{wayfire/default.nix => wayfire.nix} (100%)
 rename modules/services/window-managers/{xmonad/default.nix => xmonad.nix} (100%)
 rename modules/services/{wlsunset/default.nix => wlsunset.nix} (100%)
 rename modules/services/{wluma/default.nix => wluma.nix} (100%)
 rename modules/services/{wob/default.nix => wob.nix} (100%)
 rename modules/services/{wpaperd/default.nix => wpaperd.nix} (100%)
 rename modules/services/{xcape/default.nix => xcape.nix} (100%)
 rename modules/services/{xembed-sni-proxy/default.nix => xembed-sni-proxy.nix} (100%)
 rename modules/services/{xidlehook/default.nix => xidlehook.nix} (100%)
 rename modules/services/{xscreensaver/default.nix => xscreensaver.nix} (100%)
 rename modules/services/{xsettingsd/default.nix => xsettingsd.nix} (100%)
 rename modules/services/{xsuspender/default.nix => xsuspender.nix} (100%)
 rename modules/services/{yubikey-agent/default.nix => yubikey-agent.nix} (100%)

diff --git a/modules/programs/abook/default.nix b/modules/programs/abook.nix
similarity index 100%
rename from modules/programs/abook/default.nix
rename to modules/programs/abook.nix
diff --git a/modules/programs/aerospace/default.nix b/modules/programs/aerospace.nix
similarity index 100%
rename from modules/programs/aerospace/default.nix
rename to modules/programs/aerospace.nix
diff --git a/modules/programs/afew/default.nix b/modules/programs/afew.nix
similarity index 100%
rename from modules/programs/afew/default.nix
rename to modules/programs/afew.nix
diff --git a/modules/programs/aichat/default.nix b/modules/programs/aichat.nix
similarity index 100%
rename from modules/programs/aichat/default.nix
rename to modules/programs/aichat.nix
diff --git a/modules/programs/alacritty/default.nix b/modules/programs/alacritty.nix
similarity index 100%
rename from modules/programs/alacritty/default.nix
rename to modules/programs/alacritty.nix
diff --git a/modules/programs/antidote/default.nix b/modules/programs/antidote.nix
similarity index 100%
rename from modules/programs/antidote/default.nix
rename to modules/programs/antidote.nix
diff --git a/modules/programs/anyrun/default.nix b/modules/programs/anyrun.nix
similarity index 100%
rename from modules/programs/anyrun/default.nix
rename to modules/programs/anyrun.nix
diff --git a/modules/programs/aria2/default.nix b/modules/programs/aria2.nix
similarity index 100%
rename from modules/programs/aria2/default.nix
rename to modules/programs/aria2.nix
diff --git a/modules/programs/ashell/default.nix b/modules/programs/ashell.nix
similarity index 100%
rename from modules/programs/ashell/default.nix
rename to modules/programs/ashell.nix
diff --git a/modules/programs/atuin/default.nix b/modules/programs/atuin.nix
similarity index 100%
rename from modules/programs/atuin/default.nix
rename to modules/programs/atuin.nix
diff --git a/modules/programs/autojump/default.nix b/modules/programs/autojump.nix
similarity index 100%
rename from modules/programs/autojump/default.nix
rename to modules/programs/autojump.nix
diff --git a/modules/programs/autorandr/default.nix b/modules/programs/autorandr.nix
similarity index 100%
rename from modules/programs/autorandr/default.nix
rename to modules/programs/autorandr.nix
diff --git a/modules/programs/awscli/default.nix b/modules/programs/awscli.nix
similarity index 100%
rename from modules/programs/awscli/default.nix
rename to modules/programs/awscli.nix
diff --git a/modules/programs/bacon/default.nix b/modules/programs/bacon.nix
similarity index 100%
rename from modules/programs/bacon/default.nix
rename to modules/programs/bacon.nix
diff --git a/modules/programs/bash/default.nix b/modules/programs/bash.nix
similarity index 100%
rename from modules/programs/bash/default.nix
rename to modules/programs/bash.nix
diff --git a/modules/programs/bashmount/default.nix b/modules/programs/bashmount.nix
similarity index 100%
rename from modules/programs/bashmount/default.nix
rename to modules/programs/bashmount.nix
diff --git a/modules/programs/bat/default.nix b/modules/programs/bat.nix
similarity index 100%
rename from modules/programs/bat/default.nix
rename to modules/programs/bat.nix
diff --git a/modules/programs/beets/default.nix b/modules/programs/beets.nix
similarity index 100%
rename from modules/programs/beets/default.nix
rename to modules/programs/beets.nix
diff --git a/modules/programs/bemenu/default.nix b/modules/programs/bemenu.nix
similarity index 100%
rename from modules/programs/bemenu/default.nix
rename to modules/programs/bemenu.nix
diff --git a/modules/programs/borgmatic/default.nix b/modules/programs/borgmatic.nix
similarity index 100%
rename from modules/programs/borgmatic/default.nix
rename to modules/programs/borgmatic.nix
diff --git a/modules/programs/bottom/default.nix b/modules/programs/bottom.nix
similarity index 100%
rename from modules/programs/bottom/default.nix
rename to modules/programs/bottom.nix
diff --git a/modules/programs/boxxy/default.nix b/modules/programs/boxxy.nix
similarity index 100%
rename from modules/programs/boxxy/default.nix
rename to modules/programs/boxxy.nix
diff --git a/modules/programs/broot/default.nix b/modules/programs/broot.nix
similarity index 100%
rename from modules/programs/broot/default.nix
rename to modules/programs/broot.nix
diff --git a/modules/programs/browserpass/default.nix b/modules/programs/browserpass.nix
similarity index 100%
rename from modules/programs/browserpass/default.nix
rename to modules/programs/browserpass.nix
diff --git a/modules/programs/btop/default.nix b/modules/programs/btop.nix
similarity index 100%
rename from modules/programs/btop/default.nix
rename to modules/programs/btop.nix
diff --git a/modules/programs/bun/default.nix b/modules/programs/bun.nix
similarity index 100%
rename from modules/programs/bun/default.nix
rename to modules/programs/bun.nix
diff --git a/modules/programs/carapace/default.nix b/modules/programs/carapace.nix
similarity index 100%
rename from modules/programs/carapace/default.nix
rename to modules/programs/carapace.nix
diff --git a/modules/programs/cava/default.nix b/modules/programs/cava.nix
similarity index 100%
rename from modules/programs/cava/default.nix
rename to modules/programs/cava.nix
diff --git a/modules/programs/cavalier/default.nix b/modules/programs/cavalier.nix
similarity index 100%
rename from modules/programs/cavalier/default.nix
rename to modules/programs/cavalier.nix
diff --git a/modules/programs/chawan/default.nix b/modules/programs/chawan.nix
similarity index 100%
rename from modules/programs/chawan/default.nix
rename to modules/programs/chawan.nix
diff --git a/modules/programs/chromium/default.nix b/modules/programs/chromium.nix
similarity index 100%
rename from modules/programs/chromium/default.nix
rename to modules/programs/chromium.nix
diff --git a/modules/programs/clock-rs/default.nix b/modules/programs/clock-rs.nix
similarity index 100%
rename from modules/programs/clock-rs/default.nix
rename to modules/programs/clock-rs.nix
diff --git a/modules/programs/cmus/default.nix b/modules/programs/cmus.nix
similarity index 100%
rename from modules/programs/cmus/default.nix
rename to modules/programs/cmus.nix
diff --git a/modules/programs/codex/default.nix b/modules/programs/codex.nix
similarity index 100%
rename from modules/programs/codex/default.nix
rename to modules/programs/codex.nix
diff --git a/modules/programs/comodoro/default.nix b/modules/programs/comodoro.nix
similarity index 100%
rename from modules/programs/comodoro/default.nix
rename to modules/programs/comodoro.nix
diff --git a/modules/programs/darcs/default.nix b/modules/programs/darcs.nix
similarity index 100%
rename from modules/programs/darcs/default.nix
rename to modules/programs/darcs.nix
diff --git a/modules/programs/dircolors/default.nix b/modules/programs/dircolors.nix
similarity index 100%
rename from modules/programs/dircolors/default.nix
rename to modules/programs/dircolors.nix
diff --git a/modules/programs/direnv/default.nix b/modules/programs/direnv.nix
similarity index 100%
rename from modules/programs/direnv/default.nix
rename to modules/programs/direnv.nix
diff --git a/modules/programs/discocss/default.nix b/modules/programs/discocss.nix
similarity index 100%
rename from modules/programs/discocss/default.nix
rename to modules/programs/discocss.nix
diff --git a/modules/programs/distrobox/default.nix b/modules/programs/distrobox.nix
similarity index 100%
rename from modules/programs/distrobox/default.nix
rename to modules/programs/distrobox.nix
diff --git a/modules/programs/earthly/default.nix b/modules/programs/earthly.nix
similarity index 100%
rename from modules/programs/earthly/default.nix
rename to modules/programs/earthly.nix
diff --git a/modules/programs/eclipse/default.nix b/modules/programs/eclipse.nix
similarity index 100%
rename from modules/programs/eclipse/default.nix
rename to modules/programs/eclipse.nix
diff --git a/modules/programs/element-desktop/default.nix b/modules/programs/element-desktop.nix
similarity index 100%
rename from modules/programs/element-desktop/default.nix
rename to modules/programs/element-desktop.nix
diff --git a/modules/programs/emacs/default.nix b/modules/programs/emacs.nix
similarity index 100%
rename from modules/programs/emacs/default.nix
rename to modules/programs/emacs.nix
diff --git a/modules/programs/eww/default.nix b/modules/programs/eww.nix
similarity index 100%
rename from modules/programs/eww/default.nix
rename to modules/programs/eww.nix
diff --git a/modules/programs/eza/default.nix b/modules/programs/eza.nix
similarity index 100%
rename from modules/programs/eza/default.nix
rename to modules/programs/eza.nix
diff --git a/modules/programs/fastfetch/default.nix b/modules/programs/fastfetch.nix
similarity index 100%
rename from modules/programs/fastfetch/default.nix
rename to modules/programs/fastfetch.nix
diff --git a/modules/programs/fd/default.nix b/modules/programs/fd.nix
similarity index 100%
rename from modules/programs/fd/default.nix
rename to modules/programs/fd.nix
diff --git a/modules/programs/feh/default.nix b/modules/programs/feh.nix
similarity index 100%
rename from modules/programs/feh/default.nix
rename to modules/programs/feh.nix
diff --git a/modules/programs/fish/default.nix b/modules/programs/fish.nix
similarity index 100%
rename from modules/programs/fish/default.nix
rename to modules/programs/fish.nix
diff --git a/modules/programs/floorp/default.nix b/modules/programs/floorp.nix
similarity index 93%
rename from modules/programs/floorp/default.nix
rename to modules/programs/floorp.nix
index bbc7e51d8..50e52d76d 100644
--- a/modules/programs/floorp/default.nix
+++ b/modules/programs/floorp.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/default.nix b/modules/programs/foliate.nix
similarity index 100%
rename from modules/programs/foliate/default.nix
rename to modules/programs/foliate.nix
diff --git a/modules/programs/foot/default.nix b/modules/programs/foot.nix
similarity index 100%
rename from modules/programs/foot/default.nix
rename to modules/programs/foot.nix
diff --git a/modules/programs/freetube/default.nix b/modules/programs/freetube.nix
similarity index 100%
rename from modules/programs/freetube/default.nix
rename to modules/programs/freetube.nix
diff --git a/modules/programs/fuzzel/default.nix b/modules/programs/fuzzel.nix
similarity index 100%
rename from modules/programs/fuzzel/default.nix
rename to modules/programs/fuzzel.nix
diff --git a/modules/programs/fzf/default.nix b/modules/programs/fzf.nix
similarity index 100%
rename from modules/programs/fzf/default.nix
rename to modules/programs/fzf.nix
diff --git a/modules/programs/gallery-dl/default.nix b/modules/programs/gallery-dl.nix
similarity index 100%
rename from modules/programs/gallery-dl/default.nix
rename to modules/programs/gallery-dl.nix
diff --git a/modules/programs/gh-dash/default.nix b/modules/programs/gh-dash.nix
similarity index 100%
rename from modules/programs/gh-dash/default.nix
rename to modules/programs/gh-dash.nix
diff --git a/modules/programs/gh/default.nix b/modules/programs/gh.nix
similarity index 100%
rename from modules/programs/gh/default.nix
rename to modules/programs/gh.nix
diff --git a/modules/programs/ghostty/default.nix b/modules/programs/ghostty.nix
similarity index 100%
rename from modules/programs/ghostty/default.nix
rename to modules/programs/ghostty.nix
diff --git a/modules/programs/git-cliff/default.nix b/modules/programs/git-cliff.nix
similarity index 100%
rename from modules/programs/git-cliff/default.nix
rename to modules/programs/git-cliff.nix
diff --git a/modules/programs/git-credential-oauth/default.nix b/modules/programs/git-credential-oauth.nix
similarity index 100%
rename from modules/programs/git-credential-oauth/default.nix
rename to modules/programs/git-credential-oauth.nix
diff --git a/modules/programs/git-worktree-switcher/default.nix b/modules/programs/git-worktree-switcher.nix
similarity index 100%
rename from modules/programs/git-worktree-switcher/default.nix
rename to modules/programs/git-worktree-switcher.nix
diff --git a/modules/programs/git/default.nix b/modules/programs/git.nix
similarity index 100%
rename from modules/programs/git/default.nix
rename to modules/programs/git.nix
diff --git a/modules/programs/gitui/default.nix b/modules/programs/gitui.nix
similarity index 100%
rename from modules/programs/gitui/default.nix
rename to modules/programs/gitui.nix
diff --git a/modules/programs/gnome-shell/default.nix b/modules/programs/gnome-shell.nix
similarity index 100%
rename from modules/programs/gnome-shell/default.nix
rename to modules/programs/gnome-shell.nix
diff --git a/modules/programs/gnome-terminal/default.nix b/modules/programs/gnome-terminal.nix
similarity index 100%
rename from modules/programs/gnome-terminal/default.nix
rename to modules/programs/gnome-terminal.nix
diff --git a/modules/programs/go/default.nix b/modules/programs/go.nix
similarity index 100%
rename from modules/programs/go/default.nix
rename to modules/programs/go.nix
diff --git a/modules/programs/gpg/default.nix b/modules/programs/gpg.nix
similarity index 100%
rename from modules/programs/gpg/default.nix
rename to modules/programs/gpg.nix
diff --git a/modules/programs/gradle/default.nix b/modules/programs/gradle.nix
similarity index 100%
rename from modules/programs/gradle/default.nix
rename to modules/programs/gradle.nix
diff --git a/modules/programs/granted/default.nix b/modules/programs/granted.nix
similarity index 100%
rename from modules/programs/granted/default.nix
rename to modules/programs/granted.nix
diff --git a/modules/programs/halloy/default.nix b/modules/programs/halloy.nix
similarity index 100%
rename from modules/programs/halloy/default.nix
rename to modules/programs/halloy.nix
diff --git a/modules/programs/havoc/default.nix b/modules/programs/havoc.nix
similarity index 100%
rename from modules/programs/havoc/default.nix
rename to modules/programs/havoc.nix
diff --git a/modules/programs/helix/default.nix b/modules/programs/helix.nix
similarity index 100%
rename from modules/programs/helix/default.nix
rename to modules/programs/helix.nix
diff --git a/modules/programs/hexchat/default.nix b/modules/programs/hexchat.nix
similarity index 100%
rename from modules/programs/hexchat/default.nix
rename to modules/programs/hexchat.nix
diff --git a/modules/programs/himalaya/default.nix b/modules/programs/himalaya.nix
similarity index 100%
rename from modules/programs/himalaya/default.nix
rename to modules/programs/himalaya.nix
diff --git a/modules/programs/home-manager/default.nix b/modules/programs/home-manager.nix
similarity index 89%
rename from modules/programs/home-manager/default.nix
rename to modules/programs/home-manager.nix
index 09c550b0e..31b580530 100644
--- a/modules/programs/home-manager/default.nix
+++ b/modules/programs/home-manager.nix
@@ -29,6 +29,6 @@ in
   };
 
   config = lib.mkIf (cfg.enable && !config.submoduleSupport.enable) {
-    home.packages = [ (pkgs.callPackage ../../../home-manager { inherit (cfg) path; }) ];
+    home.packages = [ (pkgs.callPackage ../../home-manager { inherit (cfg) path; }) ];
   };
 }
diff --git a/modules/programs/hstr/default.nix b/modules/programs/hstr.nix
similarity index 100%
rename from modules/programs/hstr/default.nix
rename to modules/programs/hstr.nix
diff --git a/modules/programs/htop/default.nix b/modules/programs/htop.nix
similarity index 100%
rename from modules/programs/htop/default.nix
rename to modules/programs/htop.nix
diff --git a/modules/programs/hwatch/default.nix b/modules/programs/hwatch.nix
similarity index 100%
rename from modules/programs/hwatch/default.nix
rename to modules/programs/hwatch.nix
diff --git a/modules/programs/hyfetch/default.nix b/modules/programs/hyfetch.nix
similarity index 100%
rename from modules/programs/hyfetch/default.nix
rename to modules/programs/hyfetch.nix
diff --git a/modules/programs/hyprlock/default.nix b/modules/programs/hyprlock.nix
similarity index 100%
rename from modules/programs/hyprlock/default.nix
rename to modules/programs/hyprlock.nix
diff --git a/modules/programs/i3bar-river/default.nix b/modules/programs/i3bar-river.nix
similarity index 100%
rename from modules/programs/i3bar-river/default.nix
rename to modules/programs/i3bar-river.nix
diff --git a/modules/programs/i3blocks/default.nix b/modules/programs/i3blocks.nix
similarity index 100%
rename from modules/programs/i3blocks/default.nix
rename to modules/programs/i3blocks.nix
diff --git a/modules/programs/i3status-rust/default.nix b/modules/programs/i3status-rust.nix
similarity index 100%
rename from modules/programs/i3status-rust/default.nix
rename to modules/programs/i3status-rust.nix
diff --git a/modules/programs/i3status/default.nix b/modules/programs/i3status.nix
similarity index 100%
rename from modules/programs/i3status/default.nix
rename to modules/programs/i3status.nix
diff --git a/modules/programs/iamb/default.nix b/modules/programs/iamb.nix
similarity index 100%
rename from modules/programs/iamb/default.nix
rename to modules/programs/iamb.nix
diff --git a/modules/programs/imv/default.nix b/modules/programs/imv.nix
similarity index 100%
rename from modules/programs/imv/default.nix
rename to modules/programs/imv.nix
diff --git a/modules/programs/info/default.nix b/modules/programs/info.nix
similarity index 100%
rename from modules/programs/info/default.nix
rename to modules/programs/info.nix
diff --git a/modules/programs/inori/default.nix b/modules/programs/inori.nix
similarity index 100%
rename from modules/programs/inori/default.nix
rename to modules/programs/inori.nix
diff --git a/modules/programs/ion/default.nix b/modules/programs/ion.nix
similarity index 100%
rename from modules/programs/ion/default.nix
rename to modules/programs/ion.nix
diff --git a/modules/programs/irssi/default.nix b/modules/programs/irssi.nix
similarity index 100%
rename from modules/programs/irssi/default.nix
rename to modules/programs/irssi.nix
diff --git a/modules/programs/java/default.nix b/modules/programs/java.nix
similarity index 100%
rename from modules/programs/java/default.nix
rename to modules/programs/java.nix
diff --git a/modules/programs/jetbrains-remote/default.nix b/modules/programs/jetbrains-remote.nix
similarity index 100%
rename from modules/programs/jetbrains-remote/default.nix
rename to modules/programs/jetbrains-remote.nix
diff --git a/modules/programs/joplin-desktop/default.nix b/modules/programs/joplin-desktop.nix
similarity index 100%
rename from modules/programs/joplin-desktop/default.nix
rename to modules/programs/joplin-desktop.nix
diff --git a/modules/programs/joshuto/default.nix b/modules/programs/joshuto.nix
similarity index 100%
rename from modules/programs/joshuto/default.nix
rename to modules/programs/joshuto.nix
diff --git a/modules/programs/jq/default.nix b/modules/programs/jq.nix
similarity index 100%
rename from modules/programs/jq/default.nix
rename to modules/programs/jq.nix
diff --git a/modules/programs/jqp/default.nix b/modules/programs/jqp.nix
similarity index 100%
rename from modules/programs/jqp/default.nix
rename to modules/programs/jqp.nix
diff --git a/modules/programs/jujutsu/default.nix b/modules/programs/jujutsu.nix
similarity index 100%
rename from modules/programs/jujutsu/default.nix
rename to modules/programs/jujutsu.nix
diff --git a/modules/programs/just/default.nix b/modules/programs/just.nix
similarity index 100%
rename from modules/programs/just/default.nix
rename to modules/programs/just.nix
diff --git a/modules/programs/k9s/default.nix b/modules/programs/k9s.nix
similarity index 100%
rename from modules/programs/k9s/default.nix
rename to modules/programs/k9s.nix
diff --git a/modules/programs/kakoune/default.nix b/modules/programs/kakoune.nix
similarity index 100%
rename from modules/programs/kakoune/default.nix
rename to modules/programs/kakoune.nix
diff --git a/modules/programs/keepassxc/default.nix b/modules/programs/keepassxc.nix
similarity index 100%
rename from modules/programs/keepassxc/default.nix
rename to modules/programs/keepassxc.nix
diff --git a/modules/programs/keychain/default.nix b/modules/programs/keychain.nix
similarity index 100%
rename from modules/programs/keychain/default.nix
rename to modules/programs/keychain.nix
diff --git a/modules/programs/khard/default.nix b/modules/programs/khard.nix
similarity index 100%
rename from modules/programs/khard/default.nix
rename to modules/programs/khard.nix
diff --git a/modules/programs/kickoff/default.nix b/modules/programs/kickoff.nix
similarity index 100%
rename from modules/programs/kickoff/default.nix
rename to modules/programs/kickoff.nix
diff --git a/modules/programs/kitty/default.nix b/modules/programs/kitty.nix
similarity index 100%
rename from modules/programs/kitty/default.nix
rename to modules/programs/kitty.nix
diff --git a/modules/programs/kodi/default.nix b/modules/programs/kodi.nix
similarity index 100%
rename from modules/programs/kodi/default.nix
rename to modules/programs/kodi.nix
diff --git a/modules/programs/kubecolor/default.nix b/modules/programs/kubecolor.nix
similarity index 100%
rename from modules/programs/kubecolor/default.nix
rename to modules/programs/kubecolor.nix
diff --git a/modules/programs/lapce/default.nix b/modules/programs/lapce.nix
similarity index 100%
rename from modules/programs/lapce/default.nix
rename to modules/programs/lapce.nix
diff --git a/modules/programs/lazydocker/default.nix b/modules/programs/lazydocker.nix
similarity index 100%
rename from modules/programs/lazydocker/default.nix
rename to modules/programs/lazydocker.nix
diff --git a/modules/programs/lazygit/default.nix b/modules/programs/lazygit.nix
similarity index 100%
rename from modules/programs/lazygit/default.nix
rename to modules/programs/lazygit.nix
diff --git a/modules/programs/lazysql/default.nix b/modules/programs/lazysql.nix
similarity index 100%
rename from modules/programs/lazysql/default.nix
rename to modules/programs/lazysql.nix
diff --git a/modules/programs/ledger/default.nix b/modules/programs/ledger.nix
similarity index 100%
rename from modules/programs/ledger/default.nix
rename to modules/programs/ledger.nix
diff --git a/modules/programs/less/default.nix b/modules/programs/less.nix
similarity index 100%
rename from modules/programs/less/default.nix
rename to modules/programs/less.nix
diff --git a/modules/programs/lesspipe/default.nix b/modules/programs/lesspipe.nix
similarity index 100%
rename from modules/programs/lesspipe/default.nix
rename to modules/programs/lesspipe.nix
diff --git a/modules/programs/lf/default.nix b/modules/programs/lf.nix
similarity index 100%
rename from modules/programs/lf/default.nix
rename to modules/programs/lf.nix
diff --git a/modules/programs/librewolf/default.nix b/modules/programs/librewolf.nix
similarity index 96%
rename from modules/programs/librewolf/default.nix
rename to modules/programs/librewolf.nix
index e762aff34..2f0620fbb 100644
--- a/modules/programs/librewolf/default.nix
+++ b/modules/programs/librewolf.nix
@@ -18,7 +18,7 @@ let
     "librewolf"
   ];
 
-  mkFirefoxModule = import ../firefox/mkFirefoxModule.nix;
+  mkFirefoxModule = import ./firefox/mkFirefoxModule.nix;
 
 in
 {
diff --git a/modules/programs/lieer/default.nix b/modules/programs/lieer.nix
similarity index 100%
rename from modules/programs/lieer/default.nix
rename to modules/programs/lieer.nix
diff --git a/modules/programs/looking-glass-client/default.nix b/modules/programs/looking-glass-client.nix
similarity index 100%
rename from modules/programs/looking-glass-client/default.nix
rename to modules/programs/looking-glass-client.nix
diff --git a/modules/programs/lsd/default.nix b/modules/programs/lsd.nix
similarity index 100%
rename from modules/programs/lsd/default.nix
rename to modules/programs/lsd.nix
diff --git a/modules/programs/lutris/default.nix b/modules/programs/lutris.nix
similarity index 100%
rename from modules/programs/lutris/default.nix
rename to modules/programs/lutris.nix
diff --git a/modules/programs/man/default.nix b/modules/programs/man.nix
similarity index 100%
rename from modules/programs/man/default.nix
rename to modules/programs/man.nix
diff --git a/modules/programs/mangohud/default.nix b/modules/programs/mangohud.nix
similarity index 100%
rename from modules/programs/mangohud/default.nix
rename to modules/programs/mangohud.nix
diff --git a/modules/programs/matplotlib/default.nix b/modules/programs/matplotlib.nix
similarity index 100%
rename from modules/programs/matplotlib/default.nix
rename to modules/programs/matplotlib.nix
diff --git a/modules/programs/mc/default.nix b/modules/programs/mc.nix
similarity index 100%
rename from modules/programs/mc/default.nix
rename to modules/programs/mc.nix
diff --git a/modules/programs/mcfly/default.nix b/modules/programs/mcfly.nix
similarity index 100%
rename from modules/programs/mcfly/default.nix
rename to modules/programs/mcfly.nix
diff --git a/modules/programs/meli/default.nix b/modules/programs/meli.nix
similarity index 100%
rename from modules/programs/meli/default.nix
rename to modules/programs/meli.nix
diff --git a/modules/programs/mercurial/default.nix b/modules/programs/mercurial.nix
similarity index 100%
rename from modules/programs/mercurial/default.nix
rename to modules/programs/mercurial.nix
diff --git a/modules/programs/mergiraf/default.nix b/modules/programs/mergiraf.nix
similarity index 100%
rename from modules/programs/mergiraf/default.nix
rename to modules/programs/mergiraf.nix
diff --git a/modules/programs/micro/default.nix b/modules/programs/micro.nix
similarity index 100%
rename from modules/programs/micro/default.nix
rename to modules/programs/micro.nix
diff --git a/modules/programs/mise/default.nix b/modules/programs/mise.nix
similarity index 100%
rename from modules/programs/mise/default.nix
rename to modules/programs/mise.nix
diff --git a/modules/programs/mods/default.nix b/modules/programs/mods.nix
similarity index 100%
rename from modules/programs/mods/default.nix
rename to modules/programs/mods.nix
diff --git a/modules/programs/mpv/default.nix b/modules/programs/mpv.nix
similarity index 100%
rename from modules/programs/mpv/default.nix
rename to modules/programs/mpv.nix
diff --git a/modules/programs/mpvpaper/default.nix b/modules/programs/mpvpaper.nix
similarity index 100%
rename from modules/programs/mpvpaper/default.nix
rename to modules/programs/mpvpaper.nix
diff --git a/modules/programs/mr/default.nix b/modules/programs/mr.nix
similarity index 100%
rename from modules/programs/mr/default.nix
rename to modules/programs/mr.nix
diff --git a/modules/programs/mu/default.nix b/modules/programs/mu.nix
similarity index 100%
rename from modules/programs/mu/default.nix
rename to modules/programs/mu.nix
diff --git a/modules/programs/mujmap/default.nix b/modules/programs/mujmap.nix
similarity index 100%
rename from modules/programs/mujmap/default.nix
rename to modules/programs/mujmap.nix
diff --git a/modules/programs/navi/default.nix b/modules/programs/navi.nix
similarity index 100%
rename from modules/programs/navi/default.nix
rename to modules/programs/navi.nix
diff --git a/modules/programs/ncmpcpp/default.nix b/modules/programs/ncmpcpp.nix
similarity index 100%
rename from modules/programs/ncmpcpp/default.nix
rename to modules/programs/ncmpcpp.nix
diff --git a/modules/programs/ncspot/default.nix b/modules/programs/ncspot.nix
similarity index 100%
rename from modules/programs/ncspot/default.nix
rename to modules/programs/ncspot.nix
diff --git a/modules/programs/ne/default.nix b/modules/programs/ne.nix
similarity index 100%
rename from modules/programs/ne/default.nix
rename to modules/programs/ne.nix
diff --git a/modules/programs/neovide/default.nix b/modules/programs/neovide.nix
similarity index 100%
rename from modules/programs/neovide/default.nix
rename to modules/programs/neovide.nix
diff --git a/modules/programs/neovim/default.nix b/modules/programs/neovim.nix
similarity index 99%
rename from modules/programs/neovim/default.nix
rename to modules/programs/neovim.nix
index 4d44a1ab9..7c5baafe8 100644
--- a/modules/programs/neovim/default.nix
+++ b/modules/programs/neovim.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/default.nix b/modules/programs/newsboat.nix
similarity index 100%
rename from modules/programs/newsboat/default.nix
rename to modules/programs/newsboat.nix
diff --git a/modules/programs/nh/default.nix b/modules/programs/nh.nix
similarity index 100%
rename from modules/programs/nh/default.nix
rename to modules/programs/nh.nix
diff --git a/modules/programs/nheko/default.nix b/modules/programs/nheko.nix
similarity index 100%
rename from modules/programs/nheko/default.nix
rename to modules/programs/nheko.nix
diff --git a/modules/programs/niriswitcher/default.nix b/modules/programs/niriswitcher.nix
similarity index 100%
rename from modules/programs/niriswitcher/default.nix
rename to modules/programs/niriswitcher.nix
diff --git a/modules/programs/nix-index/default.nix b/modules/programs/nix-index.nix
similarity index 100%
rename from modules/programs/nix-index/default.nix
rename to modules/programs/nix-index.nix
diff --git a/modules/programs/nix-init/default.nix b/modules/programs/nix-init.nix
similarity index 100%
rename from modules/programs/nix-init/default.nix
rename to modules/programs/nix-init.nix
diff --git a/modules/programs/nix-your-shell/default.nix b/modules/programs/nix-your-shell.nix
similarity index 100%
rename from modules/programs/nix-your-shell/default.nix
rename to modules/programs/nix-your-shell.nix
diff --git a/modules/programs/nnn/default.nix b/modules/programs/nnn.nix
similarity index 100%
rename from modules/programs/nnn/default.nix
rename to modules/programs/nnn.nix
diff --git a/modules/programs/noti/default.nix b/modules/programs/noti.nix
similarity index 100%
rename from modules/programs/noti/default.nix
rename to modules/programs/noti.nix
diff --git a/modules/programs/numbat/default.nix b/modules/programs/numbat.nix
similarity index 100%
rename from modules/programs/numbat/default.nix
rename to modules/programs/numbat.nix
diff --git a/modules/programs/nushell/default.nix b/modules/programs/nushell.nix
similarity index 100%
rename from modules/programs/nushell/default.nix
rename to modules/programs/nushell.nix
diff --git a/modules/programs/nyxt/default.nix b/modules/programs/nyxt.nix
similarity index 100%
rename from modules/programs/nyxt/default.nix
rename to modules/programs/nyxt.nix
diff --git a/modules/programs/obs-studio/default.nix b/modules/programs/obs-studio.nix
similarity index 100%
rename from modules/programs/obs-studio/default.nix
rename to modules/programs/obs-studio.nix
diff --git a/modules/programs/obsidian/default.nix b/modules/programs/obsidian.nix
similarity index 100%
rename from modules/programs/obsidian/default.nix
rename to modules/programs/obsidian.nix
diff --git a/modules/programs/octant/default.nix b/modules/programs/octant.nix
similarity index 100%
rename from modules/programs/octant/default.nix
rename to modules/programs/octant.nix
diff --git a/modules/programs/oh-my-posh/default.nix b/modules/programs/oh-my-posh.nix
similarity index 100%
rename from modules/programs/oh-my-posh/default.nix
rename to modules/programs/oh-my-posh.nix
diff --git a/modules/programs/onagre/default.nix b/modules/programs/onagre.nix
similarity index 100%
rename from modules/programs/onagre/default.nix
rename to modules/programs/onagre.nix
diff --git a/modules/programs/onedrive/default.nix b/modules/programs/onedrive.nix
similarity index 100%
rename from modules/programs/onedrive/default.nix
rename to modules/programs/onedrive.nix
diff --git a/modules/programs/onlyoffice/default.nix b/modules/programs/onlyoffice.nix
similarity index 100%
rename from modules/programs/onlyoffice/default.nix
rename to modules/programs/onlyoffice.nix
diff --git a/modules/programs/opam/default.nix b/modules/programs/opam.nix
similarity index 100%
rename from modules/programs/opam/default.nix
rename to modules/programs/opam.nix
diff --git a/modules/programs/openstackclient/default.nix b/modules/programs/openstackclient.nix
similarity index 100%
rename from modules/programs/openstackclient/default.nix
rename to modules/programs/openstackclient.nix
diff --git a/modules/programs/pandoc/default.nix b/modules/programs/pandoc.nix
similarity index 100%
rename from modules/programs/pandoc/default.nix
rename to modules/programs/pandoc.nix
diff --git a/modules/programs/papis/default.nix b/modules/programs/papis.nix
similarity index 100%
rename from modules/programs/papis/default.nix
rename to modules/programs/papis.nix
diff --git a/modules/programs/password-store/default.nix b/modules/programs/password-store.nix
similarity index 100%
rename from modules/programs/password-store/default.nix
rename to modules/programs/password-store.nix
diff --git a/modules/programs/pay-respects/default.nix b/modules/programs/pay-respects.nix
similarity index 100%
rename from modules/programs/pay-respects/default.nix
rename to modules/programs/pay-respects.nix
diff --git a/modules/programs/pazi/default.nix b/modules/programs/pazi.nix
similarity index 100%
rename from modules/programs/pazi/default.nix
rename to modules/programs/pazi.nix
diff --git a/modules/programs/pet/default.nix b/modules/programs/pet.nix
similarity index 100%
rename from modules/programs/pet/default.nix
rename to modules/programs/pet.nix
diff --git a/modules/programs/pgcli/default.nix b/modules/programs/pgcli.nix
similarity index 100%
rename from modules/programs/pgcli/default.nix
rename to modules/programs/pgcli.nix
diff --git a/modules/programs/pidgin/default.nix b/modules/programs/pidgin.nix
similarity index 100%
rename from modules/programs/pidgin/default.nix
rename to modules/programs/pidgin.nix
diff --git a/modules/programs/pistol/default.nix b/modules/programs/pistol.nix
similarity index 100%
rename from modules/programs/pistol/default.nix
rename to modules/programs/pistol.nix
diff --git a/modules/programs/piston-cli/default.nix b/modules/programs/piston-cli.nix
similarity index 100%
rename from modules/programs/piston-cli/default.nix
rename to modules/programs/piston-cli.nix
diff --git a/modules/programs/pls/default.nix b/modules/programs/pls.nix
similarity index 100%
rename from modules/programs/pls/default.nix
rename to modules/programs/pls.nix
diff --git a/modules/programs/poetry/default.nix b/modules/programs/poetry.nix
similarity index 100%
rename from modules/programs/poetry/default.nix
rename to modules/programs/poetry.nix
diff --git a/modules/programs/powerline-go/default.nix b/modules/programs/powerline-go.nix
similarity index 100%
rename from modules/programs/powerline-go/default.nix
rename to modules/programs/powerline-go.nix
diff --git a/modules/programs/pqiv/default.nix b/modules/programs/pqiv.nix
similarity index 100%
rename from modules/programs/pqiv/default.nix
rename to modules/programs/pqiv.nix
diff --git a/modules/programs/ptyxis/default.nix b/modules/programs/ptyxis.nix
similarity index 100%
rename from modules/programs/ptyxis/default.nix
rename to modules/programs/ptyxis.nix
diff --git a/modules/programs/pubs/default.nix b/modules/programs/pubs.nix
similarity index 100%
rename from modules/programs/pubs/default.nix
rename to modules/programs/pubs.nix
diff --git a/modules/programs/pyenv/default.nix b/modules/programs/pyenv.nix
similarity index 100%
rename from modules/programs/pyenv/default.nix
rename to modules/programs/pyenv.nix
diff --git a/modules/programs/pylint/default.nix b/modules/programs/pylint.nix
similarity index 100%
rename from modules/programs/pylint/default.nix
rename to modules/programs/pylint.nix
diff --git a/modules/programs/pywal/default.nix b/modules/programs/pywal.nix
similarity index 100%
rename from modules/programs/pywal/default.nix
rename to modules/programs/pywal.nix
diff --git a/modules/programs/qcal/default.nix b/modules/programs/qcal.nix
similarity index 100%
rename from modules/programs/qcal/default.nix
rename to modules/programs/qcal.nix
diff --git a/modules/programs/qutebrowser/default.nix b/modules/programs/qutebrowser.nix
similarity index 100%
rename from modules/programs/qutebrowser/default.nix
rename to modules/programs/qutebrowser.nix
diff --git a/modules/programs/ranger/default.nix b/modules/programs/ranger.nix
similarity index 100%
rename from modules/programs/ranger/default.nix
rename to modules/programs/ranger.nix
diff --git a/modules/programs/rbenv/default.nix b/modules/programs/rbenv.nix
similarity index 100%
rename from modules/programs/rbenv/default.nix
rename to modules/programs/rbenv.nix
diff --git a/modules/programs/rbw/default.nix b/modules/programs/rbw.nix
similarity index 100%
rename from modules/programs/rbw/default.nix
rename to modules/programs/rbw.nix
diff --git a/modules/programs/rclone/default.nix b/modules/programs/rclone.nix
similarity index 100%
rename from modules/programs/rclone/default.nix
rename to modules/programs/rclone.nix
diff --git a/modules/programs/readline/default.nix b/modules/programs/readline.nix
similarity index 100%
rename from modules/programs/readline/default.nix
rename to modules/programs/readline.nix
diff --git a/modules/programs/rio/default.nix b/modules/programs/rio.nix
similarity index 100%
rename from modules/programs/rio/default.nix
rename to modules/programs/rio.nix
diff --git a/modules/programs/ripgrep-all/default.nix b/modules/programs/ripgrep-all.nix
similarity index 100%
rename from modules/programs/ripgrep-all/default.nix
rename to modules/programs/ripgrep-all.nix
diff --git a/modules/programs/ripgrep/default.nix b/modules/programs/ripgrep.nix
similarity index 100%
rename from modules/programs/ripgrep/default.nix
rename to modules/programs/ripgrep.nix
diff --git a/modules/programs/rmpc/default.nix b/modules/programs/rmpc.nix
similarity index 100%
rename from modules/programs/rmpc/default.nix
rename to modules/programs/rmpc.nix
diff --git a/modules/programs/rofi-pass/default.nix b/modules/programs/rofi-pass.nix
similarity index 100%
rename from modules/programs/rofi-pass/default.nix
rename to modules/programs/rofi-pass.nix
diff --git a/modules/programs/rofi/default.nix b/modules/programs/rofi.nix
similarity index 100%
rename from modules/programs/rofi/default.nix
rename to modules/programs/rofi.nix
diff --git a/modules/programs/rtorrent/default.nix b/modules/programs/rtorrent.nix
similarity index 100%
rename from modules/programs/rtorrent/default.nix
rename to modules/programs/rtorrent.nix
diff --git a/modules/programs/ruff/default.nix b/modules/programs/ruff.nix
similarity index 100%
rename from modules/programs/ruff/default.nix
rename to modules/programs/ruff.nix
diff --git a/modules/programs/sagemath/default.nix b/modules/programs/sagemath.nix
similarity index 100%
rename from modules/programs/sagemath/default.nix
rename to modules/programs/sagemath.nix
diff --git a/modules/programs/sapling/default.nix b/modules/programs/sapling.nix
similarity index 100%
rename from modules/programs/sapling/default.nix
rename to modules/programs/sapling.nix
diff --git a/modules/programs/sbt/default.nix b/modules/programs/sbt.nix
similarity index 100%
rename from modules/programs/sbt/default.nix
rename to modules/programs/sbt.nix
diff --git a/modules/programs/scmpuff/default.nix b/modules/programs/scmpuff.nix
similarity index 100%
rename from modules/programs/scmpuff/default.nix
rename to modules/programs/scmpuff.nix
diff --git a/modules/programs/script-directory/default.nix b/modules/programs/script-directory.nix
similarity index 100%
rename from modules/programs/script-directory/default.nix
rename to modules/programs/script-directory.nix
diff --git a/modules/programs/senpai/default.nix b/modules/programs/senpai.nix
similarity index 100%
rename from modules/programs/senpai/default.nix
rename to modules/programs/senpai.nix
diff --git a/modules/programs/sesh/default.nix b/modules/programs/sesh.nix
similarity index 100%
rename from modules/programs/sesh/default.nix
rename to modules/programs/sesh.nix
diff --git a/modules/programs/sftpman/default.nix b/modules/programs/sftpman.nix
similarity index 100%
rename from modules/programs/sftpman/default.nix
rename to modules/programs/sftpman.nix
diff --git a/modules/programs/sioyek/default.nix b/modules/programs/sioyek.nix
similarity index 100%
rename from modules/programs/sioyek/default.nix
rename to modules/programs/sioyek.nix
diff --git a/modules/programs/sketchybar/default.nix b/modules/programs/sketchybar.nix
similarity index 100%
rename from modules/programs/sketchybar/default.nix
rename to modules/programs/sketchybar.nix
diff --git a/modules/programs/skim/default.nix b/modules/programs/skim.nix
similarity index 100%
rename from modules/programs/skim/default.nix
rename to modules/programs/skim.nix
diff --git a/modules/programs/sm64ex/default.nix b/modules/programs/sm64ex.nix
similarity index 100%
rename from modules/programs/sm64ex/default.nix
rename to modules/programs/sm64ex.nix
diff --git a/modules/programs/smug/default.nix b/modules/programs/smug.nix
similarity index 100%
rename from modules/programs/smug/default.nix
rename to modules/programs/smug.nix
diff --git a/modules/programs/spotify-player/default.nix b/modules/programs/spotify-player.nix
similarity index 100%
rename from modules/programs/spotify-player/default.nix
rename to modules/programs/spotify-player.nix
diff --git a/modules/programs/sqls/default.nix b/modules/programs/sqls.nix
similarity index 100%
rename from modules/programs/sqls/default.nix
rename to modules/programs/sqls.nix
diff --git a/modules/programs/ssh/default.nix b/modules/programs/ssh.nix
similarity index 100%
rename from modules/programs/ssh/default.nix
rename to modules/programs/ssh.nix
diff --git a/modules/programs/starship/default.nix b/modules/programs/starship.nix
similarity index 100%
rename from modules/programs/starship/default.nix
rename to modules/programs/starship.nix
diff --git a/modules/programs/streamlink/default.nix b/modules/programs/streamlink.nix
similarity index 100%
rename from modules/programs/streamlink/default.nix
rename to modules/programs/streamlink.nix
diff --git a/modules/programs/superfile/default.nix b/modules/programs/superfile.nix
similarity index 100%
rename from modules/programs/superfile/default.nix
rename to modules/programs/superfile.nix
diff --git a/modules/programs/sway-easyfocus/default.nix b/modules/programs/sway-easyfocus.nix
similarity index 100%
rename from modules/programs/sway-easyfocus/default.nix
rename to modules/programs/sway-easyfocus.nix
diff --git a/modules/programs/swayimg/default.nix b/modules/programs/swayimg.nix
similarity index 100%
rename from modules/programs/swayimg/default.nix
rename to modules/programs/swayimg.nix
diff --git a/modules/programs/swaylock/default.nix b/modules/programs/swaylock.nix
similarity index 100%
rename from modules/programs/swaylock/default.nix
rename to modules/programs/swaylock.nix
diff --git a/modules/programs/swayr/default.nix b/modules/programs/swayr.nix
similarity index 100%
rename from modules/programs/swayr/default.nix
rename to modules/programs/swayr.nix
diff --git a/modules/programs/taskwarrior/default.nix b/modules/programs/taskwarrior.nix
similarity index 100%
rename from modules/programs/taskwarrior/default.nix
rename to modules/programs/taskwarrior.nix
diff --git a/modules/programs/tealdeer/default.nix b/modules/programs/tealdeer.nix
similarity index 100%
rename from modules/programs/tealdeer/default.nix
rename to modules/programs/tealdeer.nix
diff --git a/modules/programs/television/default.nix b/modules/programs/television.nix
similarity index 100%
rename from modules/programs/television/default.nix
rename to modules/programs/television.nix
diff --git a/modules/programs/terminator/default.nix b/modules/programs/terminator.nix
similarity index 100%
rename from modules/programs/terminator/default.nix
rename to modules/programs/terminator.nix
diff --git a/modules/programs/termite/default.nix b/modules/programs/termite.nix
similarity index 100%
rename from modules/programs/termite/default.nix
rename to modules/programs/termite.nix
diff --git a/modules/programs/tex-fmt/default.nix b/modules/programs/tex-fmt.nix
similarity index 100%
rename from modules/programs/tex-fmt/default.nix
rename to modules/programs/tex-fmt.nix
diff --git a/modules/programs/texlive/default.nix b/modules/programs/texlive.nix
similarity index 100%
rename from modules/programs/texlive/default.nix
rename to modules/programs/texlive.nix
diff --git a/modules/programs/thefuck/default.nix b/modules/programs/thefuck.nix
similarity index 100%
rename from modules/programs/thefuck/default.nix
rename to modules/programs/thefuck.nix
diff --git a/modules/programs/thunderbird/default.nix b/modules/programs/thunderbird.nix
similarity index 99%
rename from modules/programs/thunderbird/default.nix
rename to modules/programs/thunderbird.nix
index 55595eded..bfc3ac1b7 100644
--- a/modules/programs/thunderbird/default.nix
+++ b/modules/programs/thunderbird.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/default.nix b/modules/programs/timidity.nix
similarity index 100%
rename from modules/programs/timidity/default.nix
rename to modules/programs/timidity.nix
diff --git a/modules/programs/tint2/default.nix b/modules/programs/tint2.nix
similarity index 100%
rename from modules/programs/tint2/default.nix
rename to modules/programs/tint2.nix
diff --git a/modules/programs/tiny/default.nix b/modules/programs/tiny.nix
similarity index 100%
rename from modules/programs/tiny/default.nix
rename to modules/programs/tiny.nix
diff --git a/modules/programs/tmate/default.nix b/modules/programs/tmate.nix
similarity index 100%
rename from modules/programs/tmate/default.nix
rename to modules/programs/tmate.nix
diff --git a/modules/programs/tmux/default.nix b/modules/programs/tmux.nix
similarity index 100%
rename from modules/programs/tmux/default.nix
rename to modules/programs/tmux.nix
diff --git a/modules/programs/todoman/default.nix b/modules/programs/todoman.nix
similarity index 100%
rename from modules/programs/todoman/default.nix
rename to modules/programs/todoman.nix
diff --git a/modules/programs/tofi/default.nix b/modules/programs/tofi.nix
similarity index 100%
rename from modules/programs/tofi/default.nix
rename to modules/programs/tofi.nix
diff --git a/modules/programs/topgrade/default.nix b/modules/programs/topgrade.nix
similarity index 100%
rename from modules/programs/topgrade/default.nix
rename to modules/programs/topgrade.nix
diff --git a/modules/programs/translate-shell/default.nix b/modules/programs/translate-shell.nix
similarity index 100%
rename from modules/programs/translate-shell/default.nix
rename to modules/programs/translate-shell.nix
diff --git a/modules/programs/urxvt/default.nix b/modules/programs/urxvt.nix
similarity index 100%
rename from modules/programs/urxvt/default.nix
rename to modules/programs/urxvt.nix
diff --git a/modules/programs/uv/default.nix b/modules/programs/uv.nix
similarity index 100%
rename from modules/programs/uv/default.nix
rename to modules/programs/uv.nix
diff --git a/modules/programs/vesktop/default.nix b/modules/programs/vesktop.nix
similarity index 100%
rename from modules/programs/vesktop/default.nix
rename to modules/programs/vesktop.nix
diff --git a/modules/programs/vifm/default.nix b/modules/programs/vifm.nix
similarity index 100%
rename from modules/programs/vifm/default.nix
rename to modules/programs/vifm.nix
diff --git a/modules/programs/vim-vint/default.nix b/modules/programs/vim-vint.nix
similarity index 100%
rename from modules/programs/vim-vint/default.nix
rename to modules/programs/vim-vint.nix
diff --git a/modules/programs/vim/default.nix b/modules/programs/vim.nix
similarity index 100%
rename from modules/programs/vim/default.nix
rename to modules/programs/vim.nix
diff --git a/modules/programs/vinegar/default.nix b/modules/programs/vinegar.nix
similarity index 100%
rename from modules/programs/vinegar/default.nix
rename to modules/programs/vinegar.nix
diff --git a/modules/programs/visidata/default.nix b/modules/programs/visidata.nix
similarity index 100%
rename from modules/programs/visidata/default.nix
rename to modules/programs/visidata.nix
diff --git a/modules/programs/wallust/default.nix b/modules/programs/wallust.nix
similarity index 100%
rename from modules/programs/wallust/default.nix
rename to modules/programs/wallust.nix
diff --git a/modules/programs/watson/default.nix b/modules/programs/watson.nix
similarity index 100%
rename from modules/programs/watson/default.nix
rename to modules/programs/watson.nix
diff --git a/modules/programs/waveterm/default.nix b/modules/programs/waveterm.nix
similarity index 100%
rename from modules/programs/waveterm/default.nix
rename to modules/programs/waveterm.nix
diff --git a/modules/programs/waybar/default.nix b/modules/programs/waybar.nix
similarity index 100%
rename from modules/programs/waybar/default.nix
rename to modules/programs/waybar.nix
diff --git a/modules/programs/waylogout/default.nix b/modules/programs/waylogout.nix
similarity index 100%
rename from modules/programs/waylogout/default.nix
rename to modules/programs/waylogout.nix
diff --git a/modules/programs/wayprompt/default.nix b/modules/programs/wayprompt.nix
similarity index 100%
rename from modules/programs/wayprompt/default.nix
rename to modules/programs/wayprompt.nix
diff --git a/modules/programs/wezterm/default.nix b/modules/programs/wezterm.nix
similarity index 100%
rename from modules/programs/wezterm/default.nix
rename to modules/programs/wezterm.nix
diff --git a/modules/programs/wlogout/default.nix b/modules/programs/wlogout.nix
similarity index 100%
rename from modules/programs/wlogout/default.nix
rename to modules/programs/wlogout.nix
diff --git a/modules/programs/wofi/default.nix b/modules/programs/wofi.nix
similarity index 100%
rename from modules/programs/wofi/default.nix
rename to modules/programs/wofi.nix
diff --git a/modules/programs/xmobar/default.nix b/modules/programs/xmobar.nix
similarity index 100%
rename from modules/programs/xmobar/default.nix
rename to modules/programs/xmobar.nix
diff --git a/modules/programs/xplr/default.nix b/modules/programs/xplr.nix
similarity index 100%
rename from modules/programs/xplr/default.nix
rename to modules/programs/xplr.nix
diff --git a/modules/programs/yambar/default.nix b/modules/programs/yambar.nix
similarity index 100%
rename from modules/programs/yambar/default.nix
rename to modules/programs/yambar.nix
diff --git a/modules/programs/yazi/default.nix b/modules/programs/yazi.nix
similarity index 100%
rename from modules/programs/yazi/default.nix
rename to modules/programs/yazi.nix
diff --git a/modules/programs/yt-dlp/default.nix b/modules/programs/yt-dlp.nix
similarity index 100%
rename from modules/programs/yt-dlp/default.nix
rename to modules/programs/yt-dlp.nix
diff --git a/modules/programs/z-lua/default.nix b/modules/programs/z-lua.nix
similarity index 100%
rename from modules/programs/z-lua/default.nix
rename to modules/programs/z-lua.nix
diff --git a/modules/programs/zathura/default.nix b/modules/programs/zathura.nix
similarity index 100%
rename from modules/programs/zathura/default.nix
rename to modules/programs/zathura.nix
diff --git a/modules/programs/zed-editor/default.nix b/modules/programs/zed-editor.nix
similarity index 100%
rename from modules/programs/zed-editor/default.nix
rename to modules/programs/zed-editor.nix
diff --git a/modules/programs/zellij/default.nix b/modules/programs/zellij.nix
similarity index 100%
rename from modules/programs/zellij/default.nix
rename to modules/programs/zellij.nix
diff --git a/modules/programs/zk/default.nix b/modules/programs/zk.nix
similarity index 100%
rename from modules/programs/zk/default.nix
rename to modules/programs/zk.nix
diff --git a/modules/programs/zoxide/default.nix b/modules/programs/zoxide.nix
similarity index 100%
rename from modules/programs/zoxide/default.nix
rename to modules/programs/zoxide.nix
diff --git a/modules/programs/zplug/default.nix b/modules/programs/zplug.nix
similarity index 100%
rename from modules/programs/zplug/default.nix
rename to modules/programs/zplug.nix
diff --git a/modules/services/activitywatch/default.nix b/modules/services/activitywatch.nix
similarity index 100%
rename from modules/services/activitywatch/default.nix
rename to modules/services/activitywatch.nix
diff --git a/modules/services/amberol/default.nix b/modules/services/amberol.nix
similarity index 100%
rename from modules/services/amberol/default.nix
rename to modules/services/amberol.nix
diff --git a/modules/services/arrpc/default.nix b/modules/services/arrpc.nix
similarity index 100%
rename from modules/services/arrpc/default.nix
rename to modules/services/arrpc.nix
diff --git a/modules/services/autorandr/default.nix b/modules/services/autorandr.nix
similarity index 100%
rename from modules/services/autorandr/default.nix
rename to modules/services/autorandr.nix
diff --git a/modules/services/avizo/default.nix b/modules/services/avizo.nix
similarity index 100%
rename from modules/services/avizo/default.nix
rename to modules/services/avizo.nix
diff --git a/modules/services/barrier/default.nix b/modules/services/barrier.nix
similarity index 100%
rename from modules/services/barrier/default.nix
rename to modules/services/barrier.nix
diff --git a/modules/services/batsignal/default.nix b/modules/services/batsignal.nix
similarity index 100%
rename from modules/services/batsignal/default.nix
rename to modules/services/batsignal.nix
diff --git a/modules/services/betterlockscreen/default.nix b/modules/services/betterlockscreen.nix
similarity index 100%
rename from modules/services/betterlockscreen/default.nix
rename to modules/services/betterlockscreen.nix
diff --git a/modules/services/blanket/default.nix b/modules/services/blanket.nix
similarity index 100%
rename from modules/services/blanket/default.nix
rename to modules/services/blanket.nix
diff --git a/modules/services/blueman-applet/default.nix b/modules/services/blueman-applet.nix
similarity index 100%
rename from modules/services/blueman-applet/default.nix
rename to modules/services/blueman-applet.nix
diff --git a/modules/services/borgmatic/default.nix b/modules/services/borgmatic.nix
similarity index 100%
rename from modules/services/borgmatic/default.nix
rename to modules/services/borgmatic.nix
diff --git a/modules/services/cachix-agent/default.nix b/modules/services/cachix-agent.nix
similarity index 100%
rename from modules/services/cachix-agent/default.nix
rename to modules/services/cachix-agent.nix
diff --git a/modules/services/caffeine/default.nix b/modules/services/caffeine.nix
similarity index 100%
rename from modules/services/caffeine/default.nix
rename to modules/services/caffeine.nix
diff --git a/modules/services/cbatticon/default.nix b/modules/services/cbatticon.nix
similarity index 100%
rename from modules/services/cbatticon/default.nix
rename to modules/services/cbatticon.nix
diff --git a/modules/services/clipcat/default.nix b/modules/services/clipcat.nix
similarity index 100%
rename from modules/services/clipcat/default.nix
rename to modules/services/clipcat.nix
diff --git a/modules/services/cliphist/default.nix b/modules/services/cliphist.nix
similarity index 100%
rename from modules/services/cliphist/default.nix
rename to modules/services/cliphist.nix
diff --git a/modules/services/clipman/default.nix b/modules/services/clipman.nix
similarity index 100%
rename from modules/services/clipman/default.nix
rename to modules/services/clipman.nix
diff --git a/modules/services/clipmenu/default.nix b/modules/services/clipmenu.nix
similarity index 100%
rename from modules/services/clipmenu/default.nix
rename to modules/services/clipmenu.nix
diff --git a/modules/services/clipse/default.nix b/modules/services/clipse.nix
similarity index 100%
rename from modules/services/clipse/default.nix
rename to modules/services/clipse.nix
diff --git a/modules/services/comodoro/default.nix b/modules/services/comodoro.nix
similarity index 100%
rename from modules/services/comodoro/default.nix
rename to modules/services/comodoro.nix
diff --git a/modules/services/conky/default.nix b/modules/services/conky.nix
similarity index 100%
rename from modules/services/conky/default.nix
rename to modules/services/conky.nix
diff --git a/modules/services/copyq/default.nix b/modules/services/copyq.nix
similarity index 100%
rename from modules/services/copyq/default.nix
rename to modules/services/copyq.nix
diff --git a/modules/services/darkman/default.nix b/modules/services/darkman.nix
similarity index 100%
rename from modules/services/darkman/default.nix
rename to modules/services/darkman.nix
diff --git a/modules/services/davmail/default.nix b/modules/services/davmail.nix
similarity index 100%
rename from modules/services/davmail/default.nix
rename to modules/services/davmail.nix
diff --git a/modules/services/devilspie2/default.nix b/modules/services/devilspie2.nix
similarity index 100%
rename from modules/services/devilspie2/default.nix
rename to modules/services/devilspie2.nix
diff --git a/modules/services/dropbox/default.nix b/modules/services/dropbox.nix
similarity index 100%
rename from modules/services/dropbox/default.nix
rename to modules/services/dropbox.nix
diff --git a/modules/services/dunst/default.nix b/modules/services/dunst.nix
similarity index 100%
rename from modules/services/dunst/default.nix
rename to modules/services/dunst.nix
diff --git a/modules/services/dwm-status/default.nix b/modules/services/dwm-status.nix
similarity index 100%
rename from modules/services/dwm-status/default.nix
rename to modules/services/dwm-status.nix
diff --git a/modules/services/easyeffects/default.nix b/modules/services/easyeffects.nix
similarity index 100%
rename from modules/services/easyeffects/default.nix
rename to modules/services/easyeffects.nix
diff --git a/modules/services/emacs/default.nix b/modules/services/emacs.nix
similarity index 100%
rename from modules/services/emacs/default.nix
rename to modules/services/emacs.nix
diff --git a/modules/services/espanso/default.nix b/modules/services/espanso.nix
similarity index 100%
rename from modules/services/espanso/default.nix
rename to modules/services/espanso.nix
diff --git a/modules/services/etesync-dav/default.nix b/modules/services/etesync-dav.nix
similarity index 100%
rename from modules/services/etesync-dav/default.nix
rename to modules/services/etesync-dav.nix
diff --git a/modules/services/flameshot/default.nix b/modules/services/flameshot.nix
similarity index 100%
rename from modules/services/flameshot/default.nix
rename to modules/services/flameshot.nix
diff --git a/modules/services/fluidsynth/default.nix b/modules/services/fluidsynth.nix
similarity index 100%
rename from modules/services/fluidsynth/default.nix
rename to modules/services/fluidsynth.nix
diff --git a/modules/services/fnott/default.nix b/modules/services/fnott.nix
similarity index 100%
rename from modules/services/fnott/default.nix
rename to modules/services/fnott.nix
diff --git a/modules/services/fusuma/default.nix b/modules/services/fusuma.nix
similarity index 100%
rename from modules/services/fusuma/default.nix
rename to modules/services/fusuma.nix
diff --git a/modules/services/getmail/default.nix b/modules/services/getmail.nix
similarity index 100%
rename from modules/services/getmail/default.nix
rename to modules/services/getmail.nix
diff --git a/modules/services/git-sync/default.nix b/modules/services/git-sync.nix
similarity index 100%
rename from modules/services/git-sync/default.nix
rename to modules/services/git-sync.nix
diff --git a/modules/services/glance/default.nix b/modules/services/glance.nix
similarity index 100%
rename from modules/services/glance/default.nix
rename to modules/services/glance.nix
diff --git a/modules/services/gnome-keyring/default.nix b/modules/services/gnome-keyring.nix
similarity index 100%
rename from modules/services/gnome-keyring/default.nix
rename to modules/services/gnome-keyring.nix
diff --git a/modules/services/gpg-agent/default.nix b/modules/services/gpg-agent.nix
similarity index 100%
rename from modules/services/gpg-agent/default.nix
rename to modules/services/gpg-agent.nix
diff --git a/modules/services/grobi/default.nix b/modules/services/grobi.nix
similarity index 100%
rename from modules/services/grobi/default.nix
rename to modules/services/grobi.nix
diff --git a/modules/services/gromit-mpx/default.nix b/modules/services/gromit-mpx.nix
similarity index 100%
rename from modules/services/gromit-mpx/default.nix
rename to modules/services/gromit-mpx.nix
diff --git a/modules/services/home-manager-auto-expire/default.nix b/modules/services/home-manager-auto-expire.nix
similarity index 98%
rename from modules/services/home-manager-auto-expire/default.nix
rename to modules/services/home-manager-auto-expire.nix
index d6c5af70d..2f98d2051 100644
--- a/modules/services/home-manager-auto-expire/default.nix
+++ b/modules/services/home-manager-auto-expire.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/default.nix b/modules/services/home-manager-auto-upgrade.nix
similarity index 96%
rename from modules/services/home-manager-auto-upgrade/default.nix
rename to modules/services/home-manager-auto-upgrade.nix
index 3e88d1aac..bf5aa9ac9 100644
--- a/modules/services/home-manager-auto-upgrade/default.nix
+++ b/modules/services/home-manager-auto-upgrade.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/default.nix b/modules/services/hound.nix
similarity index 100%
rename from modules/services/hound/default.nix
rename to modules/services/hound.nix
diff --git a/modules/services/hypridle/default.nix b/modules/services/hypridle.nix
similarity index 100%
rename from modules/services/hypridle/default.nix
rename to modules/services/hypridle.nix
diff --git a/modules/services/hyprpaper/default.nix b/modules/services/hyprpaper.nix
similarity index 100%
rename from modules/services/hyprpaper/default.nix
rename to modules/services/hyprpaper.nix
diff --git a/modules/services/hyprpolkitagent/default.nix b/modules/services/hyprpolkitagent.nix
similarity index 100%
rename from modules/services/hyprpolkitagent/default.nix
rename to modules/services/hyprpolkitagent.nix
diff --git a/modules/services/hyprsunset/default.nix b/modules/services/hyprsunset.nix
similarity index 100%
rename from modules/services/hyprsunset/default.nix
rename to modules/services/hyprsunset.nix
diff --git a/modules/services/jankyborders/default.nix b/modules/services/jankyborders.nix
similarity index 100%
rename from modules/services/jankyborders/default.nix
rename to modules/services/jankyborders.nix
diff --git a/modules/services/jellyfin-mpv-shim/default.nix b/modules/services/jellyfin-mpv-shim.nix
similarity index 100%
rename from modules/services/jellyfin-mpv-shim/default.nix
rename to modules/services/jellyfin-mpv-shim.nix
diff --git a/modules/services/kanshi/default.nix b/modules/services/kanshi.nix
similarity index 100%
rename from modules/services/kanshi/default.nix
rename to modules/services/kanshi.nix
diff --git a/modules/services/kbfs/default.nix b/modules/services/kbfs.nix
similarity index 100%
rename from modules/services/kbfs/default.nix
rename to modules/services/kbfs.nix
diff --git a/modules/services/kdeconnect/default.nix b/modules/services/kdeconnect.nix
similarity index 100%
rename from modules/services/kdeconnect/default.nix
rename to modules/services/kdeconnect.nix
diff --git a/modules/services/keybase/default.nix b/modules/services/keybase.nix
similarity index 100%
rename from modules/services/keybase/default.nix
rename to modules/services/keybase.nix
diff --git a/modules/services/keynav/default.nix b/modules/services/keynav.nix
similarity index 100%
rename from modules/services/keynav/default.nix
rename to modules/services/keynav.nix
diff --git a/modules/services/librespot/default.nix b/modules/services/librespot.nix
similarity index 100%
rename from modules/services/librespot/default.nix
rename to modules/services/librespot.nix
diff --git a/modules/services/lieer/default.nix b/modules/services/lieer.nix
similarity index 100%
rename from modules/services/lieer/default.nix
rename to modules/services/lieer.nix
diff --git a/modules/services/linux-wallpaperengine/default.nix b/modules/services/linux-wallpaperengine.nix
similarity index 100%
rename from modules/services/linux-wallpaperengine/default.nix
rename to modules/services/linux-wallpaperengine.nix
diff --git a/modules/services/listenbrainz-mpd/default.nix b/modules/services/listenbrainz-mpd.nix
similarity index 100%
rename from modules/services/listenbrainz-mpd/default.nix
rename to modules/services/listenbrainz-mpd.nix
diff --git a/modules/services/lorri/default.nix b/modules/services/lorri.nix
similarity index 100%
rename from modules/services/lorri/default.nix
rename to modules/services/lorri.nix
diff --git a/modules/services/ludusavi/default.nix b/modules/services/ludusavi.nix
similarity index 100%
rename from modules/services/ludusavi/default.nix
rename to modules/services/ludusavi.nix
diff --git a/modules/services/lxqt-policykit-agent/default.nix b/modules/services/lxqt-policykit-agent.nix
similarity index 100%
rename from modules/services/lxqt-policykit-agent/default.nix
rename to modules/services/lxqt-policykit-agent.nix
diff --git a/modules/services/mako/default.nix b/modules/services/mako.nix
similarity index 100%
rename from modules/services/mako/default.nix
rename to modules/services/mako.nix
diff --git a/modules/services/mbsync/default.nix b/modules/services/mbsync.nix
similarity index 100%
rename from modules/services/mbsync/default.nix
rename to modules/services/mbsync.nix
diff --git a/modules/services/megasync/default.nix b/modules/services/megasync.nix
similarity index 100%
rename from modules/services/megasync/default.nix
rename to modules/services/megasync.nix
diff --git a/modules/services/mopidy/default.nix b/modules/services/mopidy.nix
similarity index 100%
rename from modules/services/mopidy/default.nix
rename to modules/services/mopidy.nix
diff --git a/modules/services/mpd-discord-rpc/default.nix b/modules/services/mpd-discord-rpc.nix
similarity index 100%
rename from modules/services/mpd-discord-rpc/default.nix
rename to modules/services/mpd-discord-rpc.nix
diff --git a/modules/services/mpd-mpris/default.nix b/modules/services/mpd-mpris.nix
similarity index 100%
rename from modules/services/mpd-mpris/default.nix
rename to modules/services/mpd-mpris.nix
diff --git a/modules/services/mpd/default.nix b/modules/services/mpd.nix
similarity index 100%
rename from modules/services/mpd/default.nix
rename to modules/services/mpd.nix
diff --git a/modules/services/mpdris2/default.nix b/modules/services/mpdris2.nix
similarity index 100%
rename from modules/services/mpdris2/default.nix
rename to modules/services/mpdris2.nix
diff --git a/modules/services/mpdscribble/default.nix b/modules/services/mpdscribble.nix
similarity index 100%
rename from modules/services/mpdscribble/default.nix
rename to modules/services/mpdscribble.nix
diff --git a/modules/services/mpris-proxy/default.nix b/modules/services/mpris-proxy.nix
similarity index 100%
rename from modules/services/mpris-proxy/default.nix
rename to modules/services/mpris-proxy.nix
diff --git a/modules/services/muchsync/default.nix b/modules/services/muchsync.nix
similarity index 100%
rename from modules/services/muchsync/default.nix
rename to modules/services/muchsync.nix
diff --git a/modules/services/network-manager-applet/default.nix b/modules/services/network-manager-applet.nix
similarity index 100%
rename from modules/services/network-manager-applet/default.nix
rename to modules/services/network-manager-applet.nix
diff --git a/modules/services/nextcloud-client/default.nix b/modules/services/nextcloud-client.nix
similarity index 100%
rename from modules/services/nextcloud-client/default.nix
rename to modules/services/nextcloud-client.nix
diff --git a/modules/services/nix-gc/default.nix b/modules/services/nix-gc.nix
similarity index 100%
rename from modules/services/nix-gc/default.nix
rename to modules/services/nix-gc.nix
diff --git a/modules/services/notify-osd/default.nix b/modules/services/notify-osd.nix
similarity index 100%
rename from modules/services/notify-osd/default.nix
rename to modules/services/notify-osd.nix
diff --git a/modules/services/ollama/default.nix b/modules/services/ollama.nix
similarity index 100%
rename from modules/services/ollama/default.nix
rename to modules/services/ollama.nix
diff --git a/modules/services/opensnitch-ui/default.nix b/modules/services/opensnitch-ui.nix
similarity index 100%
rename from modules/services/opensnitch-ui/default.nix
rename to modules/services/opensnitch-ui.nix
diff --git a/modules/services/osmscout-server/default.nix b/modules/services/osmscout-server.nix
similarity index 100%
rename from modules/services/osmscout-server/default.nix
rename to modules/services/osmscout-server.nix
diff --git a/modules/services/owncloud-client/default.nix b/modules/services/owncloud-client.nix
similarity index 100%
rename from modules/services/owncloud-client/default.nix
rename to modules/services/owncloud-client.nix
diff --git a/modules/services/pantalaimon/default.nix b/modules/services/pantalaimon.nix
similarity index 100%
rename from modules/services/pantalaimon/default.nix
rename to modules/services/pantalaimon.nix
diff --git a/modules/services/parcellite/default.nix b/modules/services/parcellite.nix
similarity index 100%
rename from modules/services/parcellite/default.nix
rename to modules/services/parcellite.nix
diff --git a/modules/services/pass-secret-service/default.nix b/modules/services/pass-secret-service.nix
similarity index 100%
rename from modules/services/pass-secret-service/default.nix
rename to modules/services/pass-secret-service.nix
diff --git a/modules/services/pasystray/default.nix b/modules/services/pasystray.nix
similarity index 100%
rename from modules/services/pasystray/default.nix
rename to modules/services/pasystray.nix
diff --git a/modules/services/pbgopy/default.nix b/modules/services/pbgopy.nix
similarity index 100%
rename from modules/services/pbgopy/default.nix
rename to modules/services/pbgopy.nix
diff --git a/modules/services/picom/default.nix b/modules/services/picom.nix
similarity index 100%
rename from modules/services/picom/default.nix
rename to modules/services/picom.nix
diff --git a/modules/services/plan9port/default.nix b/modules/services/plan9port.nix
similarity index 100%
rename from modules/services/plan9port/default.nix
rename to modules/services/plan9port.nix
diff --git a/modules/services/playerctld/default.nix b/modules/services/playerctld.nix
similarity index 100%
rename from modules/services/playerctld/default.nix
rename to modules/services/playerctld.nix
diff --git a/modules/services/plex-mpv-shim/default.nix b/modules/services/plex-mpv-shim.nix
similarity index 100%
rename from modules/services/plex-mpv-shim/default.nix
rename to modules/services/plex-mpv-shim.nix
diff --git a/modules/services/polkit-gnome/default.nix b/modules/services/polkit-gnome.nix
similarity index 100%
rename from modules/services/polkit-gnome/default.nix
rename to modules/services/polkit-gnome.nix
diff --git a/modules/services/polybar/default.nix b/modules/services/polybar.nix
similarity index 100%
rename from modules/services/polybar/default.nix
rename to modules/services/polybar.nix
diff --git a/modules/services/poweralertd/default.nix b/modules/services/poweralertd.nix
similarity index 100%
rename from modules/services/poweralertd/default.nix
rename to modules/services/poweralertd.nix
diff --git a/modules/services/psd/default.nix b/modules/services/psd.nix
similarity index 100%
rename from modules/services/psd/default.nix
rename to modules/services/psd.nix
diff --git a/modules/services/pueue/default.nix b/modules/services/pueue.nix
similarity index 100%
rename from modules/services/pueue/default.nix
rename to modules/services/pueue.nix
diff --git a/modules/services/pulseeffects/default.nix b/modules/services/pulseeffects.nix
similarity index 100%
rename from modules/services/pulseeffects/default.nix
rename to modules/services/pulseeffects.nix
diff --git a/modules/services/random-background/default.nix b/modules/services/random-background.nix
similarity index 100%
rename from modules/services/random-background/default.nix
rename to modules/services/random-background.nix
diff --git a/modules/services/recoll/default.nix b/modules/services/recoll.nix
similarity index 100%
rename from modules/services/recoll/default.nix
rename to modules/services/recoll.nix
diff --git a/modules/services/remmina/default.nix b/modules/services/remmina.nix
similarity index 100%
rename from modules/services/remmina/default.nix
rename to modules/services/remmina.nix
diff --git a/modules/services/restic/default.nix b/modules/services/restic.nix
similarity index 100%
rename from modules/services/restic/default.nix
rename to modules/services/restic.nix
diff --git a/modules/services/rsibreak/default.nix b/modules/services/rsibreak.nix
similarity index 100%
rename from modules/services/rsibreak/default.nix
rename to modules/services/rsibreak.nix
diff --git a/modules/services/safeeyes/default.nix b/modules/services/safeeyes.nix
similarity index 100%
rename from modules/services/safeeyes/default.nix
rename to modules/services/safeeyes.nix
diff --git a/modules/services/screen-locker/default.nix b/modules/services/screen-locker.nix
similarity index 100%
rename from modules/services/screen-locker/default.nix
rename to modules/services/screen-locker.nix
diff --git a/modules/services/sctd/default.nix b/modules/services/sctd.nix
similarity index 100%
rename from modules/services/sctd/default.nix
rename to modules/services/sctd.nix
diff --git a/modules/services/shikane/default.nix b/modules/services/shikane.nix
similarity index 100%
rename from modules/services/shikane/default.nix
rename to modules/services/shikane.nix
diff --git a/modules/services/signaturepdf/default.nix b/modules/services/signaturepdf.nix
similarity index 100%
rename from modules/services/signaturepdf/default.nix
rename to modules/services/signaturepdf.nix
diff --git a/modules/services/skhd/default.nix b/modules/services/skhd.nix
similarity index 100%
rename from modules/services/skhd/default.nix
rename to modules/services/skhd.nix
diff --git a/modules/services/snixembed/default.nix b/modules/services/snixembed.nix
similarity index 100%
rename from modules/services/snixembed/default.nix
rename to modules/services/snixembed.nix
diff --git a/modules/services/spotifyd/default.nix b/modules/services/spotifyd.nix
similarity index 100%
rename from modules/services/spotifyd/default.nix
rename to modules/services/spotifyd.nix
diff --git a/modules/services/ssh-agent/default.nix b/modules/services/ssh-agent.nix
similarity index 100%
rename from modules/services/ssh-agent/default.nix
rename to modules/services/ssh-agent.nix
diff --git a/modules/services/stalonetray/default.nix b/modules/services/stalonetray.nix
similarity index 100%
rename from modules/services/stalonetray/default.nix
rename to modules/services/stalonetray.nix
diff --git a/modules/services/status-notifier-watcher/default.nix b/modules/services/status-notifier-watcher.nix
similarity index 100%
rename from modules/services/status-notifier-watcher/default.nix
rename to modules/services/status-notifier-watcher.nix
diff --git a/modules/services/swayidle/default.nix b/modules/services/swayidle.nix
similarity index 100%
rename from modules/services/swayidle/default.nix
rename to modules/services/swayidle.nix
diff --git a/modules/services/swaync/default.nix b/modules/services/swaync.nix
similarity index 100%
rename from modules/services/swaync/default.nix
rename to modules/services/swaync.nix
diff --git a/modules/services/swayosd/default.nix b/modules/services/swayosd.nix
similarity index 100%
rename from modules/services/swayosd/default.nix
rename to modules/services/swayosd.nix
diff --git a/modules/services/swww/default.nix b/modules/services/swww.nix
similarity index 100%
rename from modules/services/swww/default.nix
rename to modules/services/swww.nix
diff --git a/modules/services/sxhkd/default.nix b/modules/services/sxhkd.nix
similarity index 100%
rename from modules/services/sxhkd/default.nix
rename to modules/services/sxhkd.nix
diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing.nix
similarity index 100%
rename from modules/services/syncthing/default.nix
rename to modules/services/syncthing.nix
diff --git a/modules/services/systembus-notify/default.nix b/modules/services/systembus-notify.nix
similarity index 100%
rename from modules/services/systembus-notify/default.nix
rename to modules/services/systembus-notify.nix
diff --git a/modules/services/taffybar/default.nix b/modules/services/taffybar.nix
similarity index 100%
rename from modules/services/taffybar/default.nix
rename to modules/services/taffybar.nix
diff --git a/modules/services/tahoe-lafs/default.nix b/modules/services/tahoe-lafs.nix
similarity index 100%
rename from modules/services/tahoe-lafs/default.nix
rename to modules/services/tahoe-lafs.nix
diff --git a/modules/services/taskwarrior-sync/default.nix b/modules/services/taskwarrior-sync.nix
similarity index 100%
rename from modules/services/taskwarrior-sync/default.nix
rename to modules/services/taskwarrior-sync.nix
diff --git a/modules/services/tldr-update/default.nix b/modules/services/tldr-update.nix
similarity index 100%
rename from modules/services/tldr-update/default.nix
rename to modules/services/tldr-update.nix
diff --git a/modules/services/trayer/default.nix b/modules/services/trayer.nix
similarity index 100%
rename from modules/services/trayer/default.nix
rename to modules/services/trayer.nix
diff --git a/modules/services/trayscale/default.nix b/modules/services/trayscale.nix
similarity index 100%
rename from modules/services/trayscale/default.nix
rename to modules/services/trayscale.nix
diff --git a/modules/services/twmn/default.nix b/modules/services/twmn.nix
similarity index 100%
rename from modules/services/twmn/default.nix
rename to modules/services/twmn.nix
diff --git a/modules/services/udiskie/default.nix b/modules/services/udiskie.nix
similarity index 100%
rename from modules/services/udiskie/default.nix
rename to modules/services/udiskie.nix
diff --git a/modules/services/unclutter/default.nix b/modules/services/unclutter.nix
similarity index 100%
rename from modules/services/unclutter/default.nix
rename to modules/services/unclutter.nix
diff --git a/modules/services/unison/default.nix b/modules/services/unison.nix
similarity index 100%
rename from modules/services/unison/default.nix
rename to modules/services/unison.nix
diff --git a/modules/services/vdirsyncer/default.nix b/modules/services/vdirsyncer.nix
similarity index 100%
rename from modules/services/vdirsyncer/default.nix
rename to modules/services/vdirsyncer.nix
diff --git a/modules/services/volnoti/default.nix b/modules/services/volnoti.nix
similarity index 100%
rename from modules/services/volnoti/default.nix
rename to modules/services/volnoti.nix
diff --git a/modules/services/way-displays/default.nix b/modules/services/way-displays.nix
similarity index 100%
rename from modules/services/way-displays/default.nix
rename to modules/services/way-displays.nix
diff --git a/modules/services/wayvnc/default.nix b/modules/services/wayvnc.nix
similarity index 100%
rename from modules/services/wayvnc/default.nix
rename to modules/services/wayvnc.nix
diff --git a/modules/services/window-managers/awesome/default.nix b/modules/services/window-managers/awesome.nix
similarity index 100%
rename from modules/services/window-managers/awesome/default.nix
rename to modules/services/window-managers/awesome.nix
diff --git a/modules/services/window-managers/default.nix b/modules/services/window-managers/default.nix
index cdb2d7a2e..43f132c02 100644
--- a/modules/services/window-managers/default.nix
+++ b/modules/services/window-managers/default.nix
@@ -1,15 +1,15 @@
 {
   imports = [
-    ./awesome
+    ./awesome.nix
     ./bspwm
-    ./fluxbox
-    ./herbstluftwm
-    ./hyprland
+    ./fluxbox.nix
+    ./herbstluftwm.nix
+    ./hyprland.nix
     ./i3-sway
     ./labwc
-    ./river
-    ./spectrwm
-    ./wayfire
-    ./xmonad
+    ./river.nix
+    ./spectrwm.nix
+    ./wayfire.nix
+    ./xmonad.nix
   ];
 }
diff --git a/modules/services/window-managers/fluxbox/default.nix b/modules/services/window-managers/fluxbox.nix
similarity index 100%
rename from modules/services/window-managers/fluxbox/default.nix
rename to modules/services/window-managers/fluxbox.nix
diff --git a/modules/services/window-managers/herbstluftwm/default.nix b/modules/services/window-managers/herbstluftwm.nix
similarity index 100%
rename from modules/services/window-managers/herbstluftwm/default.nix
rename to modules/services/window-managers/herbstluftwm.nix
diff --git a/modules/services/window-managers/hyprland/default.nix b/modules/services/window-managers/hyprland.nix
similarity index 100%
rename from modules/services/window-managers/hyprland/default.nix
rename to modules/services/window-managers/hyprland.nix
diff --git a/modules/services/window-managers/river/default.nix b/modules/services/window-managers/river.nix
similarity index 100%
rename from modules/services/window-managers/river/default.nix
rename to modules/services/window-managers/river.nix
diff --git a/modules/services/window-managers/spectrwm/default.nix b/modules/services/window-managers/spectrwm.nix
similarity index 100%
rename from modules/services/window-managers/spectrwm/default.nix
rename to modules/services/window-managers/spectrwm.nix
diff --git a/modules/services/window-managers/wayfire/default.nix b/modules/services/window-managers/wayfire.nix
similarity index 100%
rename from modules/services/window-managers/wayfire/default.nix
rename to modules/services/window-managers/wayfire.nix
diff --git a/modules/services/window-managers/xmonad/default.nix b/modules/services/window-managers/xmonad.nix
similarity index 100%
rename from modules/services/window-managers/xmonad/default.nix
rename to modules/services/window-managers/xmonad.nix
diff --git a/modules/services/wlsunset/default.nix b/modules/services/wlsunset.nix
similarity index 100%
rename from modules/services/wlsunset/default.nix
rename to modules/services/wlsunset.nix
diff --git a/modules/services/wluma/default.nix b/modules/services/wluma.nix
similarity index 100%
rename from modules/services/wluma/default.nix
rename to modules/services/wluma.nix
diff --git a/modules/services/wob/default.nix b/modules/services/wob.nix
similarity index 100%
rename from modules/services/wob/default.nix
rename to modules/services/wob.nix
diff --git a/modules/services/wpaperd/default.nix b/modules/services/wpaperd.nix
similarity index 100%
rename from modules/services/wpaperd/default.nix
rename to modules/services/wpaperd.nix
diff --git a/modules/services/xcape/default.nix b/modules/services/xcape.nix
similarity index 100%
rename from modules/services/xcape/default.nix
rename to modules/services/xcape.nix
diff --git a/modules/services/xembed-sni-proxy/default.nix b/modules/services/xembed-sni-proxy.nix
similarity index 100%
rename from modules/services/xembed-sni-proxy/default.nix
rename to modules/services/xembed-sni-proxy.nix
diff --git a/modules/services/xidlehook/default.nix b/modules/services/xidlehook.nix
similarity index 100%
rename from modules/services/xidlehook/default.nix
rename to modules/services/xidlehook.nix
diff --git a/modules/services/xscreensaver/default.nix b/modules/services/xscreensaver.nix
similarity index 100%
rename from modules/services/xscreensaver/default.nix
rename to modules/services/xscreensaver.nix
diff --git a/modules/services/xsettingsd/default.nix b/modules/services/xsettingsd.nix
similarity index 100%
rename from modules/services/xsettingsd/default.nix
rename to modules/services/xsettingsd.nix
diff --git a/modules/services/xsuspender/default.nix b/modules/services/xsuspender.nix
similarity index 100%
rename from modules/services/xsuspender/default.nix
rename to modules/services/xsuspender.nix
diff --git a/modules/services/yubikey-agent/default.nix b/modules/services/yubikey-agent.nix
similarity index 100%
rename from modules/services/yubikey-agent/default.nix
rename to modules/services/yubikey-agent.nix