From 47a79eea64a5d8d0c3f9f418f0ff916a593aa8b8 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Fri, 16 Aug 2024 13:44:44 +0200
Subject: [PATCH] modules: move tui, gui, cli to programs

---
 modules/cli/zellij.nix                        |  44 ------------------
 modules/{ => programs}/cli/beets.nix          |   0
 modules/{ => programs}/cli/default.nix        |   0
 modules/{ => programs}/cli/fish.nix           |   0
 modules/{ => programs}/cli/nh.nix             |   3 +-
 modules/{ => programs}/cli/starship.nix       |   0
 modules/{ => programs}/cli/zellij/default.nix |   0
 modules/{ => programs}/default.nix            |   0
 modules/{ => programs}/editors/default.nix    |   0
 modules/{ => programs}/editors/emacs.nix      |   0
 modules/{ => programs}/editors/helix.nix      |   0
 modules/{ => programs}/editors/kakoune.nix    |   0
 .../editors/kakoune/default.nix               |   0
 .../editors/kakoune/kak-lsp.toml              |   0
 .../editors/kakoune/kakoune.nix               |   0
 modules/{ => programs}/editors/kakoune/kakrc  |   0
 .../editors/kakoune/mappings.nix              |   0
 .../editors/kakoune/starship.toml             |   0
 .../{ => programs}/editors/nvf/default.nix    |   0
 .../editors/nvf/lua/autocmds.lua              |   0
 .../{ => programs}/editors/nvf/lua/core.lua   |   0
 .../editors/nvf/lua/display/mouse.lua         |   0
 .../editors/nvf/lua/display/numbertoggle.lua  |   0
 .../editors/nvf/lua/display/split.lua         |   0
 .../editors/nvf/lua/display/ui.lua            |   0
 modules/{ => programs}/editors/nvf/lua/ft.lua |   0
 .../editors/nvf/lua/misc/abbrev.lua           |   0
 .../editors/nvf/lua/misc/autoread.lua         |   0
 .../editors/nvf/lua/misc/declutter.lua        |   0
 .../editors/nvf/lua/misc/diagnostics.lua      |   0
 .../editors/nvf/lua/misc/handlers.lua         |   0
 .../editors/nvf/lua/misc/neovide.lua          |   0
 .../editors/nvf/lua/misc/vscode.lua           |   0
 .../editors/nvf/lua/plugins/notify.lua        |   0
 .../editors/nvf/mappings/insert.nix           |   0
 .../editors/nvf/mappings/normal.nix           |   0
 .../editors/nvf/mappings/select.nix           |   0
 .../editors/nvf/mappings/terminal.nix         |   0
 .../editors/nvf/plugins/extra.nix             |   0
 .../nvf/plugins/settings/assistant.nix        |   0
 .../nvf/plugins/settings/autocomplete.nix     |   0
 .../nvf/plugins/settings/autopairs.nix        |   0
 .../editors/nvf/plugins/settings/binds.nix    |   0
 .../editors/nvf/plugins/settings/comments.nix |   0
 .../nvf/plugins/settings/dashboard.nix        |   0
 .../editors/nvf/plugins/settings/debugger.nix |   0
 .../editors/nvf/plugins/settings/filetree.nix |   0
 .../editors/nvf/plugins/settings/gestures.nix |   0
 .../editors/nvf/plugins/settings/git.nix      |   0
 .../nvf/plugins/settings/languages.nix        |   0
 .../editors/nvf/plugins/settings/lsp.nix      |   0
 .../editors/nvf/plugins/settings/minimap.nix  |   0
 .../editors/nvf/plugins/settings/notes.nix    |   0
 .../editors/nvf/plugins/settings/notify.nix   |   0
 .../editors/nvf/plugins/settings/presence.nix |   0
 .../editors/nvf/plugins/settings/projects.nix |   0
 .../editors/nvf/plugins/settings/session.nix  |   0
 .../nvf/plugins/settings/statusline.nix       |   0
 .../editors/nvf/plugins/settings/tabline.nix  |   0
 .../nvf/plugins/settings/telescope.nix        |   0
 .../editors/nvf/plugins/settings/template.nix |   0
 .../editors/nvf/plugins/settings/terminal.nix |   0
 .../editors/nvf/plugins/settings/theme.nix    |   0
 .../nvf/plugins/settings/treesitter.nix       |   0
 .../editors/nvf/plugins/settings/ui.nix       |   0
 .../editors/nvf/plugins/settings/utility.nix  |   0
 .../editors/nvf/plugins/settings/visuals.nix  |   0
 .../nvf/runtime/after/ftdetect/gitconfig.lua  |   0
 .../nvf/runtime/after/ftdetect/graphql.lua    |   0
 .../nvf/runtime/after/ftplugin/envrc.lua      |   0
 .../nvf/runtime/after/ftplugin/gitcommit.lua  |   0
 .../editors/nvf/runtime/after/ftplugin/go.lua |   0
 .../nvf/runtime/after/ftplugin/json.lua       |   0
 .../nvf/runtime/after/ftplugin/man.lua        |   0
 .../nvf/runtime/after/ftplugin/markdown.lua   |   0
 .../editors/nvf/runtime/after/ftplugin/qf.lua |   0
 .../nvf/runtime/after/ftplugin/xml.lua        |   0
 .../runtime/after/queries/go/injections.scm   |   0
 .../runtime/after/queries/jsx/injections.scm  |   0
 .../after/queries/markdown/textobjects.scm    |   0
 .../queries/markdown_inline/highlights.scm    |   0
 .../runtime/after/queries/mdx/injections.scm  |   0
 .../runtime/after/queries/rust/injections.scm |   0
 .../after/queries/typst/highlights.scm        |   0
 .../editors/nvf/runtime/spell/de.utf-8.spl    | Bin
 .../editors/nvf/runtime/spell/en.utf-8.add    |   0
 .../nvf/runtime/spell/en.utf-8.add.spl        | Bin
 .../{ => programs}/editors/nvf/settings.nix   |   0
 modules/{ => programs}/gui/default.nix        |   0
 modules/{ => programs}/gui/foot.nix           |   0
 modules/{ => programs}/gui/minecraft.nix      |   0
 modules/{ => programs}/gui/mpv.nix            |   0
 modules/{ => programs}/gui/schizofox.nix      |   0
 modules/{ => programs}/gui/spicetify.nix      |   0
 modules/{ => programs}/gui/steam.nix          |   0
 modules/{ => programs}/gui/vesktop.nix        |   0
 modules/{ => programs}/gui/vivado.nix         |   0
 modules/{ => programs}/gui/waybar.nix         |   0
 modules/{ => programs}/gui/zathura.nix        |   0
 modules/{ => programs}/tui/btop.nix           |   2 +-
 modules/{ => programs}/tui/default.nix        |   0
 modules/{ => programs}/tui/ncmpcpp.nix        |   0
 modules/{ => programs}/tui/newsboat.nix       |   0
 modules/{ => programs}/tui/wtfutil.nix        |   0
 modules/{ => programs}/tui/yazi.nix           |   0
 modules/runners/anyrun/anyrun.nix             |   1 -
 106 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 modules/cli/zellij.nix
 rename modules/{ => programs}/cli/beets.nix (100%)
 rename modules/{ => programs}/cli/default.nix (100%)
 rename modules/{ => programs}/cli/fish.nix (100%)
 rename modules/{ => programs}/cli/nh.nix (75%)
 rename modules/{ => programs}/cli/starship.nix (100%)
 rename modules/{ => programs}/cli/zellij/default.nix (100%)
 rename modules/{ => programs}/default.nix (100%)
 rename modules/{ => programs}/editors/default.nix (100%)
 rename modules/{ => programs}/editors/emacs.nix (100%)
 rename modules/{ => programs}/editors/helix.nix (100%)
 rename modules/{ => programs}/editors/kakoune.nix (100%)
 rename modules/{ => programs}/editors/kakoune/default.nix (100%)
 rename modules/{ => programs}/editors/kakoune/kak-lsp.toml (100%)
 rename modules/{ => programs}/editors/kakoune/kakoune.nix (100%)
 rename modules/{ => programs}/editors/kakoune/kakrc (100%)
 rename modules/{ => programs}/editors/kakoune/mappings.nix (100%)
 rename modules/{ => programs}/editors/kakoune/starship.toml (100%)
 rename modules/{ => programs}/editors/nvf/default.nix (100%)
 rename modules/{ => programs}/editors/nvf/lua/autocmds.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/core.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/display/mouse.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/display/numbertoggle.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/display/split.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/display/ui.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/ft.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/abbrev.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/autoread.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/declutter.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/diagnostics.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/handlers.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/neovide.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/misc/vscode.lua (100%)
 rename modules/{ => programs}/editors/nvf/lua/plugins/notify.lua (100%)
 rename modules/{ => programs}/editors/nvf/mappings/insert.nix (100%)
 rename modules/{ => programs}/editors/nvf/mappings/normal.nix (100%)
 rename modules/{ => programs}/editors/nvf/mappings/select.nix (100%)
 rename modules/{ => programs}/editors/nvf/mappings/terminal.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/extra.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/assistant.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/autocomplete.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/autopairs.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/binds.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/comments.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/dashboard.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/debugger.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/filetree.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/gestures.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/git.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/languages.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/lsp.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/minimap.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/notes.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/notify.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/presence.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/projects.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/session.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/statusline.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/tabline.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/telescope.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/template.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/terminal.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/theme.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/treesitter.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/ui.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/utility.nix (100%)
 rename modules/{ => programs}/editors/nvf/plugins/settings/visuals.nix (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftdetect/gitconfig.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftdetect/graphql.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/envrc.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/gitcommit.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/go.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/json.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/man.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/markdown.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/qf.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/ftplugin/xml.lua (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/go/injections.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/jsx/injections.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/markdown/textobjects.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/markdown_inline/highlights.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/mdx/injections.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/rust/injections.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/after/queries/typst/highlights.scm (100%)
 rename modules/{ => programs}/editors/nvf/runtime/spell/de.utf-8.spl (100%)
 rename modules/{ => programs}/editors/nvf/runtime/spell/en.utf-8.add (100%)
 rename modules/{ => programs}/editors/nvf/runtime/spell/en.utf-8.add.spl (100%)
 rename modules/{ => programs}/editors/nvf/settings.nix (100%)
 rename modules/{ => programs}/gui/default.nix (100%)
 rename modules/{ => programs}/gui/foot.nix (100%)
 rename modules/{ => programs}/gui/minecraft.nix (100%)
 rename modules/{ => programs}/gui/mpv.nix (100%)
 rename modules/{ => programs}/gui/schizofox.nix (100%)
 rename modules/{ => programs}/gui/spicetify.nix (100%)
 rename modules/{ => programs}/gui/steam.nix (100%)
 rename modules/{ => programs}/gui/vesktop.nix (100%)
 rename modules/{ => programs}/gui/vivado.nix (100%)
 rename modules/{ => programs}/gui/waybar.nix (100%)
 rename modules/{ => programs}/gui/zathura.nix (100%)
 rename modules/{ => programs}/tui/btop.nix (92%)
 rename modules/{ => programs}/tui/default.nix (100%)
 rename modules/{ => programs}/tui/ncmpcpp.nix (100%)
 rename modules/{ => programs}/tui/newsboat.nix (100%)
 rename modules/{ => programs}/tui/wtfutil.nix (100%)
 rename modules/{ => programs}/tui/yazi.nix (100%)

diff --git a/modules/cli/zellij.nix b/modules/cli/zellij.nix
deleted file mode 100644
index a43a555..0000000
--- a/modules/cli/zellij.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (config.modules.other.system) username;
-  cfg = config.modules.system.programs.zellij;
-  inherit (lib) mkIf;
-in {
-  config = mkIf cfg.enable {
-    home-manager.users.${username} = {
-      programs.zellij = {
-        enable = true;
-        enableFishIntegration = true;
-        on_force_close = "quit";
-        layout_dir = "${./layouts}";
-        settings = {
-          pane_frames = false;
-          default_layout = "compact";
-          ui = {
-            pane_frames = {
-              hide_session_name = true;
-              rounded.corners = true;
-            };
-          };
-
-          plugins = {
-            tab-bar.path = "tab-bar";
-            status-bar.path = "status-bar";
-            strider.path = "strider";
-            compact-bar.path = "compact-bar";
-          };
-
-          keybinds = {
-            unbind = "Ctrl n";
-            # resize = {
-              # bind = "Ctrl n";
-            # };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/cli/beets.nix b/modules/programs/cli/beets.nix
similarity index 100%
rename from modules/cli/beets.nix
rename to modules/programs/cli/beets.nix
diff --git a/modules/cli/default.nix b/modules/programs/cli/default.nix
similarity index 100%
rename from modules/cli/default.nix
rename to modules/programs/cli/default.nix
diff --git a/modules/cli/fish.nix b/modules/programs/cli/fish.nix
similarity index 100%
rename from modules/cli/fish.nix
rename to modules/programs/cli/fish.nix
diff --git a/modules/cli/nh.nix b/modules/programs/cli/nh.nix
similarity index 75%
rename from modules/cli/nh.nix
rename to modules/programs/cli/nh.nix
index c82d11e..afd2b08 100644
--- a/modules/cli/nh.nix
+++ b/modules/programs/cli/nh.nix
@@ -5,6 +5,7 @@
 }:
 with lib; let
   cfg = config.modules.programs.nh;
+  inherit (config.modules.other.system) username;
 in {
   options.modules.programs.nh.enable = mkEnableOption "nh";
 
@@ -13,7 +14,7 @@ in {
       enable = true;
       clean.enable = true;
       clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "/home/vali/projects/nichts";
+      flake = "/home/${username}/projects/nichts";
     };
   };
 }
diff --git a/modules/cli/starship.nix b/modules/programs/cli/starship.nix
similarity index 100%
rename from modules/cli/starship.nix
rename to modules/programs/cli/starship.nix
diff --git a/modules/cli/zellij/default.nix b/modules/programs/cli/zellij/default.nix
similarity index 100%
rename from modules/cli/zellij/default.nix
rename to modules/programs/cli/zellij/default.nix
diff --git a/modules/default.nix b/modules/programs/default.nix
similarity index 100%
rename from modules/default.nix
rename to modules/programs/default.nix
diff --git a/modules/editors/default.nix b/modules/programs/editors/default.nix
similarity index 100%
rename from modules/editors/default.nix
rename to modules/programs/editors/default.nix
diff --git a/modules/editors/emacs.nix b/modules/programs/editors/emacs.nix
similarity index 100%
rename from modules/editors/emacs.nix
rename to modules/programs/editors/emacs.nix
diff --git a/modules/editors/helix.nix b/modules/programs/editors/helix.nix
similarity index 100%
rename from modules/editors/helix.nix
rename to modules/programs/editors/helix.nix
diff --git a/modules/editors/kakoune.nix b/modules/programs/editors/kakoune.nix
similarity index 100%
rename from modules/editors/kakoune.nix
rename to modules/programs/editors/kakoune.nix
diff --git a/modules/editors/kakoune/default.nix b/modules/programs/editors/kakoune/default.nix
similarity index 100%
rename from modules/editors/kakoune/default.nix
rename to modules/programs/editors/kakoune/default.nix
diff --git a/modules/editors/kakoune/kak-lsp.toml b/modules/programs/editors/kakoune/kak-lsp.toml
similarity index 100%
rename from modules/editors/kakoune/kak-lsp.toml
rename to modules/programs/editors/kakoune/kak-lsp.toml
diff --git a/modules/editors/kakoune/kakoune.nix b/modules/programs/editors/kakoune/kakoune.nix
similarity index 100%
rename from modules/editors/kakoune/kakoune.nix
rename to modules/programs/editors/kakoune/kakoune.nix
diff --git a/modules/editors/kakoune/kakrc b/modules/programs/editors/kakoune/kakrc
similarity index 100%
rename from modules/editors/kakoune/kakrc
rename to modules/programs/editors/kakoune/kakrc
diff --git a/modules/editors/kakoune/mappings.nix b/modules/programs/editors/kakoune/mappings.nix
similarity index 100%
rename from modules/editors/kakoune/mappings.nix
rename to modules/programs/editors/kakoune/mappings.nix
diff --git a/modules/editors/kakoune/starship.toml b/modules/programs/editors/kakoune/starship.toml
similarity index 100%
rename from modules/editors/kakoune/starship.toml
rename to modules/programs/editors/kakoune/starship.toml
diff --git a/modules/editors/nvf/default.nix b/modules/programs/editors/nvf/default.nix
similarity index 100%
rename from modules/editors/nvf/default.nix
rename to modules/programs/editors/nvf/default.nix
diff --git a/modules/editors/nvf/lua/autocmds.lua b/modules/programs/editors/nvf/lua/autocmds.lua
similarity index 100%
rename from modules/editors/nvf/lua/autocmds.lua
rename to modules/programs/editors/nvf/lua/autocmds.lua
diff --git a/modules/editors/nvf/lua/core.lua b/modules/programs/editors/nvf/lua/core.lua
similarity index 100%
rename from modules/editors/nvf/lua/core.lua
rename to modules/programs/editors/nvf/lua/core.lua
diff --git a/modules/editors/nvf/lua/display/mouse.lua b/modules/programs/editors/nvf/lua/display/mouse.lua
similarity index 100%
rename from modules/editors/nvf/lua/display/mouse.lua
rename to modules/programs/editors/nvf/lua/display/mouse.lua
diff --git a/modules/editors/nvf/lua/display/numbertoggle.lua b/modules/programs/editors/nvf/lua/display/numbertoggle.lua
similarity index 100%
rename from modules/editors/nvf/lua/display/numbertoggle.lua
rename to modules/programs/editors/nvf/lua/display/numbertoggle.lua
diff --git a/modules/editors/nvf/lua/display/split.lua b/modules/programs/editors/nvf/lua/display/split.lua
similarity index 100%
rename from modules/editors/nvf/lua/display/split.lua
rename to modules/programs/editors/nvf/lua/display/split.lua
diff --git a/modules/editors/nvf/lua/display/ui.lua b/modules/programs/editors/nvf/lua/display/ui.lua
similarity index 100%
rename from modules/editors/nvf/lua/display/ui.lua
rename to modules/programs/editors/nvf/lua/display/ui.lua
diff --git a/modules/editors/nvf/lua/ft.lua b/modules/programs/editors/nvf/lua/ft.lua
similarity index 100%
rename from modules/editors/nvf/lua/ft.lua
rename to modules/programs/editors/nvf/lua/ft.lua
diff --git a/modules/editors/nvf/lua/misc/abbrev.lua b/modules/programs/editors/nvf/lua/misc/abbrev.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/abbrev.lua
rename to modules/programs/editors/nvf/lua/misc/abbrev.lua
diff --git a/modules/editors/nvf/lua/misc/autoread.lua b/modules/programs/editors/nvf/lua/misc/autoread.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/autoread.lua
rename to modules/programs/editors/nvf/lua/misc/autoread.lua
diff --git a/modules/editors/nvf/lua/misc/declutter.lua b/modules/programs/editors/nvf/lua/misc/declutter.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/declutter.lua
rename to modules/programs/editors/nvf/lua/misc/declutter.lua
diff --git a/modules/editors/nvf/lua/misc/diagnostics.lua b/modules/programs/editors/nvf/lua/misc/diagnostics.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/diagnostics.lua
rename to modules/programs/editors/nvf/lua/misc/diagnostics.lua
diff --git a/modules/editors/nvf/lua/misc/handlers.lua b/modules/programs/editors/nvf/lua/misc/handlers.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/handlers.lua
rename to modules/programs/editors/nvf/lua/misc/handlers.lua
diff --git a/modules/editors/nvf/lua/misc/neovide.lua b/modules/programs/editors/nvf/lua/misc/neovide.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/neovide.lua
rename to modules/programs/editors/nvf/lua/misc/neovide.lua
diff --git a/modules/editors/nvf/lua/misc/vscode.lua b/modules/programs/editors/nvf/lua/misc/vscode.lua
similarity index 100%
rename from modules/editors/nvf/lua/misc/vscode.lua
rename to modules/programs/editors/nvf/lua/misc/vscode.lua
diff --git a/modules/editors/nvf/lua/plugins/notify.lua b/modules/programs/editors/nvf/lua/plugins/notify.lua
similarity index 100%
rename from modules/editors/nvf/lua/plugins/notify.lua
rename to modules/programs/editors/nvf/lua/plugins/notify.lua
diff --git a/modules/editors/nvf/mappings/insert.nix b/modules/programs/editors/nvf/mappings/insert.nix
similarity index 100%
rename from modules/editors/nvf/mappings/insert.nix
rename to modules/programs/editors/nvf/mappings/insert.nix
diff --git a/modules/editors/nvf/mappings/normal.nix b/modules/programs/editors/nvf/mappings/normal.nix
similarity index 100%
rename from modules/editors/nvf/mappings/normal.nix
rename to modules/programs/editors/nvf/mappings/normal.nix
diff --git a/modules/editors/nvf/mappings/select.nix b/modules/programs/editors/nvf/mappings/select.nix
similarity index 100%
rename from modules/editors/nvf/mappings/select.nix
rename to modules/programs/editors/nvf/mappings/select.nix
diff --git a/modules/editors/nvf/mappings/terminal.nix b/modules/programs/editors/nvf/mappings/terminal.nix
similarity index 100%
rename from modules/editors/nvf/mappings/terminal.nix
rename to modules/programs/editors/nvf/mappings/terminal.nix
diff --git a/modules/editors/nvf/plugins/extra.nix b/modules/programs/editors/nvf/plugins/extra.nix
similarity index 100%
rename from modules/editors/nvf/plugins/extra.nix
rename to modules/programs/editors/nvf/plugins/extra.nix
diff --git a/modules/editors/nvf/plugins/settings/assistant.nix b/modules/programs/editors/nvf/plugins/settings/assistant.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/assistant.nix
rename to modules/programs/editors/nvf/plugins/settings/assistant.nix
diff --git a/modules/editors/nvf/plugins/settings/autocomplete.nix b/modules/programs/editors/nvf/plugins/settings/autocomplete.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/autocomplete.nix
rename to modules/programs/editors/nvf/plugins/settings/autocomplete.nix
diff --git a/modules/editors/nvf/plugins/settings/autopairs.nix b/modules/programs/editors/nvf/plugins/settings/autopairs.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/autopairs.nix
rename to modules/programs/editors/nvf/plugins/settings/autopairs.nix
diff --git a/modules/editors/nvf/plugins/settings/binds.nix b/modules/programs/editors/nvf/plugins/settings/binds.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/binds.nix
rename to modules/programs/editors/nvf/plugins/settings/binds.nix
diff --git a/modules/editors/nvf/plugins/settings/comments.nix b/modules/programs/editors/nvf/plugins/settings/comments.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/comments.nix
rename to modules/programs/editors/nvf/plugins/settings/comments.nix
diff --git a/modules/editors/nvf/plugins/settings/dashboard.nix b/modules/programs/editors/nvf/plugins/settings/dashboard.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/dashboard.nix
rename to modules/programs/editors/nvf/plugins/settings/dashboard.nix
diff --git a/modules/editors/nvf/plugins/settings/debugger.nix b/modules/programs/editors/nvf/plugins/settings/debugger.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/debugger.nix
rename to modules/programs/editors/nvf/plugins/settings/debugger.nix
diff --git a/modules/editors/nvf/plugins/settings/filetree.nix b/modules/programs/editors/nvf/plugins/settings/filetree.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/filetree.nix
rename to modules/programs/editors/nvf/plugins/settings/filetree.nix
diff --git a/modules/editors/nvf/plugins/settings/gestures.nix b/modules/programs/editors/nvf/plugins/settings/gestures.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/gestures.nix
rename to modules/programs/editors/nvf/plugins/settings/gestures.nix
diff --git a/modules/editors/nvf/plugins/settings/git.nix b/modules/programs/editors/nvf/plugins/settings/git.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/git.nix
rename to modules/programs/editors/nvf/plugins/settings/git.nix
diff --git a/modules/editors/nvf/plugins/settings/languages.nix b/modules/programs/editors/nvf/plugins/settings/languages.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/languages.nix
rename to modules/programs/editors/nvf/plugins/settings/languages.nix
diff --git a/modules/editors/nvf/plugins/settings/lsp.nix b/modules/programs/editors/nvf/plugins/settings/lsp.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/lsp.nix
rename to modules/programs/editors/nvf/plugins/settings/lsp.nix
diff --git a/modules/editors/nvf/plugins/settings/minimap.nix b/modules/programs/editors/nvf/plugins/settings/minimap.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/minimap.nix
rename to modules/programs/editors/nvf/plugins/settings/minimap.nix
diff --git a/modules/editors/nvf/plugins/settings/notes.nix b/modules/programs/editors/nvf/plugins/settings/notes.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/notes.nix
rename to modules/programs/editors/nvf/plugins/settings/notes.nix
diff --git a/modules/editors/nvf/plugins/settings/notify.nix b/modules/programs/editors/nvf/plugins/settings/notify.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/notify.nix
rename to modules/programs/editors/nvf/plugins/settings/notify.nix
diff --git a/modules/editors/nvf/plugins/settings/presence.nix b/modules/programs/editors/nvf/plugins/settings/presence.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/presence.nix
rename to modules/programs/editors/nvf/plugins/settings/presence.nix
diff --git a/modules/editors/nvf/plugins/settings/projects.nix b/modules/programs/editors/nvf/plugins/settings/projects.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/projects.nix
rename to modules/programs/editors/nvf/plugins/settings/projects.nix
diff --git a/modules/editors/nvf/plugins/settings/session.nix b/modules/programs/editors/nvf/plugins/settings/session.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/session.nix
rename to modules/programs/editors/nvf/plugins/settings/session.nix
diff --git a/modules/editors/nvf/plugins/settings/statusline.nix b/modules/programs/editors/nvf/plugins/settings/statusline.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/statusline.nix
rename to modules/programs/editors/nvf/plugins/settings/statusline.nix
diff --git a/modules/editors/nvf/plugins/settings/tabline.nix b/modules/programs/editors/nvf/plugins/settings/tabline.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/tabline.nix
rename to modules/programs/editors/nvf/plugins/settings/tabline.nix
diff --git a/modules/editors/nvf/plugins/settings/telescope.nix b/modules/programs/editors/nvf/plugins/settings/telescope.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/telescope.nix
rename to modules/programs/editors/nvf/plugins/settings/telescope.nix
diff --git a/modules/editors/nvf/plugins/settings/template.nix b/modules/programs/editors/nvf/plugins/settings/template.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/template.nix
rename to modules/programs/editors/nvf/plugins/settings/template.nix
diff --git a/modules/editors/nvf/plugins/settings/terminal.nix b/modules/programs/editors/nvf/plugins/settings/terminal.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/terminal.nix
rename to modules/programs/editors/nvf/plugins/settings/terminal.nix
diff --git a/modules/editors/nvf/plugins/settings/theme.nix b/modules/programs/editors/nvf/plugins/settings/theme.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/theme.nix
rename to modules/programs/editors/nvf/plugins/settings/theme.nix
diff --git a/modules/editors/nvf/plugins/settings/treesitter.nix b/modules/programs/editors/nvf/plugins/settings/treesitter.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/treesitter.nix
rename to modules/programs/editors/nvf/plugins/settings/treesitter.nix
diff --git a/modules/editors/nvf/plugins/settings/ui.nix b/modules/programs/editors/nvf/plugins/settings/ui.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/ui.nix
rename to modules/programs/editors/nvf/plugins/settings/ui.nix
diff --git a/modules/editors/nvf/plugins/settings/utility.nix b/modules/programs/editors/nvf/plugins/settings/utility.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/utility.nix
rename to modules/programs/editors/nvf/plugins/settings/utility.nix
diff --git a/modules/editors/nvf/plugins/settings/visuals.nix b/modules/programs/editors/nvf/plugins/settings/visuals.nix
similarity index 100%
rename from modules/editors/nvf/plugins/settings/visuals.nix
rename to modules/programs/editors/nvf/plugins/settings/visuals.nix
diff --git a/modules/editors/nvf/runtime/after/ftdetect/gitconfig.lua b/modules/programs/editors/nvf/runtime/after/ftdetect/gitconfig.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftdetect/gitconfig.lua
rename to modules/programs/editors/nvf/runtime/after/ftdetect/gitconfig.lua
diff --git a/modules/editors/nvf/runtime/after/ftdetect/graphql.lua b/modules/programs/editors/nvf/runtime/after/ftdetect/graphql.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftdetect/graphql.lua
rename to modules/programs/editors/nvf/runtime/after/ftdetect/graphql.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/envrc.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/envrc.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/envrc.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/envrc.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/gitcommit.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/gitcommit.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/gitcommit.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/gitcommit.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/go.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/go.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/go.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/go.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/json.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/json.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/json.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/json.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/man.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/man.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/man.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/man.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/markdown.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/markdown.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/markdown.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/markdown.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/qf.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/qf.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/qf.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/qf.lua
diff --git a/modules/editors/nvf/runtime/after/ftplugin/xml.lua b/modules/programs/editors/nvf/runtime/after/ftplugin/xml.lua
similarity index 100%
rename from modules/editors/nvf/runtime/after/ftplugin/xml.lua
rename to modules/programs/editors/nvf/runtime/after/ftplugin/xml.lua
diff --git a/modules/editors/nvf/runtime/after/queries/go/injections.scm b/modules/programs/editors/nvf/runtime/after/queries/go/injections.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/go/injections.scm
rename to modules/programs/editors/nvf/runtime/after/queries/go/injections.scm
diff --git a/modules/editors/nvf/runtime/after/queries/jsx/injections.scm b/modules/programs/editors/nvf/runtime/after/queries/jsx/injections.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/jsx/injections.scm
rename to modules/programs/editors/nvf/runtime/after/queries/jsx/injections.scm
diff --git a/modules/editors/nvf/runtime/after/queries/markdown/textobjects.scm b/modules/programs/editors/nvf/runtime/after/queries/markdown/textobjects.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/markdown/textobjects.scm
rename to modules/programs/editors/nvf/runtime/after/queries/markdown/textobjects.scm
diff --git a/modules/editors/nvf/runtime/after/queries/markdown_inline/highlights.scm b/modules/programs/editors/nvf/runtime/after/queries/markdown_inline/highlights.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/markdown_inline/highlights.scm
rename to modules/programs/editors/nvf/runtime/after/queries/markdown_inline/highlights.scm
diff --git a/modules/editors/nvf/runtime/after/queries/mdx/injections.scm b/modules/programs/editors/nvf/runtime/after/queries/mdx/injections.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/mdx/injections.scm
rename to modules/programs/editors/nvf/runtime/after/queries/mdx/injections.scm
diff --git a/modules/editors/nvf/runtime/after/queries/rust/injections.scm b/modules/programs/editors/nvf/runtime/after/queries/rust/injections.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/rust/injections.scm
rename to modules/programs/editors/nvf/runtime/after/queries/rust/injections.scm
diff --git a/modules/editors/nvf/runtime/after/queries/typst/highlights.scm b/modules/programs/editors/nvf/runtime/after/queries/typst/highlights.scm
similarity index 100%
rename from modules/editors/nvf/runtime/after/queries/typst/highlights.scm
rename to modules/programs/editors/nvf/runtime/after/queries/typst/highlights.scm
diff --git a/modules/editors/nvf/runtime/spell/de.utf-8.spl b/modules/programs/editors/nvf/runtime/spell/de.utf-8.spl
similarity index 100%
rename from modules/editors/nvf/runtime/spell/de.utf-8.spl
rename to modules/programs/editors/nvf/runtime/spell/de.utf-8.spl
diff --git a/modules/editors/nvf/runtime/spell/en.utf-8.add b/modules/programs/editors/nvf/runtime/spell/en.utf-8.add
similarity index 100%
rename from modules/editors/nvf/runtime/spell/en.utf-8.add
rename to modules/programs/editors/nvf/runtime/spell/en.utf-8.add
diff --git a/modules/editors/nvf/runtime/spell/en.utf-8.add.spl b/modules/programs/editors/nvf/runtime/spell/en.utf-8.add.spl
similarity index 100%
rename from modules/editors/nvf/runtime/spell/en.utf-8.add.spl
rename to modules/programs/editors/nvf/runtime/spell/en.utf-8.add.spl
diff --git a/modules/editors/nvf/settings.nix b/modules/programs/editors/nvf/settings.nix
similarity index 100%
rename from modules/editors/nvf/settings.nix
rename to modules/programs/editors/nvf/settings.nix
diff --git a/modules/gui/default.nix b/modules/programs/gui/default.nix
similarity index 100%
rename from modules/gui/default.nix
rename to modules/programs/gui/default.nix
diff --git a/modules/gui/foot.nix b/modules/programs/gui/foot.nix
similarity index 100%
rename from modules/gui/foot.nix
rename to modules/programs/gui/foot.nix
diff --git a/modules/gui/minecraft.nix b/modules/programs/gui/minecraft.nix
similarity index 100%
rename from modules/gui/minecraft.nix
rename to modules/programs/gui/minecraft.nix
diff --git a/modules/gui/mpv.nix b/modules/programs/gui/mpv.nix
similarity index 100%
rename from modules/gui/mpv.nix
rename to modules/programs/gui/mpv.nix
diff --git a/modules/gui/schizofox.nix b/modules/programs/gui/schizofox.nix
similarity index 100%
rename from modules/gui/schizofox.nix
rename to modules/programs/gui/schizofox.nix
diff --git a/modules/gui/spicetify.nix b/modules/programs/gui/spicetify.nix
similarity index 100%
rename from modules/gui/spicetify.nix
rename to modules/programs/gui/spicetify.nix
diff --git a/modules/gui/steam.nix b/modules/programs/gui/steam.nix
similarity index 100%
rename from modules/gui/steam.nix
rename to modules/programs/gui/steam.nix
diff --git a/modules/gui/vesktop.nix b/modules/programs/gui/vesktop.nix
similarity index 100%
rename from modules/gui/vesktop.nix
rename to modules/programs/gui/vesktop.nix
diff --git a/modules/gui/vivado.nix b/modules/programs/gui/vivado.nix
similarity index 100%
rename from modules/gui/vivado.nix
rename to modules/programs/gui/vivado.nix
diff --git a/modules/gui/waybar.nix b/modules/programs/gui/waybar.nix
similarity index 100%
rename from modules/gui/waybar.nix
rename to modules/programs/gui/waybar.nix
diff --git a/modules/gui/zathura.nix b/modules/programs/gui/zathura.nix
similarity index 100%
rename from modules/gui/zathura.nix
rename to modules/programs/gui/zathura.nix
diff --git a/modules/tui/btop.nix b/modules/programs/tui/btop.nix
similarity index 92%
rename from modules/tui/btop.nix
rename to modules/programs/tui/btop.nix
index 41a09b7..7016159 100644
--- a/modules/tui/btop.nix
+++ b/modules/programs/tui/btop.nix
@@ -5,7 +5,7 @@
 }:
 with lib; let
   cfg = config.modules.programs.btop;
-  username = config.modules.other.system.username;
+  inherit (config.modules.other.system) username;
 in {
   options.modules.programs.btop.enable = mkEnableOption "btop";
 
diff --git a/modules/tui/default.nix b/modules/programs/tui/default.nix
similarity index 100%
rename from modules/tui/default.nix
rename to modules/programs/tui/default.nix
diff --git a/modules/tui/ncmpcpp.nix b/modules/programs/tui/ncmpcpp.nix
similarity index 100%
rename from modules/tui/ncmpcpp.nix
rename to modules/programs/tui/ncmpcpp.nix
diff --git a/modules/tui/newsboat.nix b/modules/programs/tui/newsboat.nix
similarity index 100%
rename from modules/tui/newsboat.nix
rename to modules/programs/tui/newsboat.nix
diff --git a/modules/tui/wtfutil.nix b/modules/programs/tui/wtfutil.nix
similarity index 100%
rename from modules/tui/wtfutil.nix
rename to modules/programs/tui/wtfutil.nix
diff --git a/modules/tui/yazi.nix b/modules/programs/tui/yazi.nix
similarity index 100%
rename from modules/tui/yazi.nix
rename to modules/programs/tui/yazi.nix
diff --git a/modules/runners/anyrun/anyrun.nix b/modules/runners/anyrun/anyrun.nix
index e620aaf..de6dc46 100644
--- a/modules/runners/anyrun/anyrun.nix
+++ b/modules/runners/anyrun/anyrun.nix
@@ -49,7 +49,6 @@ in {
                 engines: [DuckDuckGo]
             )
           '';
-
         };
       };
     };