diff --git a/.sops.yaml b/.sops.yaml index 5702ab68d..ace490072 100755 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,7 @@ keys: - &isabel age1882yv8el2gg07yfzsd0ul46qpvarn39g45za8uxx03v2ww56vdyqa37qcp creation_rules: - - path_regex: modules/common/secrets/[^/]+\.yaml$ + - path_regex: modules/base/common/secrets/[^/]+\.yaml$ - key_groups: - age: - *isabel diff --git a/home/isabel/programs/cli/default.nix b/home/isabel/programs/cli/default.nix index 42a903758..befd2c7aa 100644 --- a/home/isabel/programs/cli/default.nix +++ b/home/isabel/programs/cli/default.nix @@ -1,7 +1,5 @@ _: { imports = [ - ./confs - ./shared.nix ./desktop.nix ./wayland.nix diff --git a/home/isabel/programs/cli/desktop.nix b/home/isabel/programs/cli/desktop.nix index 2ac5229dd..22f91e53a 100644 --- a/home/isabel/programs/cli/desktop.nix +++ b/home/isabel/programs/cli/desktop.nix @@ -2,17 +2,24 @@ osConfig, lib, pkgs, + inputs', ... }: let - inherit (lib) mkIf isAcceptedDevice; + inherit (lib) mkIf isAcceptedDevice optionals; acceptedTypes = ["desktop" "laptop" "lite" "hybrid"]; + + cfg = osConfig.modules.programs; in { - config = mkIf ((isAcceptedDevice osConfig acceptedTypes) && osConfig.modules.programs.cli.enable) { - home.packages = with pkgs; [ - libnotify # needed for some notifcations - bitwarden-cli # bitwarden, my chosen package manager - trash-cli # `rm` skips the "rubish bin", this cli tool uses that - brightnessctl # brightness managed via cli - ]; + config = mkIf ((isAcceptedDevice osConfig acceptedTypes) && cfg.cli.enable && cfg.gui.enable) { + home.packages = with pkgs; + [ + libnotify # needed for some notifcations + bitwarden-cli # bitwarden, my chosen package manager + trash-cli # `rm` skips the "rubish bin", this cli tool uses that + brightnessctl # brightness managed via cli + ] + ++ optionals cfg.cli.modernShell.enable [ + inputs'.catppuccin-toolbox.packages.catwalk + ]; }; } diff --git a/home/isabel/programs/cli/shared.nix b/home/isabel/programs/cli/shared.nix index 7c7229a14..4a5c8ba05 100644 --- a/home/isabel/programs/cli/shared.nix +++ b/home/isabel/programs/cli/shared.nix @@ -26,7 +26,6 @@ in { ] ++ optionals cfg.cli.modernShell.enable [ ripgrep - inputs'.catppuccin-toolbox.packages.catwalk ]; }; } diff --git a/home/isabel/programs/cli/confs/bat.nix b/home/isabel/programs/configs/cli/bat.nix similarity index 100% rename from home/isabel/programs/cli/confs/bat.nix rename to home/isabel/programs/configs/cli/bat.nix diff --git a/home/isabel/programs/cli/confs/default.nix b/home/isabel/programs/configs/cli/default.nix similarity index 91% rename from home/isabel/programs/cli/confs/default.nix rename to home/isabel/programs/configs/cli/default.nix index 2ff746f10..1d3786c19 100644 --- a/home/isabel/programs/cli/confs/default.nix +++ b/home/isabel/programs/configs/cli/default.nix @@ -1,5 +1,7 @@ _: { imports = [ + ./shells + ./bat.nix ./eza.nix ./git.nix diff --git a/home/isabel/programs/cli/confs/eza.nix b/home/isabel/programs/configs/cli/eza.nix similarity index 100% rename from home/isabel/programs/cli/confs/eza.nix rename to home/isabel/programs/configs/cli/eza.nix diff --git a/home/isabel/programs/cli/confs/git.nix b/home/isabel/programs/configs/cli/git.nix similarity index 100% rename from home/isabel/programs/cli/confs/git.nix rename to home/isabel/programs/configs/cli/git.nix diff --git a/home/isabel/programs/cli/confs/nix-shell.nix b/home/isabel/programs/configs/cli/nix-shell.nix similarity index 100% rename from home/isabel/programs/cli/confs/nix-shell.nix rename to home/isabel/programs/configs/cli/nix-shell.nix diff --git a/home/isabel/programs/shells/bash.nix b/home/isabel/programs/configs/cli/shells/bash.nix similarity index 100% rename from home/isabel/programs/shells/bash.nix rename to home/isabel/programs/configs/cli/shells/bash.nix diff --git a/home/isabel/programs/shells/default.nix b/home/isabel/programs/configs/cli/shells/default.nix similarity index 100% rename from home/isabel/programs/shells/default.nix rename to home/isabel/programs/configs/cli/shells/default.nix diff --git a/home/isabel/programs/shells/fish.nix b/home/isabel/programs/configs/cli/shells/fish.nix similarity index 100% rename from home/isabel/programs/shells/fish.nix rename to home/isabel/programs/configs/cli/shells/fish.nix diff --git a/home/isabel/programs/shells/nushell.nix b/home/isabel/programs/configs/cli/shells/nushell.nix similarity index 100% rename from home/isabel/programs/shells/nushell.nix rename to home/isabel/programs/configs/cli/shells/nushell.nix diff --git a/home/isabel/programs/shells/shellAlias.nix b/home/isabel/programs/configs/cli/shells/shellAlias.nix similarity index 100% rename from home/isabel/programs/shells/shellAlias.nix rename to home/isabel/programs/configs/cli/shells/shellAlias.nix diff --git a/home/isabel/programs/cli/confs/starship.nix b/home/isabel/programs/configs/cli/starship.nix similarity index 100% rename from home/isabel/programs/cli/confs/starship.nix rename to home/isabel/programs/configs/cli/starship.nix diff --git a/home/isabel/programs/cli/confs/tealdear.nix b/home/isabel/programs/configs/cli/tealdear.nix similarity index 100% rename from home/isabel/programs/cli/confs/tealdear.nix rename to home/isabel/programs/configs/cli/tealdear.nix diff --git a/home/isabel/programs/cli/confs/zoxide.nix b/home/isabel/programs/configs/cli/zoxide.nix similarity index 100% rename from home/isabel/programs/cli/confs/zoxide.nix rename to home/isabel/programs/configs/cli/zoxide.nix diff --git a/home/isabel/programs/configs/default.nix b/home/isabel/programs/configs/default.nix new file mode 100644 index 000000000..7c622c7a3 --- /dev/null +++ b/home/isabel/programs/configs/default.nix @@ -0,0 +1,8 @@ +_: { + imports = [ + ./cli # command line interface app confurations + ./editors # text editor / IDE configurations + ./gui # graphical interface app confurations + ./tui # terminal interface app confurations + ]; +} diff --git a/home/isabel/programs/editors/default.nix b/home/isabel/programs/configs/editors/default.nix similarity index 100% rename from home/isabel/programs/editors/default.nix rename to home/isabel/programs/configs/editors/default.nix diff --git a/home/isabel/programs/editors/micro/default.nix b/home/isabel/programs/configs/editors/micro/default.nix similarity index 83% rename from home/isabel/programs/editors/micro/default.nix rename to home/isabel/programs/configs/editors/micro/default.nix index 849953686..67ec0aacd 100644 --- a/home/isabel/programs/editors/micro/default.nix +++ b/home/isabel/programs/configs/editors/micro/default.nix @@ -6,11 +6,10 @@ config = lib.mkIf osConfig.modules.programs.editors.micro.enable { programs.micro = { enable = true; - # catppuccin.enable = true; + catppuccin.enable = true; settings = { "autosu" = true; "clipboard" = "terminal"; - "colorscheme" = "catppuccin-mocha"; "eofnewline" = false; "savecursor" = true; "statusformatl" = "$(filename) @($(line):$(col)) $(modified)| $(opt:filetype) $(opt:encoding)"; diff --git a/home/isabel/programs/editors/nvim/default.nix b/home/isabel/programs/configs/editors/nvim/default.nix similarity index 100% rename from home/isabel/programs/editors/nvim/default.nix rename to home/isabel/programs/configs/editors/nvim/default.nix diff --git a/home/isabel/programs/editors/vscode/default.nix b/home/isabel/programs/configs/editors/vscode/default.nix similarity index 100% rename from home/isabel/programs/editors/vscode/default.nix rename to home/isabel/programs/configs/editors/vscode/default.nix diff --git a/home/isabel/programs/editors/vscode/keybindings.json b/home/isabel/programs/configs/editors/vscode/keybindings.json similarity index 100% rename from home/isabel/programs/editors/vscode/keybindings.json rename to home/isabel/programs/configs/editors/vscode/keybindings.json diff --git a/home/isabel/programs/editors/vscode/settings.json b/home/isabel/programs/configs/editors/vscode/settings.json similarity index 100% rename from home/isabel/programs/editors/vscode/settings.json rename to home/isabel/programs/configs/editors/vscode/settings.json diff --git a/home/isabel/programs/gui/confs/bars/ags/config/config.js b/home/isabel/programs/configs/gui/bars/ags/config/config.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/config.js rename to home/isabel/programs/configs/gui/bars/ags/config/config.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/applauncher/Applauncher.js b/home/isabel/programs/configs/gui/bars/ags/config/js/applauncher/Applauncher.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/applauncher/Applauncher.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/applauncher/Applauncher.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/PanelButton.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/PanelButton.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/PanelButton.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/PanelButton.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/TopBar.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/TopBar.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/TopBar.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/TopBar.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/ApplauncherButton.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/ApplauncherButton.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/ApplauncherButton.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/ApplauncherButton.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/BatteryBar.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/BatteryBar.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/BatteryBar.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/BatteryBar.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/ColorPicker.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/ColorPicker.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/ColorPicker.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/ColorPicker.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/DateButton.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/DateButton.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/DateButton.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/DateButton.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/MediaIndicator.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/MediaIndicator.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/MediaIndicator.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/MediaIndicator.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/NotificationIndicator.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/NotificationIndicator.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/NotificationIndicator.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/NotificationIndicator.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/PowerMenu.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/PowerMenu.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/PowerMenu.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/PowerMenu.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SubMenu.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SubMenu.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SubMenu.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SubMenu.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SysTray.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SysTray.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SysTray.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SysTray.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SystemIndicators.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SystemIndicators.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/SystemIndicators.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/SystemIndicators.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/Workspaces.js b/home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/Workspaces.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/bar/buttons/Workspaces.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/bar/buttons/Workspaces.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/Dashboard.js b/home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/Dashboard.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/Dashboard.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/Dashboard.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/DateColumn.js b/home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/DateColumn.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/DateColumn.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/DateColumn.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/NotificationColumn.js b/home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/NotificationColumn.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/dashboard/NotificationColumn.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/dashboard/NotificationColumn.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/icons.js b/home/isabel/programs/configs/gui/bars/ags/config/js/icons.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/icons.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/icons.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/imports.js b/home/isabel/programs/configs/gui/bars/ags/config/js/imports.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/imports.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/imports.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Avatar.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Avatar.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Avatar.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Avatar.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/BatteryIcon.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/BatteryIcon.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/BatteryIcon.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/BatteryIcon.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Clock.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Clock.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Clock.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Clock.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/FontIcon.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/FontIcon.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/FontIcon.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/FontIcon.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/HoverRevealer.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/HoverRevealer.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/HoverRevealer.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/HoverRevealer.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/IconBrowser.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/IconBrowser.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/IconBrowser.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/IconBrowser.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Notification.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Notification.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Notification.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Notification.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/PopupWindow.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/PopupWindow.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/PopupWindow.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/PopupWindow.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Progress.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Progress.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Progress.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Progress.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Separator.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Separator.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Separator.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Separator.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Spinner.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Spinner.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Spinner.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Spinner.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/Wallpaper.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/Wallpaper.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/Wallpaper.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/Wallpaper.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/misc/mpris.js b/home/isabel/programs/configs/gui/bars/ags/config/js/misc/mpris.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/misc/mpris.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/misc/mpris.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/notifications/Notifications.js b/home/isabel/programs/configs/gui/bars/ags/config/js/notifications/Notifications.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/notifications/Notifications.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/notifications/Notifications.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/options.js b/home/isabel/programs/configs/gui/bars/ags/config/js/options.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/options.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/options.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/osd/OSD.js b/home/isabel/programs/configs/gui/bars/ags/config/js/osd/OSD.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/osd/OSD.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/osd/OSD.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/powermenu/PowerMenu.js b/home/isabel/programs/configs/gui/bars/ags/config/js/powermenu/PowerMenu.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/powermenu/PowerMenu.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/powermenu/PowerMenu.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/powermenu/Verification.js b/home/isabel/programs/configs/gui/bars/ags/config/js/powermenu/Verification.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/powermenu/Verification.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/powermenu/Verification.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/QuickSettings.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/QuickSettings.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/QuickSettings.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/QuickSettings.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/ToggleButton.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/ToggleButton.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/ToggleButton.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/ToggleButton.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Bluetooth.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Bluetooth.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Bluetooth.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Bluetooth.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Brightness.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Brightness.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Brightness.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Brightness.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/DND.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/DND.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/DND.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/DND.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Header.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Header.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Header.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Header.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Media.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Media.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Media.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Media.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/MicMute.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/MicMute.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/MicMute.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/MicMute.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Network.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Network.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Network.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Network.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Theme.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Theme.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Theme.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Theme.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Volume.js b/home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Volume.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/quicksettings/widgets/Volume.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/quicksettings/widgets/Volume.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/screencorner/ScreenCorners.js b/home/isabel/programs/configs/gui/bars/ags/config/js/screencorner/ScreenCorners.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/screencorner/ScreenCorners.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/screencorner/ScreenCorners.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/brightness.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/brightness.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/brightness.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/brightness.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/onScreenIndicator.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/onScreenIndicator.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/onScreenIndicator.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/onScreenIndicator.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/powermenu.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/powermenu.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/powermenu.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/powermenu.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/hyprland.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/hyprland.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/hyprland.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/hyprland.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/scss.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/scss.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/scss.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/scss.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/theme.js b/home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/theme.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/services/theme/theme.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/services/theme/theme.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/settingsdialog/SettingsDialog.js b/home/isabel/programs/configs/gui/bars/ags/config/js/settingsdialog/SettingsDialog.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/settingsdialog/SettingsDialog.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/settingsdialog/SettingsDialog.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/themes.js b/home/isabel/programs/configs/gui/bars/ags/config/js/themes.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/themes.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/themes.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/utils.js b/home/isabel/programs/configs/gui/bars/ags/config/js/utils.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/utils.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/utils.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/js/variables.js b/home/isabel/programs/configs/gui/bars/ags/config/js/variables.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/js/variables.js rename to home/isabel/programs/configs/gui/bars/ags/config/js/variables.js diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/common.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/common.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/common.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/common.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/main.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/main.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/main.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/main.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/applauncher.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/applauncher.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/applauncher.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/applauncher.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/bar.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/bar.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/bar.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/bar.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/dashboard.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/dashboard.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/dashboard.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/dashboard.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/desktop.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/desktop.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/desktop.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/desktop.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/media.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/media.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/media.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/media.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/notifications.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/notifications.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/notifications.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/notifications.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/powermenu.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/powermenu.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/powermenu.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/powermenu.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/quicksettings.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/quicksettings.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/quicksettings.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/quicksettings.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/settings.scss b/home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/settings.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/config/scss/widgets/settings.scss rename to home/isabel/programs/configs/gui/bars/ags/config/scss/widgets/settings.scss diff --git a/home/isabel/programs/gui/confs/bars/ags/default.nix b/home/isabel/programs/configs/gui/bars/ags/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/bars/ags/default.nix rename to home/isabel/programs/configs/gui/bars/ags/default.nix diff --git a/home/isabel/programs/gui/confs/bars/default.nix b/home/isabel/programs/configs/gui/bars/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/bars/default.nix rename to home/isabel/programs/configs/gui/bars/default.nix diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/battle.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/battle.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/battle.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/battle.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/bitwig.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/bitwig.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/bitwig.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/bitwig.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/bottles.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/bottles.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/bottles.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/bottles.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/caprine.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/caprine.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/caprine.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/caprine.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/code.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/code.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/code.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/code.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/editor.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/editor.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/editor.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/editor.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/file-manager.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/file-manager.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/file-manager.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/file-manager.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/firefox.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/firefox.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/firefox.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/firefox.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/kitty.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/kitty.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/kitty.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/kitty.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/spotify.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/spotify.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/spotify.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/spotify.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/battle.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/battle.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/battle.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/battle.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/bitwig.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/bitwig.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/bitwig.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/bitwig.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/bottles.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/bottles.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/bottles.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/bottles.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/caprine.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/caprine.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/caprine.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/caprine.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/code.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/code.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/code.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/code.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/editor.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/editor.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/editor.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/editor.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/file-manager.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/file-manager.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/file-manager.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/file-manager.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/firefox.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/firefox.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/firefox.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/firefox.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/kitty.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/kitty.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/kitty.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/kitty.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/nvim.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/nvim.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/nvim.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/nvim.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/spotify.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/spotify.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/svg/spotify.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/svg/spotify.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/apps/terminal.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/apps/terminal.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/apps/terminal.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/apps/terminal.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-lock.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-lock.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-lock.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-lock.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-logout.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-logout.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-logout.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-logout.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-reboot.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-reboot.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-reboot.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-reboot.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-shutdown.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-shutdown.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-shutdown.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-shutdown.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-suspend.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-suspend.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/light-suspend.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/light-suspend.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/lock.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/lock.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/lock.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/lock.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/logout.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/logout.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/logout.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/logout.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/reboot.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/reboot.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/reboot.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/reboot.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/shutdown.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/shutdown.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/shutdown.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/shutdown.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/suspend.png b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/suspend.png similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/suspend.png rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/suspend.png diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-lock.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-lock.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-lock.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-lock.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-logout.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-logout.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-logout.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-logout.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-reboot.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-reboot.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-reboot.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-reboot.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-shutdown.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-shutdown.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-shutdown.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-shutdown.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-suspend.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-suspend.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/light-suspend.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/light-suspend.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/lock.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/lock.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/lock.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/lock.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/logout.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/logout.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/logout.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/logout.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/reboot.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/reboot.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/reboot.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/reboot.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/shutdown.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/shutdown.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/shutdown.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/shutdown.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/suspend.svg b/home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/suspend.svg similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/assets/powermenu/svg/suspend.svg rename to home/isabel/programs/configs/gui/bars/eww/config/assets/powermenu/svg/suspend.svg diff --git a/home/isabel/programs/gui/confs/bars/eww/config/eww.scss b/home/isabel/programs/configs/gui/bars/eww/config/eww.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/eww.scss rename to home/isabel/programs/configs/gui/bars/eww/config/eww.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/eww.yuck b/home/isabel/programs/configs/gui/bars/eww/config/eww.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/eww.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/eww.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/apps b/home/isabel/programs/configs/gui/bars/eww/config/scripts/apps similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/apps rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/apps diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/bluetooth b/home/isabel/programs/configs/gui/bars/eww/config/scripts/bluetooth similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/bluetooth rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/bluetooth diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/brightness b/home/isabel/programs/configs/gui/bars/eww/config/scripts/brightness similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/brightness rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/brightness diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/events b/home/isabel/programs/configs/gui/bars/eww/config/scripts/events similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/events rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/events diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/apps.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/apps.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/apps.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/apps.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/battery.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/battery.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/battery.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/battery.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/bluetooth.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/bluetooth.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/bluetooth.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/bluetooth.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/dbus.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/dbus.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/dbus.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/dbus.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/host b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/host similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/host rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/host diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/lib.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/lib.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/lib.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/lib.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/main.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/main.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/main.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/main.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/media.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/media.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/media.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/media.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/network.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/network.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/network.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/network.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/host/notifications.js b/home/isabel/programs/configs/gui/bars/eww/config/scripts/host/notifications.js similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/host/notifications.js rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/host/notifications.js diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/hyprland b/home/isabel/programs/configs/gui/bars/eww/config/scripts/hyprland similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/hyprland rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/hyprland diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/init b/home/isabel/programs/configs/gui/bars/eww/config/scripts/init similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/init rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/init diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/launcher b/home/isabel/programs/configs/gui/bars/eww/config/scripts/launcher similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/launcher rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/launcher diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/network b/home/isabel/programs/configs/gui/bars/eww/config/scripts/network similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/network rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/network diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/night_light b/home/isabel/programs/configs/gui/bars/eww/config/scripts/night_light similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/night_light rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/night_light diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/notifications b/home/isabel/programs/configs/gui/bars/eww/config/scripts/notifications similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/notifications rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/notifications diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/osd b/home/isabel/programs/configs/gui/bars/eww/config/scripts/osd similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/osd rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/osd diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/player b/home/isabel/programs/configs/gui/bars/eww/config/scripts/player similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/player rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/player diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/power b/home/isabel/programs/configs/gui/bars/eww/config/scripts/power similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/power rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/power diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/screenshot b/home/isabel/programs/configs/gui/bars/eww/config/scripts/screenshot similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/screenshot rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/screenshot diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/theme b/home/isabel/programs/configs/gui/bars/eww/config/scripts/theme similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/theme rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/theme diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/todo b/home/isabel/programs/configs/gui/bars/eww/config/scripts/todo similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/todo rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/todo diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scripts/volume b/home/isabel/programs/configs/gui/bars/eww/config/scripts/volume similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scripts/volume rename to home/isabel/programs/configs/gui/bars/eww/config/scripts/volume diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/colors.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/colors.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/colors.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/colors.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/colors_dark.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/colors_dark.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/colors_dark.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/colors_dark.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/colors_light.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/colors_light.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/colors_light.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/colors_light.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/common.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/common.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/common.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/common.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/variables.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/variables.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/variables.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/variables.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/bar_widget.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/bar_widget.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/bar_widget.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/bar_widget.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/calendar.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/calendar.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/calendar.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/calendar.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/events.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/events.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/events.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/events.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/media.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/media.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/media.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/media.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/notification.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/notification.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/notification.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/notification.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/sys_sliders.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/sys_sliders.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/sys_sliders.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/sys_sliders.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/toggle_button.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/toggle_button.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/toggle_button.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/toggle_button.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/user.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/user.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/user.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/user.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/weather.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/weather.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/widgets/weather.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/widgets/weather.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/app_laucher.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/app_laucher.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/app_laucher.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/app_laucher.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/datemenu.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/datemenu.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/datemenu.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/datemenu.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/desktop.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/desktop.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/desktop.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/desktop.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/dock.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/dock.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/dock.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/dock.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/hbar.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/hbar.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/hbar.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/hbar.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/media.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/media.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/media.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/media.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/noti_center.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/noti_center.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/noti_center.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/noti_center.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/notifications.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/notifications.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/notifications.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/notifications.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/osd.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/osd.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/osd.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/osd.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/powermenu.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/powermenu.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/powermenu.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/powermenu.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/quicksettings.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/quicksettings.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/quicksettings.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/quicksettings.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/screenshot.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/screenshot.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/screenshot.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/screenshot.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/scss/windows/vbar.scss b/home/isabel/programs/configs/gui/bars/eww/config/scss/windows/vbar.scss similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/scss/windows/vbar.scss rename to home/isabel/programs/configs/gui/bars/eww/config/scss/windows/vbar.scss diff --git a/home/isabel/programs/gui/confs/bars/eww/config/setups/leftbar.yuck b/home/isabel/programs/configs/gui/bars/eww/config/setups/leftbar.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/setups/leftbar.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/setups/leftbar.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/setups/rightbar.yuck b/home/isabel/programs/configs/gui/bars/eww/config/setups/rightbar.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/setups/rightbar.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/setups/rightbar.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/setups/topbar.yuck b/home/isabel/programs/configs/gui/bars/eww/config/setups/topbar.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/setups/topbar.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/setups/topbar.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/bar_widgets.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/bar_widgets.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/bar_widgets.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/bar_widgets.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/events.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/events.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/events.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/events.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/media.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/media.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/media.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/media.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/notification.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/notification.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/notification.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/notification.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/sys_sliders.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/sys_sliders.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/sys_sliders.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/sys_sliders.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/sysprogress.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/sysprogress.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/sysprogress.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/sysprogress.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/toggles.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/toggles.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/toggles.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/toggles.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/user.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/user.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/widgets/user.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/widgets/user.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/app_launcher.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/app_launcher.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/app_launcher.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/app_launcher.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/datemenu.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/datemenu.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/datemenu.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/datemenu.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/desktop.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/desktop.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/desktop.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/desktop.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/hbar.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/hbar.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/hbar.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/hbar.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/media.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/media.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/media.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/media.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/noti_center.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/noti_center.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/noti_center.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/noti_center.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/notifications.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/notifications.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/notifications.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/notifications.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/osd.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/osd.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/osd.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/osd.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/powermenu.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/powermenu.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/powermenu.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/powermenu.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/quicksettings.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/quicksettings.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/quicksettings.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/quicksettings.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/screenshot.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/screenshot.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/screenshot.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/screenshot.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/vbar.yuck b/home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/vbar.yuck similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/config/yuck/windows/vbar.yuck rename to home/isabel/programs/configs/gui/bars/eww/config/yuck/windows/vbar.yuck diff --git a/home/isabel/programs/gui/confs/bars/eww/default.nix b/home/isabel/programs/configs/gui/bars/eww/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/bars/eww/default.nix rename to home/isabel/programs/configs/gui/bars/eww/default.nix diff --git a/home/isabel/programs/gui/confs/bars/waybar/default.nix b/home/isabel/programs/configs/gui/bars/waybar/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/bars/waybar/default.nix rename to home/isabel/programs/configs/gui/bars/waybar/default.nix diff --git a/home/isabel/programs/gui/confs/bars/waybar/style.nix b/home/isabel/programs/configs/gui/bars/waybar/style.nix similarity index 100% rename from home/isabel/programs/gui/confs/bars/waybar/style.nix rename to home/isabel/programs/configs/gui/bars/waybar/style.nix diff --git a/home/isabel/programs/gui/confs/browsers/chromium.nix b/home/isabel/programs/configs/gui/browsers/chromium.nix similarity index 100% rename from home/isabel/programs/gui/confs/browsers/chromium.nix rename to home/isabel/programs/configs/gui/browsers/chromium.nix diff --git a/home/isabel/programs/gui/confs/browsers/default.nix b/home/isabel/programs/configs/gui/browsers/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/browsers/default.nix rename to home/isabel/programs/configs/gui/browsers/default.nix diff --git a/home/isabel/programs/gui/confs/browsers/schizofox.nix b/home/isabel/programs/configs/gui/browsers/schizofox.nix similarity index 100% rename from home/isabel/programs/gui/confs/browsers/schizofox.nix rename to home/isabel/programs/configs/gui/browsers/schizofox.nix diff --git a/home/isabel/programs/gui/confs/default.nix b/home/isabel/programs/configs/gui/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/default.nix rename to home/isabel/programs/configs/gui/default.nix diff --git a/home/isabel/programs/gui/confs/discord.nix b/home/isabel/programs/configs/gui/discord.nix similarity index 100% rename from home/isabel/programs/gui/confs/discord.nix rename to home/isabel/programs/configs/gui/discord.nix diff --git a/home/isabel/programs/gui/confs/fileMangers/default.nix b/home/isabel/programs/configs/gui/fileMangers/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/fileMangers/default.nix rename to home/isabel/programs/configs/gui/fileMangers/default.nix diff --git a/home/isabel/programs/gui/confs/fileMangers/dolphin.nix b/home/isabel/programs/configs/gui/fileMangers/dolphin.nix similarity index 100% rename from home/isabel/programs/gui/confs/fileMangers/dolphin.nix rename to home/isabel/programs/configs/gui/fileMangers/dolphin.nix diff --git a/home/isabel/programs/gui/confs/fileMangers/nemo.nix b/home/isabel/programs/configs/gui/fileMangers/nemo.nix similarity index 100% rename from home/isabel/programs/gui/confs/fileMangers/nemo.nix rename to home/isabel/programs/configs/gui/fileMangers/nemo.nix diff --git a/home/isabel/programs/gui/confs/launchers/default.nix b/home/isabel/programs/configs/gui/launchers/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/launchers/default.nix rename to home/isabel/programs/configs/gui/launchers/default.nix diff --git a/home/isabel/programs/gui/confs/launchers/rofi/config.nix b/home/isabel/programs/configs/gui/launchers/rofi/config.nix similarity index 100% rename from home/isabel/programs/gui/confs/launchers/rofi/config.nix rename to home/isabel/programs/configs/gui/launchers/rofi/config.nix diff --git a/home/isabel/programs/gui/confs/launchers/rofi/default.nix b/home/isabel/programs/configs/gui/launchers/rofi/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/launchers/rofi/default.nix rename to home/isabel/programs/configs/gui/launchers/rofi/default.nix diff --git a/home/isabel/programs/gui/confs/launchers/wofi/config.nix b/home/isabel/programs/configs/gui/launchers/wofi/config.nix similarity index 100% rename from home/isabel/programs/gui/confs/launchers/wofi/config.nix rename to home/isabel/programs/configs/gui/launchers/wofi/config.nix diff --git a/home/isabel/programs/gui/confs/launchers/wofi/default.nix b/home/isabel/programs/configs/gui/launchers/wofi/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/launchers/wofi/default.nix rename to home/isabel/programs/configs/gui/launchers/wofi/default.nix diff --git a/home/isabel/programs/gui/confs/terminals/alacritty.nix b/home/isabel/programs/configs/gui/terminals/alacritty.nix similarity index 100% rename from home/isabel/programs/gui/confs/terminals/alacritty.nix rename to home/isabel/programs/configs/gui/terminals/alacritty.nix diff --git a/home/isabel/programs/gui/confs/terminals/default.nix b/home/isabel/programs/configs/gui/terminals/default.nix similarity index 100% rename from home/isabel/programs/gui/confs/terminals/default.nix rename to home/isabel/programs/configs/gui/terminals/default.nix diff --git a/home/isabel/programs/gui/confs/terminals/kitty.nix b/home/isabel/programs/configs/gui/terminals/kitty.nix similarity index 100% rename from home/isabel/programs/gui/confs/terminals/kitty.nix rename to home/isabel/programs/configs/gui/terminals/kitty.nix diff --git a/home/isabel/programs/gui/confs/zathura.nix b/home/isabel/programs/configs/gui/zathura.nix similarity index 100% rename from home/isabel/programs/gui/confs/zathura.nix rename to home/isabel/programs/configs/gui/zathura.nix diff --git a/home/isabel/programs/tui/confs/btop.nix b/home/isabel/programs/configs/tui/btop.nix similarity index 90% rename from home/isabel/programs/tui/confs/btop.nix rename to home/isabel/programs/configs/tui/btop.nix index 7a2ccfc05..898a82233 100644 --- a/home/isabel/programs/tui/confs/btop.nix +++ b/home/isabel/programs/configs/tui/btop.nix @@ -10,7 +10,6 @@ in { enable = true; catppuccin.enable = true; settings = { - color_theme = "catppuccin_mocha"; vim_keys = true; rounded_corners = true; }; diff --git a/home/isabel/programs/tui/confs/default.nix b/home/isabel/programs/configs/tui/default.nix similarity index 100% rename from home/isabel/programs/tui/confs/default.nix rename to home/isabel/programs/configs/tui/default.nix diff --git a/home/isabel/programs/tui/confs/lazygit.nix b/home/isabel/programs/configs/tui/lazygit.nix similarity index 100% rename from home/isabel/programs/tui/confs/lazygit.nix rename to home/isabel/programs/configs/tui/lazygit.nix diff --git a/home/isabel/programs/tui/confs/ranger.nix b/home/isabel/programs/configs/tui/ranger.nix similarity index 100% rename from home/isabel/programs/tui/confs/ranger.nix rename to home/isabel/programs/configs/tui/ranger.nix diff --git a/home/isabel/programs/default.nix b/home/isabel/programs/default.nix index 3c9d1ad8a..8e5d13299 100644 --- a/home/isabel/programs/default.nix +++ b/home/isabel/programs/default.nix @@ -1,10 +1,9 @@ _: { imports = [ ./cli # command line applications - ./editors # not all editors are GUI so they don't fit into the current catagories + ./configs # app confiurations ./gui # graphical applications ./scripts # useful shell scrips - ./shells # shell configurations ./tui # terminal interface applications ./wm # window managers # TODO DE's diff --git a/home/isabel/programs/gui/default.nix b/home/isabel/programs/gui/default.nix index 9a9dc23f6..55494359e 100644 --- a/home/isabel/programs/gui/default.nix +++ b/home/isabel/programs/gui/default.nix @@ -1,6 +1,6 @@ _: { imports = [ - ./confs + ./gaming ./shared.nix ./wayland.nix diff --git a/home/isabel/programs/tui/default.nix b/home/isabel/programs/tui/default.nix index 8effbc4b7..c7547fc8f 100644 --- a/home/isabel/programs/tui/default.nix +++ b/home/isabel/programs/tui/default.nix @@ -4,10 +4,6 @@ lib, ... }: { - imports = [ - ./confs - ]; - config = lib.mkIf osConfig.modules.programs.tui.enable { home.packages = with pkgs; [ wishlist # fancy ssh diff --git a/hosts/default.nix b/hosts/default.nix index f39893929..7ed422dbe 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -13,41 +13,39 @@ # modules modulePath = ../modules; # the base module path - options = modulePath + /options; # the module options for quick configuration - # common modules, these are shared across all systems - commonModules = modulePath + /common; # the base directory for the common module - core = commonModules + /core; # defaults for all systems - secrets = commonModules + /secrets; # shhh + # base modules, are the basis of this system configuration and are shared across all systems + baseModules = modulePath + /base; # the base directory for the common module + common = baseModules + /common; # defaults for all systems + options = baseModules + /options; # the module options for quick configuration - # hardware types, providing improved defaults and system preformance improvements - deviceType = commonModules + /types; # the base directory for the types module - server = deviceType + /server; # for server type configurations - laptop = deviceType + /laptop; # for laptop type configurations - desktop = deviceType + /desktop; # for desktop type configurations - workstation = deviceType + /workstation; # for server type configurations - #hybrid = [server laptop]; # combine the server and laptop configurations for the best of both worlds + # profiles are hardware based, system optimised defaults + profilesModule = modulePath + /profiles; # the base directory for the types module + server = profilesModule + /server; # for server type configurations + laptop = profilesModule + /laptop; # for laptop type configurations + desktop = profilesModule + /desktop; # for desktop type configurations + workstation = profilesModule + /workstation; # for server type configurations # extra modules extraModules = modulePath + /extra; # the base directory for the extra module sharedModules = extraModules + /shared; # the base directory for the shared module - ## home-manager + # home-manager home = ../home; # home-manager configurations, used if hm is enabled homes = [hm home]; # combine hm input module and the home module, confiuration modules # a list of shared modules shared = [ - core # default shared across all system configuratons + common # default shared across all system configuratons options # amazing quick settings module sharedModules # sharing is careing, this mainly contains: hm and nixos (if any) modules cat # catppucin for the quick themeing - secrets # shh ]; # extraSpecialArgs that are on all machines sharedArgs = {inherit inputs self lib;}; in { + # super rubbish laptop hydra = mkNixosSystem { inherit withSystem; system = "x86_64-linux"; @@ -60,13 +58,11 @@ in { ++ concatLists [ shared homes - /* - hybrid - */ ]; specialArgs = sharedArgs; }; + # super cool gamer pc amatarasu = mkNixosSystem { inherit withSystem; system = "x86_64-linux"; @@ -80,6 +76,7 @@ in { specialArgs = sharedArgs; }; + # hertzner cloud computer bernie = mkNixosSystem { inherit withSystem; system = "x86_64-linux"; diff --git a/modules/base/common/default.nix b/modules/base/common/default.nix new file mode 100644 index 000000000..eb150d806 --- /dev/null +++ b/modules/base/common/default.nix @@ -0,0 +1,8 @@ +_: { + imports = [ + ./host # host configurations + ./gaming # super cool procrastinations related things + ./secrets # shhh + ./services # allows for per-system system services to be enabled + ]; +} diff --git a/modules/common/core/gaming/default.nix b/modules/base/common/gaming/default.nix similarity index 100% rename from modules/common/core/gaming/default.nix rename to modules/base/common/gaming/default.nix diff --git a/modules/common/core/gaming/gamemode.nix b/modules/base/common/gaming/gamemode.nix similarity index 100% rename from modules/common/core/gaming/gamemode.nix rename to modules/base/common/gaming/gamemode.nix diff --git a/modules/common/core/gaming/steam.nix b/modules/base/common/gaming/steam.nix similarity index 100% rename from modules/common/core/gaming/steam.nix rename to modules/base/common/gaming/steam.nix diff --git a/modules/common/core/system/activation/default.nix b/modules/base/common/host/activation/default.nix similarity index 100% rename from modules/common/core/system/activation/default.nix rename to modules/base/common/host/activation/default.nix diff --git a/modules/common/core/system/default.nix b/modules/base/common/host/default.nix similarity index 100% rename from modules/common/core/system/default.nix rename to modules/base/common/host/default.nix diff --git a/modules/common/core/system/emulation/default.nix b/modules/base/common/host/emulation/default.nix similarity index 100% rename from modules/common/core/system/emulation/default.nix rename to modules/base/common/host/emulation/default.nix diff --git a/modules/common/core/system/encryption/default.nix b/modules/base/common/host/encryption/default.nix similarity index 100% rename from modules/common/core/system/encryption/default.nix rename to modules/base/common/host/encryption/default.nix diff --git a/modules/common/core/system/hardware/bluetooth/default.nix b/modules/base/common/host/hardware/bluetooth/default.nix similarity index 100% rename from modules/common/core/system/hardware/bluetooth/default.nix rename to modules/base/common/host/hardware/bluetooth/default.nix diff --git a/modules/common/core/system/hardware/cpu/amd/default.nix b/modules/base/common/host/hardware/cpu/amd/default.nix similarity index 100% rename from modules/common/core/system/hardware/cpu/amd/default.nix rename to modules/base/common/host/hardware/cpu/amd/default.nix diff --git a/modules/common/core/system/hardware/cpu/default.nix b/modules/base/common/host/hardware/cpu/default.nix similarity index 100% rename from modules/common/core/system/hardware/cpu/default.nix rename to modules/base/common/host/hardware/cpu/default.nix diff --git a/modules/common/core/system/hardware/cpu/intel/default.nix b/modules/base/common/host/hardware/cpu/intel/default.nix similarity index 100% rename from modules/common/core/system/hardware/cpu/intel/default.nix rename to modules/base/common/host/hardware/cpu/intel/default.nix diff --git a/modules/common/core/system/hardware/default.nix b/modules/base/common/host/hardware/default.nix similarity index 100% rename from modules/common/core/system/hardware/default.nix rename to modules/base/common/host/hardware/default.nix diff --git a/modules/common/core/system/hardware/gpu/amd/default.nix b/modules/base/common/host/hardware/gpu/amd/default.nix similarity index 100% rename from modules/common/core/system/hardware/gpu/amd/default.nix rename to modules/base/common/host/hardware/gpu/amd/default.nix diff --git a/modules/common/core/system/hardware/gpu/default.nix b/modules/base/common/host/hardware/gpu/default.nix similarity index 100% rename from modules/common/core/system/hardware/gpu/default.nix rename to modules/base/common/host/hardware/gpu/default.nix diff --git a/modules/common/core/system/hardware/gpu/intel/default.nix b/modules/base/common/host/hardware/gpu/intel/default.nix similarity index 100% rename from modules/common/core/system/hardware/gpu/intel/default.nix rename to modules/base/common/host/hardware/gpu/intel/default.nix diff --git a/modules/common/core/system/hardware/gpu/nvidia/default.nix b/modules/base/common/host/hardware/gpu/nvidia/default.nix similarity index 100% rename from modules/common/core/system/hardware/gpu/nvidia/default.nix rename to modules/base/common/host/hardware/gpu/nvidia/default.nix diff --git a/modules/common/core/system/hardware/tmp/default.nix b/modules/base/common/host/hardware/tmp/default.nix similarity index 100% rename from modules/common/core/system/hardware/tmp/default.nix rename to modules/base/common/host/hardware/tmp/default.nix diff --git a/modules/common/core/system/media/default.nix b/modules/base/common/host/media/default.nix similarity index 100% rename from modules/common/core/system/media/default.nix rename to modules/base/common/host/media/default.nix diff --git a/modules/common/core/system/media/sound/default.nix b/modules/base/common/host/media/sound/default.nix similarity index 100% rename from modules/common/core/system/media/sound/default.nix rename to modules/base/common/host/media/sound/default.nix diff --git a/modules/common/core/system/media/video/default.nix b/modules/base/common/host/media/video/default.nix similarity index 100% rename from modules/common/core/system/media/video/default.nix rename to modules/base/common/host/media/video/default.nix diff --git a/modules/common/core/system/nix/default.nix b/modules/base/common/host/nix/default.nix similarity index 100% rename from modules/common/core/system/nix/default.nix rename to modules/base/common/host/nix/default.nix diff --git a/modules/common/core/system/os/boot/default.nix b/modules/base/common/host/os/boot/default.nix similarity index 100% rename from modules/common/core/system/os/boot/default.nix rename to modules/base/common/host/os/boot/default.nix diff --git a/modules/common/core/system/os/boot/generic/default.nix b/modules/base/common/host/os/boot/generic/default.nix similarity index 100% rename from modules/common/core/system/os/boot/generic/default.nix rename to modules/base/common/host/os/boot/generic/default.nix diff --git a/modules/common/core/system/os/boot/loader/default.nix b/modules/base/common/host/os/boot/loader/default.nix similarity index 100% rename from modules/common/core/system/os/boot/loader/default.nix rename to modules/base/common/host/os/boot/loader/default.nix diff --git a/modules/common/core/system/os/boot/loader/grub/default.nix b/modules/base/common/host/os/boot/loader/grub/default.nix similarity index 100% rename from modules/common/core/system/os/boot/loader/grub/default.nix rename to modules/base/common/host/os/boot/loader/grub/default.nix diff --git a/modules/common/core/system/os/boot/loader/none/default.nix b/modules/base/common/host/os/boot/loader/none/default.nix similarity index 100% rename from modules/common/core/system/os/boot/loader/none/default.nix rename to modules/base/common/host/os/boot/loader/none/default.nix diff --git a/modules/common/core/system/os/boot/loader/systemd-boot/default.nix b/modules/base/common/host/os/boot/loader/systemd-boot/default.nix similarity index 100% rename from modules/common/core/system/os/boot/loader/systemd-boot/default.nix rename to modules/base/common/host/os/boot/loader/systemd-boot/default.nix diff --git a/modules/common/core/system/os/boot/plymouth/default.nix b/modules/base/common/host/os/boot/plymouth/default.nix similarity index 100% rename from modules/common/core/system/os/boot/plymouth/default.nix rename to modules/base/common/host/os/boot/plymouth/default.nix diff --git a/modules/common/core/system/os/boot/secure-boot/default.nix b/modules/base/common/host/os/boot/secure-boot/default.nix similarity index 100% rename from modules/common/core/system/os/boot/secure-boot/default.nix rename to modules/base/common/host/os/boot/secure-boot/default.nix diff --git a/modules/common/core/system/os/default.nix b/modules/base/common/host/os/default.nix similarity index 100% rename from modules/common/core/system/os/default.nix rename to modules/base/common/host/os/default.nix diff --git a/modules/common/core/system/os/display/default.nix b/modules/base/common/host/os/display/default.nix similarity index 100% rename from modules/common/core/system/os/display/default.nix rename to modules/base/common/host/os/display/default.nix diff --git a/modules/common/core/system/os/display/wayland/default.nix b/modules/base/common/host/os/display/wayland/default.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/default.nix rename to modules/base/common/host/os/display/wayland/default.nix diff --git a/modules/common/core/system/os/display/wayland/environment.nix b/modules/base/common/host/os/display/wayland/environment.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/environment.nix rename to modules/base/common/host/os/display/wayland/environment.nix diff --git a/modules/common/core/system/os/display/wayland/overlay.nix b/modules/base/common/host/os/display/wayland/overlay.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/overlay.nix rename to modules/base/common/host/os/display/wayland/overlay.nix diff --git a/modules/common/core/system/os/display/wayland/portals.nix b/modules/base/common/host/os/display/wayland/portals.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/portals.nix rename to modules/base/common/host/os/display/wayland/portals.nix diff --git a/modules/common/core/system/os/display/wayland/services.nix b/modules/base/common/host/os/display/wayland/services.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/services.nix rename to modules/base/common/host/os/display/wayland/services.nix diff --git a/modules/common/core/system/os/display/wayland/wm/default.nix b/modules/base/common/host/os/display/wayland/wm/default.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/wm/default.nix rename to modules/base/common/host/os/display/wayland/wm/default.nix diff --git a/modules/common/core/system/os/display/wayland/wm/hyprland.nix b/modules/base/common/host/os/display/wayland/wm/hyprland.nix similarity index 100% rename from modules/common/core/system/os/display/wayland/wm/hyprland.nix rename to modules/base/common/host/os/display/wayland/wm/hyprland.nix diff --git a/modules/common/core/system/os/environment/aliases.nix b/modules/base/common/host/os/environment/aliases.nix similarity index 100% rename from modules/common/core/system/os/environment/aliases.nix rename to modules/base/common/host/os/environment/aliases.nix diff --git a/modules/common/core/system/os/environment/default.nix b/modules/base/common/host/os/environment/default.nix similarity index 100% rename from modules/common/core/system/os/environment/default.nix rename to modules/base/common/host/os/environment/default.nix diff --git a/modules/common/core/system/os/environment/etc.nix b/modules/base/common/host/os/environment/etc.nix similarity index 100% rename from modules/common/core/system/os/environment/etc.nix rename to modules/base/common/host/os/environment/etc.nix diff --git a/modules/common/core/system/os/environment/locale.nix b/modules/base/common/host/os/environment/locale.nix similarity index 100% rename from modules/common/core/system/os/environment/locale.nix rename to modules/base/common/host/os/environment/locale.nix diff --git a/modules/common/core/system/os/environment/packages.nix b/modules/base/common/host/os/environment/packages.nix similarity index 100% rename from modules/common/core/system/os/environment/packages.nix rename to modules/base/common/host/os/environment/packages.nix diff --git a/modules/common/core/system/os/environment/paths.nix b/modules/base/common/host/os/environment/paths.nix similarity index 100% rename from modules/common/core/system/os/environment/paths.nix rename to modules/base/common/host/os/environment/paths.nix diff --git a/modules/common/core/system/os/environment/vars.nix b/modules/base/common/host/os/environment/vars.nix similarity index 100% rename from modules/common/core/system/os/environment/vars.nix rename to modules/base/common/host/os/environment/vars.nix diff --git a/modules/common/core/system/os/fs/default.nix b/modules/base/common/host/os/fs/default.nix similarity index 100% rename from modules/common/core/system/os/fs/default.nix rename to modules/base/common/host/os/fs/default.nix diff --git a/modules/common/core/system/os/network/blocker.nix b/modules/base/common/host/os/network/blocker.nix similarity index 100% rename from modules/common/core/system/os/network/blocker.nix rename to modules/base/common/host/os/network/blocker.nix diff --git a/modules/common/core/system/os/network/default.nix b/modules/base/common/host/os/network/default.nix similarity index 100% rename from modules/common/core/system/os/network/default.nix rename to modules/base/common/host/os/network/default.nix diff --git a/modules/common/core/system/os/network/firewall.nix b/modules/base/common/host/os/network/firewall.nix similarity index 100% rename from modules/common/core/system/os/network/firewall.nix rename to modules/base/common/host/os/network/firewall.nix diff --git a/modules/common/core/system/os/network/optimise.nix b/modules/base/common/host/os/network/optimise.nix similarity index 100% rename from modules/common/core/system/os/network/optimise.nix rename to modules/base/common/host/os/network/optimise.nix diff --git a/modules/common/core/system/os/network/ssh.nix b/modules/base/common/host/os/network/ssh.nix similarity index 100% rename from modules/common/core/system/os/network/ssh.nix rename to modules/base/common/host/os/network/ssh.nix diff --git a/modules/common/core/system/os/programs/default.nix b/modules/base/common/host/os/programs/default.nix similarity index 100% rename from modules/common/core/system/os/programs/default.nix rename to modules/base/common/host/os/programs/default.nix diff --git a/modules/common/core/system/os/services/default.nix b/modules/base/common/host/os/services/default.nix similarity index 100% rename from modules/common/core/system/os/services/default.nix rename to modules/base/common/host/os/services/default.nix diff --git a/modules/common/core/system/os/services/systemd.nix b/modules/base/common/host/os/services/systemd.nix similarity index 100% rename from modules/common/core/system/os/services/systemd.nix rename to modules/base/common/host/os/services/systemd.nix diff --git a/modules/common/core/system/os/users/default.nix b/modules/base/common/host/os/users/default.nix similarity index 100% rename from modules/common/core/system/os/users/default.nix rename to modules/base/common/host/os/users/default.nix diff --git a/modules/common/core/system/os/users/isabel.nix b/modules/base/common/host/os/users/isabel.nix similarity index 100% rename from modules/common/core/system/os/users/isabel.nix rename to modules/base/common/host/os/users/isabel.nix diff --git a/modules/common/core/system/os/users/root.nix b/modules/base/common/host/os/users/root.nix similarity index 100% rename from modules/common/core/system/os/users/root.nix rename to modules/base/common/host/os/users/root.nix diff --git a/modules/common/core/system/security/auditd.nix b/modules/base/common/host/security/auditd.nix similarity index 100% rename from modules/common/core/system/security/auditd.nix rename to modules/base/common/host/security/auditd.nix diff --git a/modules/common/core/system/security/clamav.nix b/modules/base/common/host/security/clamav.nix similarity index 100% rename from modules/common/core/system/security/clamav.nix rename to modules/base/common/host/security/clamav.nix diff --git a/modules/common/core/system/security/default.nix b/modules/base/common/host/security/default.nix similarity index 100% rename from modules/common/core/system/security/default.nix rename to modules/base/common/host/security/default.nix diff --git a/modules/common/core/system/security/kernel.nix b/modules/base/common/host/security/kernel.nix similarity index 100% rename from modules/common/core/system/security/kernel.nix rename to modules/base/common/host/security/kernel.nix diff --git a/modules/common/core/system/security/pam.nix b/modules/base/common/host/security/pam.nix similarity index 100% rename from modules/common/core/system/security/pam.nix rename to modules/base/common/host/security/pam.nix diff --git a/modules/common/core/system/security/polkit.nix b/modules/base/common/host/security/polkit.nix similarity index 100% rename from modules/common/core/system/security/polkit.nix rename to modules/base/common/host/security/polkit.nix diff --git a/modules/common/core/system/security/sudo.nix b/modules/base/common/host/security/sudo.nix similarity index 100% rename from modules/common/core/system/security/sudo.nix rename to modules/base/common/host/security/sudo.nix diff --git a/modules/common/core/system/security/virtualization.nix b/modules/base/common/host/security/virtualization.nix similarity index 100% rename from modules/common/core/system/security/virtualization.nix rename to modules/base/common/host/security/virtualization.nix diff --git a/modules/common/core/system/smb/default.nix b/modules/base/common/host/smb/default.nix similarity index 100% rename from modules/common/core/system/smb/default.nix rename to modules/base/common/host/smb/default.nix diff --git a/modules/common/core/system/smb/recive/default.nix b/modules/base/common/host/smb/recive/default.nix similarity index 100% rename from modules/common/core/system/smb/recive/default.nix rename to modules/base/common/host/smb/recive/default.nix diff --git a/modules/common/core/system/smb/recive/general.nix b/modules/base/common/host/smb/recive/general.nix similarity index 100% rename from modules/common/core/system/smb/recive/general.nix rename to modules/base/common/host/smb/recive/general.nix diff --git a/modules/common/core/system/smb/recive/media.nix b/modules/base/common/host/smb/recive/media.nix similarity index 100% rename from modules/common/core/system/smb/recive/media.nix rename to modules/base/common/host/smb/recive/media.nix diff --git a/modules/common/core/system/virtualization/default.nix b/modules/base/common/host/virtualization/default.nix similarity index 100% rename from modules/common/core/system/virtualization/default.nix rename to modules/base/common/host/virtualization/default.nix diff --git a/modules/common/secrets/default.nix b/modules/base/common/secrets/default.nix similarity index 100% rename from modules/common/secrets/default.nix rename to modules/base/common/secrets/default.nix diff --git a/modules/common/secrets/secrets.yaml b/modules/base/common/secrets/secrets.yaml similarity index 100% rename from modules/common/secrets/secrets.yaml rename to modules/base/common/secrets/secrets.yaml diff --git a/modules/common/types/server/services/cloudflared/default.nix b/modules/base/common/services/cloudflared/default.nix similarity index 100% rename from modules/common/types/server/services/cloudflared/default.nix rename to modules/base/common/services/cloudflared/default.nix diff --git a/modules/common/types/server/services/containers/default.nix b/modules/base/common/services/containers/default.nix similarity index 100% rename from modules/common/types/server/services/containers/default.nix rename to modules/base/common/services/containers/default.nix diff --git a/modules/common/types/server/services/cyberchef/default.nix b/modules/base/common/services/cyberchef/default.nix similarity index 100% rename from modules/common/types/server/services/cyberchef/default.nix rename to modules/base/common/services/cyberchef/default.nix diff --git a/modules/common/types/server/services/databases/default.nix b/modules/base/common/services/databases/default.nix similarity index 100% rename from modules/common/types/server/services/databases/default.nix rename to modules/base/common/services/databases/default.nix diff --git a/modules/common/types/server/services/databases/mongodb/default.nix b/modules/base/common/services/databases/mongodb/default.nix similarity index 100% rename from modules/common/types/server/services/databases/mongodb/default.nix rename to modules/base/common/services/databases/mongodb/default.nix diff --git a/modules/common/types/server/services/databases/mysql/default.nix b/modules/base/common/services/databases/mysql/default.nix similarity index 100% rename from modules/common/types/server/services/databases/mysql/default.nix rename to modules/base/common/services/databases/mysql/default.nix diff --git a/modules/common/types/server/services/databases/postgresql/default.nix b/modules/base/common/services/databases/postgresql/default.nix similarity index 100% rename from modules/common/types/server/services/databases/postgresql/default.nix rename to modules/base/common/services/databases/postgresql/default.nix diff --git a/modules/common/types/server/services/databases/redis/default.nix b/modules/base/common/services/databases/redis/default.nix similarity index 100% rename from modules/common/types/server/services/databases/redis/default.nix rename to modules/base/common/services/databases/redis/default.nix diff --git a/modules/common/types/server/services/default.nix b/modules/base/common/services/default.nix similarity index 93% rename from modules/common/types/server/services/default.nix rename to modules/base/common/services/default.nix index e870a615c..0661bccf3 100644 --- a/modules/common/types/server/services/default.nix +++ b/modules/base/common/services/default.nix @@ -16,7 +16,5 @@ _: { ./photoprism ./vaultwarden ./wakatime - - ./defaults.nix ]; } diff --git a/modules/common/types/server/services/dns/adguard/default.nix b/modules/base/common/services/dns/adguard/default.nix similarity index 100% rename from modules/common/types/server/services/dns/adguard/default.nix rename to modules/base/common/services/dns/adguard/default.nix diff --git a/modules/common/types/server/services/dns/default.nix b/modules/base/common/services/dns/default.nix similarity index 100% rename from modules/common/types/server/services/dns/default.nix rename to modules/base/common/services/dns/default.nix diff --git a/modules/common/types/server/services/dns/nextdns/default.nix b/modules/base/common/services/dns/nextdns/default.nix similarity index 100% rename from modules/common/types/server/services/dns/nextdns/default.nix rename to modules/base/common/services/dns/nextdns/default.nix diff --git a/modules/common/types/server/services/forgejo/default.nix b/modules/base/common/services/forgejo/default.nix similarity index 100% rename from modules/common/types/server/services/forgejo/default.nix rename to modules/base/common/services/forgejo/default.nix diff --git a/modules/common/types/server/services/jellyfin/default.nix b/modules/base/common/services/jellyfin/default.nix similarity index 100% rename from modules/common/types/server/services/jellyfin/default.nix rename to modules/base/common/services/jellyfin/default.nix diff --git a/modules/common/types/server/services/mailserver/default.nix b/modules/base/common/services/mailserver/default.nix similarity index 100% rename from modules/common/types/server/services/mailserver/default.nix rename to modules/base/common/services/mailserver/default.nix diff --git a/modules/common/types/server/services/matrix/default.nix b/modules/base/common/services/matrix/default.nix similarity index 100% rename from modules/common/types/server/services/matrix/default.nix rename to modules/base/common/services/matrix/default.nix diff --git a/modules/common/types/server/services/miniflux/default.nix b/modules/base/common/services/miniflux/default.nix similarity index 100% rename from modules/common/types/server/services/miniflux/default.nix rename to modules/base/common/services/miniflux/default.nix diff --git a/modules/common/types/server/services/monitoring/default.nix b/modules/base/common/services/monitoring/default.nix similarity index 100% rename from modules/common/types/server/services/monitoring/default.nix rename to modules/base/common/services/monitoring/default.nix diff --git a/modules/common/types/server/services/monitoring/grafana/default.nix b/modules/base/common/services/monitoring/grafana/default.nix similarity index 100% rename from modules/common/types/server/services/monitoring/grafana/default.nix rename to modules/base/common/services/monitoring/grafana/default.nix diff --git a/modules/common/types/server/services/monitoring/prometheus/default.nix b/modules/base/common/services/monitoring/prometheus/default.nix similarity index 100% rename from modules/common/types/server/services/monitoring/prometheus/default.nix rename to modules/base/common/services/monitoring/prometheus/default.nix diff --git a/modules/common/types/server/services/nextcloud/default.nix b/modules/base/common/services/nextcloud/default.nix similarity index 100% rename from modules/common/types/server/services/nextcloud/default.nix rename to modules/base/common/services/nextcloud/default.nix diff --git a/modules/common/types/server/services/nginx/default.nix b/modules/base/common/services/nginx/default.nix similarity index 100% rename from modules/common/types/server/services/nginx/default.nix rename to modules/base/common/services/nginx/default.nix diff --git a/modules/common/types/server/services/photoprism/default.nix b/modules/base/common/services/photoprism/default.nix similarity index 100% rename from modules/common/types/server/services/photoprism/default.nix rename to modules/base/common/services/photoprism/default.nix diff --git a/modules/common/types/server/services/smb/default.nix b/modules/base/common/services/smb/default.nix similarity index 100% rename from modules/common/types/server/services/smb/default.nix rename to modules/base/common/services/smb/default.nix diff --git a/modules/common/types/server/services/vaultwarden/default.nix b/modules/base/common/services/vaultwarden/default.nix similarity index 100% rename from modules/common/types/server/services/vaultwarden/default.nix rename to modules/base/common/services/vaultwarden/default.nix diff --git a/modules/common/types/server/services/wakatime/config.nix b/modules/base/common/services/wakatime/config.nix similarity index 100% rename from modules/common/types/server/services/wakatime/config.nix rename to modules/base/common/services/wakatime/config.nix diff --git a/modules/common/types/server/services/wakatime/default.nix b/modules/base/common/services/wakatime/default.nix similarity index 100% rename from modules/common/types/server/services/wakatime/default.nix rename to modules/base/common/services/wakatime/default.nix diff --git a/modules/common/types/server/services/wakatime/module.nix b/modules/base/common/services/wakatime/module.nix similarity index 100% rename from modules/common/types/server/services/wakatime/module.nix rename to modules/base/common/services/wakatime/module.nix diff --git a/modules/options/default.nix b/modules/base/options/default.nix similarity index 100% rename from modules/options/default.nix rename to modules/base/options/default.nix diff --git a/modules/options/device/capabilities.nix b/modules/base/options/device/capabilities.nix similarity index 100% rename from modules/options/device/capabilities.nix rename to modules/base/options/device/capabilities.nix diff --git a/modules/options/device/default.nix b/modules/base/options/device/default.nix similarity index 100% rename from modules/options/device/default.nix rename to modules/base/options/device/default.nix diff --git a/modules/options/device/hardware.nix b/modules/base/options/device/hardware.nix similarity index 100% rename from modules/options/device/hardware.nix rename to modules/base/options/device/hardware.nix diff --git a/modules/options/programs/default.nix b/modules/base/options/programs/default.nix similarity index 100% rename from modules/options/programs/default.nix rename to modules/base/options/programs/default.nix diff --git a/modules/options/programs/defaults/default.nix b/modules/base/options/programs/defaults/default.nix similarity index 100% rename from modules/options/programs/defaults/default.nix rename to modules/base/options/programs/defaults/default.nix diff --git a/modules/options/programs/gaming.nix b/modules/base/options/programs/gaming.nix similarity index 100% rename from modules/options/programs/gaming.nix rename to modules/base/options/programs/gaming.nix diff --git a/modules/options/programs/per-program/bars.nix b/modules/base/options/programs/per-program/bars.nix similarity index 100% rename from modules/options/programs/per-program/bars.nix rename to modules/base/options/programs/per-program/bars.nix diff --git a/modules/options/programs/per-program/browsers.nix b/modules/base/options/programs/per-program/browsers.nix similarity index 100% rename from modules/options/programs/per-program/browsers.nix rename to modules/base/options/programs/per-program/browsers.nix diff --git a/modules/options/programs/per-program/default.nix b/modules/base/options/programs/per-program/default.nix similarity index 100% rename from modules/options/programs/per-program/default.nix rename to modules/base/options/programs/per-program/default.nix diff --git a/modules/options/programs/per-program/editors.nix b/modules/base/options/programs/per-program/editors.nix similarity index 100% rename from modules/options/programs/per-program/editors.nix rename to modules/base/options/programs/per-program/editors.nix diff --git a/modules/options/programs/per-program/fileManagers.nix b/modules/base/options/programs/per-program/fileManagers.nix similarity index 100% rename from modules/options/programs/per-program/fileManagers.nix rename to modules/base/options/programs/per-program/fileManagers.nix diff --git a/modules/options/programs/per-program/git.nix b/modules/base/options/programs/per-program/git.nix similarity index 100% rename from modules/options/programs/per-program/git.nix rename to modules/base/options/programs/per-program/git.nix diff --git a/modules/options/programs/per-program/launchers.nix b/modules/base/options/programs/per-program/launchers.nix similarity index 100% rename from modules/options/programs/per-program/launchers.nix rename to modules/base/options/programs/per-program/launchers.nix diff --git a/modules/options/programs/per-program/misc.nix b/modules/base/options/programs/per-program/misc.nix similarity index 100% rename from modules/options/programs/per-program/misc.nix rename to modules/base/options/programs/per-program/misc.nix diff --git a/modules/options/programs/per-program/terminals.nix b/modules/base/options/programs/per-program/terminals.nix similarity index 100% rename from modules/options/programs/per-program/terminals.nix rename to modules/base/options/programs/per-program/terminals.nix diff --git a/modules/options/services/default.nix b/modules/base/options/services/default.nix similarity index 100% rename from modules/options/services/default.nix rename to modules/base/options/services/default.nix diff --git a/modules/options/system/activation.nix b/modules/base/options/system/activation.nix similarity index 100% rename from modules/options/system/activation.nix rename to modules/base/options/system/activation.nix diff --git a/modules/options/system/boot.nix b/modules/base/options/system/boot.nix similarity index 100% rename from modules/options/system/boot.nix rename to modules/base/options/system/boot.nix diff --git a/modules/options/system/default.nix b/modules/base/options/system/default.nix similarity index 100% rename from modules/options/system/default.nix rename to modules/base/options/system/default.nix diff --git a/modules/options/system/emulation.nix b/modules/base/options/system/emulation.nix similarity index 100% rename from modules/options/system/emulation.nix rename to modules/base/options/system/emulation.nix diff --git a/modules/options/system/encryption.nix b/modules/base/options/system/encryption.nix similarity index 100% rename from modules/options/system/encryption.nix rename to modules/base/options/system/encryption.nix diff --git a/modules/options/system/networking.nix b/modules/base/options/system/networking.nix similarity index 100% rename from modules/options/system/networking.nix rename to modules/base/options/system/networking.nix diff --git a/modules/options/system/printing.nix b/modules/base/options/system/printing.nix similarity index 100% rename from modules/options/system/printing.nix rename to modules/base/options/system/printing.nix diff --git a/modules/options/system/security.nix b/modules/base/options/system/security.nix similarity index 100% rename from modules/options/system/security.nix rename to modules/base/options/system/security.nix diff --git a/modules/options/system/virtualization.nix b/modules/base/options/system/virtualization.nix similarity index 100% rename from modules/options/system/virtualization.nix rename to modules/base/options/system/virtualization.nix diff --git a/modules/options/themes/default.nix b/modules/base/options/themes/default.nix similarity index 100% rename from modules/options/themes/default.nix rename to modules/base/options/themes/default.nix diff --git a/modules/options/themes/gtk.nix b/modules/base/options/themes/gtk.nix similarity index 100% rename from modules/options/themes/gtk.nix rename to modules/base/options/themes/gtk.nix diff --git a/modules/options/themes/qt.nix b/modules/base/options/themes/qt.nix similarity index 100% rename from modules/options/themes/qt.nix rename to modules/base/options/themes/qt.nix diff --git a/modules/options/usrEnv/default.nix b/modules/base/options/usrEnv/default.nix similarity index 100% rename from modules/options/usrEnv/default.nix rename to modules/base/options/usrEnv/default.nix diff --git a/modules/common/core/default.nix b/modules/common/core/default.nix deleted file mode 100644 index 7a792d219..000000000 --- a/modules/common/core/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -_: { - imports = [ - ./gaming # super cool procrastinations related things - ./system # system configurations - ]; -} diff --git a/modules/common/types/desktop/default.nix b/modules/profiles/desktop/default.nix similarity index 100% rename from modules/common/types/desktop/default.nix rename to modules/profiles/desktop/default.nix diff --git a/modules/common/types/desktop/programs/default.nix b/modules/profiles/desktop/programs/default.nix similarity index 100% rename from modules/common/types/desktop/programs/default.nix rename to modules/profiles/desktop/programs/default.nix diff --git a/modules/common/types/desktop/programs/gaming.nix b/modules/profiles/desktop/programs/gaming.nix similarity index 100% rename from modules/common/types/desktop/programs/gaming.nix rename to modules/profiles/desktop/programs/gaming.nix diff --git a/modules/common/types/laptop/adb.nix b/modules/profiles/laptop/adb.nix similarity index 100% rename from modules/common/types/laptop/adb.nix rename to modules/profiles/laptop/adb.nix diff --git a/modules/common/types/laptop/default.nix b/modules/profiles/laptop/default.nix similarity index 100% rename from modules/common/types/laptop/default.nix rename to modules/profiles/laptop/default.nix diff --git a/modules/common/types/laptop/power/default.nix b/modules/profiles/laptop/power/default.nix similarity index 100% rename from modules/common/types/laptop/power/default.nix rename to modules/profiles/laptop/power/default.nix diff --git a/modules/common/types/laptop/power/plugged.nix b/modules/profiles/laptop/power/plugged.nix similarity index 100% rename from modules/common/types/laptop/power/plugged.nix rename to modules/profiles/laptop/power/plugged.nix diff --git a/modules/common/types/laptop/power/tlp.nix b/modules/profiles/laptop/power/tlp.nix similarity index 100% rename from modules/common/types/laptop/power/tlp.nix rename to modules/profiles/laptop/power/tlp.nix diff --git a/modules/common/types/laptop/programs/default.nix b/modules/profiles/laptop/programs/default.nix similarity index 100% rename from modules/common/types/laptop/programs/default.nix rename to modules/profiles/laptop/programs/default.nix diff --git a/modules/common/types/laptop/programs/gaming.nix b/modules/profiles/laptop/programs/gaming.nix similarity index 100% rename from modules/common/types/laptop/programs/gaming.nix rename to modules/profiles/laptop/programs/gaming.nix diff --git a/modules/common/types/laptop/touchpad.nix b/modules/profiles/laptop/touchpad.nix similarity index 100% rename from modules/common/types/laptop/touchpad.nix rename to modules/profiles/laptop/touchpad.nix diff --git a/modules/common/types/server/default.nix b/modules/profiles/server/default.nix similarity index 100% rename from modules/common/types/server/default.nix rename to modules/profiles/server/default.nix diff --git a/modules/common/types/server/programs/default.nix b/modules/profiles/server/programs/default.nix similarity index 100% rename from modules/common/types/server/programs/default.nix rename to modules/profiles/server/programs/default.nix diff --git a/modules/common/types/server/services/defaults.nix b/modules/profiles/server/services/default.nix similarity index 100% rename from modules/common/types/server/services/defaults.nix rename to modules/profiles/server/services/default.nix diff --git a/modules/common/types/server/system/default.nix b/modules/profiles/server/system/default.nix similarity index 100% rename from modules/common/types/server/system/default.nix rename to modules/profiles/server/system/default.nix diff --git a/modules/common/types/server/system/enviroment.nix b/modules/profiles/server/system/enviroment.nix similarity index 100% rename from modules/common/types/server/system/enviroment.nix rename to modules/profiles/server/system/enviroment.nix diff --git a/modules/common/types/server/system/systemd.nix b/modules/profiles/server/system/systemd.nix similarity index 100% rename from modules/common/types/server/system/systemd.nix rename to modules/profiles/server/system/systemd.nix diff --git a/modules/common/types/server/system/users/default.nix b/modules/profiles/server/system/users/default.nix similarity index 100% rename from modules/common/types/server/system/users/default.nix rename to modules/profiles/server/system/users/default.nix diff --git a/modules/common/types/server/system/users/git.nix b/modules/profiles/server/system/users/git.nix similarity index 100% rename from modules/common/types/server/system/users/git.nix rename to modules/profiles/server/system/users/git.nix diff --git a/modules/common/types/server/system/users/wakapi.nix b/modules/profiles/server/system/users/wakapi.nix similarity index 100% rename from modules/common/types/server/system/users/wakapi.nix rename to modules/profiles/server/system/users/wakapi.nix diff --git a/modules/common/types/workstation/default.nix b/modules/profiles/workstation/default.nix similarity index 100% rename from modules/common/types/workstation/default.nix rename to modules/profiles/workstation/default.nix diff --git a/modules/common/types/workstation/programs/ccache/default.nix b/modules/profiles/workstation/programs/ccache/default.nix similarity index 100% rename from modules/common/types/workstation/programs/ccache/default.nix rename to modules/profiles/workstation/programs/ccache/default.nix diff --git a/modules/common/types/workstation/programs/cli.nix b/modules/profiles/workstation/programs/cli.nix similarity index 100% rename from modules/common/types/workstation/programs/cli.nix rename to modules/profiles/workstation/programs/cli.nix diff --git a/modules/common/types/workstation/programs/default.nix b/modules/profiles/workstation/programs/default.nix similarity index 100% rename from modules/common/types/workstation/programs/default.nix rename to modules/profiles/workstation/programs/default.nix diff --git a/modules/common/types/workstation/programs/defaults.nix b/modules/profiles/workstation/programs/defaults.nix similarity index 100% rename from modules/common/types/workstation/programs/defaults.nix rename to modules/profiles/workstation/programs/defaults.nix diff --git a/modules/common/types/workstation/programs/flatpak/default.nix b/modules/profiles/workstation/programs/flatpak/default.nix similarity index 100% rename from modules/common/types/workstation/programs/flatpak/default.nix rename to modules/profiles/workstation/programs/flatpak/default.nix diff --git a/modules/common/types/workstation/programs/gui.nix b/modules/profiles/workstation/programs/gui.nix similarity index 100% rename from modules/common/types/workstation/programs/gui.nix rename to modules/profiles/workstation/programs/gui.nix diff --git a/modules/common/types/workstation/programs/xdg-ninja/default.nix b/modules/profiles/workstation/programs/xdg-ninja/default.nix similarity index 100% rename from modules/common/types/workstation/programs/xdg-ninja/default.nix rename to modules/profiles/workstation/programs/xdg-ninja/default.nix diff --git a/modules/common/types/workstation/programs/xdg-ninja/template.nix b/modules/profiles/workstation/programs/xdg-ninja/template.nix similarity index 100% rename from modules/common/types/workstation/programs/xdg-ninja/template.nix rename to modules/profiles/workstation/programs/xdg-ninja/template.nix diff --git a/modules/common/types/workstation/services/default.nix b/modules/profiles/workstation/services/default.nix similarity index 100% rename from modules/common/types/workstation/services/default.nix rename to modules/profiles/workstation/services/default.nix diff --git a/modules/common/types/workstation/services/gnome.nix b/modules/profiles/workstation/services/gnome.nix similarity index 100% rename from modules/common/types/workstation/services/gnome.nix rename to modules/profiles/workstation/services/gnome.nix diff --git a/modules/common/types/workstation/services/location.nix b/modules/profiles/workstation/services/location.nix similarity index 100% rename from modules/common/types/workstation/services/location.nix rename to modules/profiles/workstation/services/location.nix diff --git a/modules/common/types/workstation/services/login.nix b/modules/profiles/workstation/services/login.nix similarity index 100% rename from modules/common/types/workstation/services/login.nix rename to modules/profiles/workstation/services/login.nix diff --git a/modules/common/types/workstation/services/misc.nix b/modules/profiles/workstation/services/misc.nix similarity index 100% rename from modules/common/types/workstation/services/misc.nix rename to modules/profiles/workstation/services/misc.nix diff --git a/modules/common/types/workstation/services/printing.nix b/modules/profiles/workstation/services/printing.nix similarity index 100% rename from modules/common/types/workstation/services/printing.nix rename to modules/profiles/workstation/services/printing.nix diff --git a/modules/common/types/workstation/services/runners.nix b/modules/profiles/workstation/services/runners.nix similarity index 100% rename from modules/common/types/workstation/services/runners.nix rename to modules/profiles/workstation/services/runners.nix diff --git a/modules/common/types/workstation/services/tor.nix b/modules/profiles/workstation/services/tor.nix similarity index 100% rename from modules/common/types/workstation/services/tor.nix rename to modules/profiles/workstation/services/tor.nix diff --git a/modules/common/types/workstation/services/xserver.nix b/modules/profiles/workstation/services/xserver.nix similarity index 100% rename from modules/common/types/workstation/services/xserver.nix rename to modules/profiles/workstation/services/xserver.nix diff --git a/modules/common/types/workstation/system/default.nix b/modules/profiles/workstation/system/default.nix similarity index 100% rename from modules/common/types/workstation/system/default.nix rename to modules/profiles/workstation/system/default.nix diff --git a/modules/common/types/workstation/system/fonts.nix b/modules/profiles/workstation/system/fonts.nix similarity index 100% rename from modules/common/types/workstation/system/fonts.nix rename to modules/profiles/workstation/system/fonts.nix diff --git a/modules/common/types/workstation/system/misc.nix b/modules/profiles/workstation/system/misc.nix similarity index 100% rename from modules/common/types/workstation/system/misc.nix rename to modules/profiles/workstation/system/misc.nix