reorganized directory structure

17 files changed, 0 insertions, 888 deletions

diff --git a/modules/system/default.nix b/modules/system/default.nix
deleted file mode 100644
index cd7e8d6..0000000
--- a/modules/system/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./general-settings
-  ];
-}
diff --git a/modules/system/general-settings/default.nix b/modules/system/general-settings/default.nix
deleted file mode 100644
index 0001f5f..0000000
--- a/modules/system/general-settings/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, pkgs, lib, ... }: let
-  cfg = config.general-settings;
-in {
-  options.general-settings = {
-    hostname = lib.mkOption {
-      type = lib.types.str;
-      default = "nixos";
-      description = "system hostname";
-    };
-    locale = lib.mkOption {
-      type = lib.types.str;
-      default = "en_US.UTF-8";
-      description = "system locale";
-    };
-    timezone = lib.mkOption {
-      type = lib.types.str;
-      default = "America/New_York";
-      description = "system timezone";
-    };
-    stateVersion = lib.mkOption {
-      type = lib.types.str;
-      default = "24.11";
-      description = "nixos stateversion";
-    };
-  };
-  config = {
-    environment.systemPackages = [ pkgs.home-manager ];
-    system.stateVersion = cfg.stateVersion;
-    nixpkgs.config.allowUnfree = true;
-    networking.hostName = cfg.hostname;
-    time.timeZone = cfg.timezone;
-    i18n.defaultLocale = cfg.locale;
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = cfg.locale;
-      LC_IDENTIFICATION = cfg.locale;
-      LC_MEASUREMENT = cfg.locale;
-      LC_MONETARY = cfg.locale;
-      LC_NAME = cfg.locale;
-      LC_NUMERIC = cfg.locale;
-      LC_PAPER = cfg.locale;
-      LC_TELEPHONE = cfg.locale;
-      LC_TIME = cfg.locale;
-    };
-  };
-}
diff --git a/modules/user/aesthetics/default.nix b/modules/user/aesthetics/default.nix
deleted file mode 100644
index c49a198..0000000
--- a/modules/user/aesthetics/default.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.aesthetics;
-in {
-  imports = [
-    ./targets
-    ./themes
-  ];
-  options.aesthetics = {
-    enable = lib.mkEnableOption "aesthetics";
-    theme = lib.mkOption {
-      type = lib.types.str;
-      description = "The name of the theme to use.";
-      default = "oxocarbon";
-    };
-    hasGui = lib.mkOption {
-      type = lib.types.bool;
-      description = "Whether to theme gui apps. (can break if no gui)";
-      default = false;
-    };
-    enableAllTargets = lib.mkEnableOption "all targets";
-    wallpapersDir = lib.mkOption {
-      type = lib.types.path;
-      description = "Where to find wallpapers.";
-    };
-    wallpaper = lib.mkOption {
-      type = lib.types.path;
-      description = "Where to find the default wallpaper.";
-    };
-    font = {
-      name = lib.mkOption {
-        type = lib.types.str;
-        default = "CodeNewRoman Nerd Font";
-        description = "The font to use.";
-      };
-      package = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.nerd-fonts.code-new-roman;
-        description = "The font package to use.";
-      };
-      size = {
-        small = lib.mkOption {
-          type = lib.types.str;
-          default = "10";
-          description = "The size of the font to use for small text. (e.g. terminals)";
-        };
-        medium = lib.mkOption {
-          type = lib.types.str;
-          default = "14";
-          description = "The size of the font to use for medium text. (e.g. waybar)";
-        };
-        large = lib.mkOption {
-          type = lib.types.str;
-          default = "18";
-          description = "The size of the font to use for large text.";
-        };
-      };
-    };
-    scheme = let
-      mkHexOption = {}:
-        lib.mkOption {
-          type = lib.types.str;
-          default = "";
-          example = "ffffff";
-          description = "A hex color";
-        };
-    in {
-      base00 = mkHexOption {};
-      base01 = mkHexOption {};
-      base02 = mkHexOption {};
-      base03 = mkHexOption {};
-      base04 = mkHexOption {};
-      base05 = mkHexOption {};
-      base06 = mkHexOption {};
-      base07 = mkHexOption {};
-      base08 = mkHexOption {};
-      base09 = mkHexOption {};
-      base0A = mkHexOption {};
-      base0B = mkHexOption {};
-      base0C = mkHexOption {};
-      base0D = mkHexOption {};
-      base0E = mkHexOption {};
-      base0F = mkHexOption {};
-    };
-    opacity = lib.mkOption {
-      type = lib.types.float;
-      description = "Opacity";
-      default = 1.0;
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    aesthetics.themes.${cfg.theme}.enable = true;
-
-    home.packages = [cfg.font.package];
-    fonts.fontconfig.enable = true;
-  };
-}
diff --git a/modules/user/aesthetics/readme.md b/modules/user/aesthetics/readme.md
deleted file mode 100644
index 75588a2..0000000
--- a/modules/user/aesthetics/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Aesthetics
-
-My crappy custom nix module for managing:
-
-- Base16 colors
-- Window opacity
-- System font
-- Wallpapers
-
-## Structure
-
-- default.nix: Creates all main options to be set by modules in the themes dir. also configures the font and enables one theme.
-- themes/: Contains modules with sets of base16 colors and which set options in default.nix. These modules can contain direct configs for certain apps if the apps have poor base16 support, but they must obey the options set in the app's target module.
-- targets/: Contains modules configuring apps using base16 colors or just setting options to enable or disable the theming of an app.
-
diff --git a/modules/user/aesthetics/targets/default.nix b/modules/user/aesthetics/targets/default.nix
deleted file mode 100644
index 7dba76d..0000000
--- a/modules/user/aesthetics/targets/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ./mako.nix
-    ./zellij.nix
-    ./qutebrowser.nix
-    ./helix.nix
-    ./gtk.nix
-    ./foot.nix
-    ./vesktop.nix
-  ];
-}
diff --git a/modules/user/aesthetics/targets/foot.nix b/modules/user/aesthetics/targets/foot.nix
deleted file mode 100644
index c6c2283..0000000
--- a/modules/user/aesthetics/targets/foot.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ config, lib, ... }: let
-  cfg = config.aesthetics.targets.foot;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.foot.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = (aes.enableAllTargets && aes.hasGui);
-    description = "Whether to enable the aesthetics foot target.";
-  };
-  config = lib.mkIf (cfg.enable && config.programs.foot.enable) {
-    programs.foot.settings = {
-      main.font = "${aes.font.name}:size=${aes.font.size.small}";
-      tweak.font-monospace-warn = false;
-      colors = with aes.scheme; {
-        background = base00;
-        foreground = base05;
-
-        # normal
-        regular0 = base00;
-        regular1 = base08;
-        regular2 = base0B;
-        regular3 = base0A;
-        regular4 = base0D;
-        regular5 = base0E;
-        regular6 = base0C;
-        regular7 = base05;
-
-        # bright
-        bright0 = base03;
-        bright1 = base09;
-        bright2 = base01;
-        bright3 = base02;
-        bright4 = base04;
-        bright5 = base06;
-        bright6 = base0F;
-        bright7 = base07;
-
-        # extended
-        "16" = base09;
-        "17" = base0F;
-        "18" = base01;
-        "19" = base02;
-        "20" = base04;
-        "21" = base06;
-
-        # misc
-        selection-background = base05;
-        selection-foreground = base00;
-        urls = base04;
-        jump-labels = "${base00} ${base0A}";
-        scrollback-indicator = "${base00} ${base04}";
-      };
-    };
-  };
-}
diff --git a/modules/user/aesthetics/targets/gtk.nix b/modules/user/aesthetics/targets/gtk.nix
deleted file mode 100644
index 795365d..0000000
--- a/modules/user/aesthetics/targets/gtk.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  cfg = config.aesthetics.targets.gtk;
-  aes = config.aesthetics;
-
-  gtkCSS = with aes.scheme; ''
-    @define-color accent_color #${base0D};
-    @define-color accent_bg_color #${base0D};
-    @define-color accent_fg_color #${base00};
-    @define-color destructive_color #${base08};
-    @define-color destructive_bg_color #${base08};
-    @define-color destructive_fg_color #${base00};
-    @define-color success_color #${base0B};
-    @define-color success_bg_color #${base0B};
-    @define-color success_fg_color #${base00};
-    @define-color warning_color #${base0E};
-    @define-color warning_bg_color #${base0E};
-    @define-color warning_fg_color #${base00};
-    @define-color error_color #${base08};
-    @define-color error_bg_color #${base08};
-    @define-color error_fg_color #${base00};
-    @define-color window_bg_color #${base00};
-    @define-color window_fg_color #${base05};
-    @define-color view_bg_color #${base00};
-    @define-color view_fg_color #${base05};
-    @define-color headerbar_bg_color #${base01};
-    @define-color headerbar_fg_color #${base05};
-    @define-color headerbar_border_color #${base01};
-    @define-color headerbar_backdrop_color @window_bg_color;
-    @define-color headerbar_shade_color rgba(0, 0, 0, 0.07);
-    @define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.07);
-    @define-color sidebar_bg_color #${base01};
-    @define-color sidebar_fg_color #${base05};
-    @define-color sidebar_backdrop_color @window_bg_color;
-    @define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
-    @define-color secondary_sidebar_bg_color @sidebar_bg_color;
-    @define-color secondary_sidebar_fg_color @sidebar_fg_color;
-    @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
-    @define-color secondary_sidebar_shade_color @sidebar_shade_color;
-    @define-color card_bg_color #${base01};
-    @define-color card_fg_color #${base05};
-    @define-color card_shade_color rgba(0, 0, 0, 0.07);
-    @define-color dialog_bg_color #${base01};
-    @define-color dialog_fg_color #${base05};
-    @define-color popover_bg_color #${base01};
-    @define-color popover_fg_color #${base05};
-    @define-color popover_shade_color rgba(0, 0, 0, 0.07);
-    @define-color shade_color rgba(0, 0, 0, 0.07);
-    @define-color scrollbar_outline_color #${base02};
-    @define-color blue_1 #${base0D};
-    @define-color blue_2 #${base0D};
-    @define-color blue_3 #${base0D};
-    @define-color blue_4 #${base0D};
-    @define-color blue_5 #${base0D};
-    @define-color green_1 #${base0B};
-    @define-color green_2 #${base0B};
-    @define-color green_3 #${base0B};
-    @define-color green_4 #${base0B};
-    @define-color green_5 #${base0B};
-    @define-color yellow_1 #${base0A};
-    @define-color yellow_2 #${base0A};
-    @define-color yellow_3 #${base0A};
-    @define-color yellow_4 #${base0A};
-    @define-color yellow_5 #${base0A};
-    @define-color orange_1 #${base09};
-    @define-color orange_2 #${base09};
-    @define-color orange_3 #${base09};
-    @define-color orange_4 #${base09};
-    @define-color orange_5 #${base09};
-    @define-color red_1 #${base08};
-    @define-color red_2 #${base08};
-    @define-color red_3 #${base08};
-    @define-color red_4 #${base08};
-    @define-color red_5 #${base08};
-    @define-color purple_1 #${base0E};
-    @define-color purple_2 #${base0E};
-    @define-color purple_3 #${base0E};
-    @define-color purple_4 #${base0E};
-    @define-color purple_5 #${base0E};
-    @define-color brown_1 #${base0F};
-    @define-color brown_2 #${base0F};
-    @define-color brown_3 #${base0F};
-    @define-color brown_4 #${base0F};
-    @define-color brown_5 #${base0F};
-    @define-color light_1 #${base01};
-    @define-color light_2 #${base01};
-    @define-color light_3 #${base01};
-    @define-color light_4 #${base01};
-    @define-color light_5 #${base01};
-    @define-color dark_1 #${base01};
-    @define-color dark_2 #${base01};
-    @define-color dark_3 #${base01};
-    @define-color dark_4 #${base01};
-    @define-color dark_5 #${base01};
-  '';
-in {
-  options.aesthetics.targets.gtk.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = aes.enableAllTargets && aes.hasGui;
-    description = "Whether to enable the aesthetics GTK target.";
-  };
-  config = lib.mkIf cfg.enable {
-    gtk = {
-      enable = true;
-      theme = {
-        package = pkgs.adw-gtk3;
-        name = "adw-gtk3";
-      };
-    };
-    xdg.configFile = {
-      "gtk-3.0/gtk.css".text = gtkCSS;
-      "gtk-4.0/gtk.css".text = gtkCSS;
-    };
-  };
-}
diff --git a/modules/user/aesthetics/targets/helix.nix b/modules/user/aesthetics/targets/helix.nix
deleted file mode 100644
index dde557e..0000000
--- a/modules/user/aesthetics/targets/helix.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, lib, ... }: let
-  cfg = config.aesthetics.targets.helix;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.helix = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = aes.enableAllTargets;
-      description = "Whether to enable the aesthetics helix target.";
-    };
-    theme = lib.mkOption {
-      type = lib.types.str;
-      default = "default";
-      description = "The name of the theme to use for helix.";
-    };
-  };
-  config = lib.mkIf (cfg.enable && config.programs.helix.enable) {
-    programs.helix.settings.theme = "custom-default";
-    home.file."helix-theme" = {
-      target = ".config/helix/themes/custom-default.toml";
-      text = /*toml*/ ''
-        inherits = "${cfg.theme}"
-        "ui.background" = { }
-        "ui.statusline" = { bg = "" }
-      '';
-    };
-  };
-}
diff --git a/modules/user/aesthetics/targets/mako.nix b/modules/user/aesthetics/targets/mako.nix
deleted file mode 100644
index 2ade32e..0000000
--- a/modules/user/aesthetics/targets/mako.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.aesthetics.targets.mako;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.mako.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = aes.enableAllTargets && aes.hasGui;
-    description = "Whether to enable the aesthetics mako target.";
-  };
-  config = lib.mkIf (cfg.enable && config.services.mako.enable) {
-    services.mako.settings = with aes.scheme; {
-      background-color = "#${base00}";
-      border-color = "#${base0C}";
-      text-color = "#${base05}";
-      progress-color = "over #${base02}";
-      font = "${aes.font.name} ${aes.font.size.small}";
-    };
-  };
-}
diff --git a/modules/user/aesthetics/targets/qutebrowser.nix b/modules/user/aesthetics/targets/qutebrowser.nix
deleted file mode 100644
index ef7f17d..0000000
--- a/modules/user/aesthetics/targets/qutebrowser.nix
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.aesthetics.targets.qutebrowser;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.qutebrowser.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = aes.enableAllTargets && aes.hasGui;
-    description = "Whether to enable the aesthetics qutebrowser target.";
-  };
-  config = lib.mkIf (cfg.enable && config.programs.qutebrowser.enable) {
-    programs.qutebrowser.settings = {
-      fonts = {
-        default_family = aes.font.name;
-        default_size = "${aes.font.size.small}pt";
-      };
-      colors = with aes.scheme; let
-        background = "#${base00}";
-        secondary-background = "#${base01}";
-        selection-background = "#${base03}";
-        foreground = "#${base05}";
-        inverted-foreground = "#${base00}";
-        error = "#${base08}";
-        info = "#${base0B}";
-        secondary-info = "#${base0C}";
-        warning = "#${base0E}";
-      in {
-        completion = {
-          category = {
-            bg = background;
-            fg = info;
-            border = {
-              bottom = background;
-              top = background;
-            };
-          };
-          even.bg = background;
-          fg = foreground;
-          item.selected = {
-            bg = selection-background;
-            border = {
-              bottom = selection-background;
-              top = selection-background;
-            };
-            fg = foreground;
-          };
-          match.fg = info;
-          odd.bg = secondary-background;
-          scrollbar = {
-            bg = background;
-            fg = foreground;
-          };
-        };
-        contextmenu = {
-          disabled = {
-            bg = secondary-background;
-            fg = inverted-foreground;
-          };
-          menu = {
-            bg = background;
-            fg = foreground;
-          };
-          selected = {
-            bg = selection-background;
-            fg = foreground;
-          };
-        };
-        downloads = {
-          bar.bg = background;
-          error = {
-            bg = error;
-            fg = inverted-foreground;
-          };
-          start = {
-            bg = info;
-            fg = inverted-foreground;
-          };
-          stop = {
-            bg = secondary-info;
-            fg = inverted-foreground;
-          };
-        };
-        hints = {
-          bg = secondary-background;
-          fg = foreground;
-          match.fg = info;
-        };
-        keyhint = {
-          bg = background;
-          fg = foreground;
-          suffix.fg = foreground;
-        };
-        messages = {
-          error = {
-            bg = error;
-            fg = inverted-foreground;
-            border = error;
-          };
-          info = {
-            bg = info;
-            fg = inverted-foreground;
-            border = info;
-          };
-          warning = {
-            bg = warning;
-            fg = inverted-foreground;
-            border = warning;
-          };
-        };
-        prompts = {
-          bg = background;
-          border = background;
-          fg = foreground;
-          selected.bg = secondary-background;
-        };
-        statusbar = {
-          caret = {
-            bg = selection-background;
-            fg = foreground;
-            selection = {
-              bg = selection-background;
-              fg = foreground;
-            };
-          };
-          command = {
-            bg = background;
-            fg = foreground;
-            private = {
-              bg = secondary-background;
-              fg = foreground;
-            };
-          };
-          insert = {
-            bg = info;
-            fg = inverted-foreground;
-          };
-          normal = {
-            bg = background;
-            fg = foreground;
-          };
-          passthrough = {
-            bg = info;
-            fg = inverted-foreground;
-          };
-          private = {
-            bg = secondary-background;
-            fg = foreground;
-          };
-          progress.bg = info;
-          url = {
-            error.fg = error;
-            fg = foreground;
-            hover.fg = foreground;
-            success = {
-              http.fg = secondary-info;
-              https.fg = info;
-            };
-            warn.fg = warning;
-          };
-        };
-        tabs = {
-          bar.bg = background;
-          even = {
-            bg = secondary-background;
-            fg = foreground;
-          };
-          indicator = {
-            inherit error;
-            start = secondary-info;
-            stop = info;
-          };
-          odd = {
-            bg = background;
-            fg = foreground;
-          };
-          pinned = {
-            even = {
-              bg = info;
-              fg = inverted-foreground;
-            };
-            odd = {
-              bg = secondary-info;
-              fg = inverted-foreground;
-            };
-            selected = {
-              even = {
-                bg = selection-background;
-                fg = foreground;
-              };
-              odd = {
-                bg = selection-background;
-                fg = foreground;
-              };
-            };
-          };
-          selected = {
-            even = {
-              bg = selection-background;
-              fg = foreground;
-            };
-            odd = {
-              bg = selection-background;
-              fg = foreground;
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/user/aesthetics/targets/vesktop.nix b/modules/user/aesthetics/targets/vesktop.nix
deleted file mode 100644
index 968df1a..0000000
--- a/modules/user/aesthetics/targets/vesktop.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, lib, ... }: let
-  cfg = config.aesthetics.targets.vesktop;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.vesktop.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = (aes.enableAllTargets && aes.hasGui);
-    description = "Whether to enable the aesthetics vesktop target.";
-  };
-  config = lib.mkIf cfg.enable { 
-    xdg.configFile."vesktop/themes/stylix.theme.css".text = with aes.scheme; ''
-      :root {
-        --base00: #${base00}; /* Black */
-        --base01: #${base01}; /* Bright Black */
-        --base02: #${base02}; /* Grey */
-        --base03: #${base03}; /* Brighter Grey */
-        --base04: #${base04}; /* Bright Grey */
-        --base05: #${base05}; /* White */
-        --base06: #${base06}; /* Brighter White */
-        --base07: #${base07}; /* Bright White */
-        --base08: #${base08}; /* Red */
-        --base09: #${base09}; /* Orange */
-        --base0A: #${base0A}; /* Yellow */
-        --base0B: #${base0B}; /* Green */
-        --base0C: #${base0C}; /* Cyan */
-        --base0D: #${base0D}; /* Blue */
-        --base0E: #${base0E}; /* Purple */
-        --base0F: #${base0F}; /* Magenta */
-
-        --primary-630: var(--base00); /* Autocomplete background */
-        --primary-660: var(--base00); /* Search input background */
-      }
-
-      .theme-light, .theme-dark {
-        --search-popout-option-fade: none; /* Disable fade for search popout */
-        --bg-overlay-2: var(--base00); /* These 2 are needed for proper threads coloring */
-        --home-background: var(--base00);
-        --bg-overlay-chat : var(--base00); /* Recolor forum channels */
-        --background-primary: var(--base00);
-        --background-secondary: var(--base01);
-        --background-secondary-alt: var(--base01);
-        --channeltextarea-background: var(--base01);
-        --background-tertiary: var(--base00);
-        --background-accent: var(--base0E);
-        --background-floating: var(--base01);
-        --background-modifier-hover: #{{base00-hex}}4c; /* 30% of base00 */
-        --background-modifier-selected: var(--base00);
-        --text-normal: var(--base05);
-        --text-secondary: var(--base03);
-        --text-muted: var(--base04);
-        --text-link: var(--base0C);
-        --interactive-normal: var(--base05);
-        --interactive-hover: var(--base05);
-        --interactive-active: var(--base07);
-        --interactive-muted: var(--base03);
-        --channels-default: var(--base04);
-        --channel-icon: var(--base04);
-        --header-primary: var(--base06);
-        --header-secondary: var(--base04);
-        --scrollbar-thin-track: transparent;
-        --scrollbar-auto-track: transparent;
-      }
-    '';
-  };
-}
diff --git a/modules/user/aesthetics/targets/zellij.nix b/modules/user/aesthetics/targets/zellij.nix
deleted file mode 100644
index cefd8ab..0000000
--- a/modules/user/aesthetics/targets/zellij.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, lib, ... }: let
-  cfg = config.aesthetics.targets.zellij;
-  aes = config.aesthetics;
-in {
-  options.aesthetics.targets.zellij.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = aes.enableAllTargets;
-    description = "Whether to enable the aesthetics zellij target.";
-  };
-  config = lib.mkIf (cfg.enable && config.programs.zellij.enable) { 
-    programs.zellij.settings = {
-      theme = "base16";
-      themes.base16 = with aes.scheme; {
-        bg = "#${base03}";
-        fg = "#${base05}";
-        red = "#${base08}";
-        green = "#${base0B}";
-        blue = "#${base0D}";
-        yellow = "#${base0A}";
-        magenta = "#${base0E}";
-        orange = "#${base09}";
-        cyan = "#${base0C}";
-        black = "#${base00}";
-        white = "#${base07}";
-      };
-    };
-  };
-}
diff --git a/modules/user/aesthetics/themes/default.nix b/modules/user/aesthetics/themes/default.nix
deleted file mode 100644
index cc5ebdb..0000000
--- a/modules/user/aesthetics/themes/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  imports = [
-    ./oxocarbon
-  ];
-}
diff --git a/modules/user/aesthetics/themes/oxocarbon/default.nix b/modules/user/aesthetics/themes/oxocarbon/default.nix
deleted file mode 100644
index 2c6ee6e..0000000
--- a/modules/user/aesthetics/themes/oxocarbon/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: let
-  cfg = config.aesthetics.themes.oxocarbon;
-  wallpapers = inputs.wallpapers.packages.${pkgs.system}.default;
-in {
-  options.aesthetics.themes.oxocarbon.enable = lib.mkEnableOption "oxocarbon theme";
-  config = lib.mkMerge [
-    (
-      lib.mkIf cfg.enable {
-        aesthetics = {
-          wallpaper = "${wallpapers}/neutral/landscape/salt-flats.jpg";
-          wallpapersDir = "${wallpapers}/neutral";
-          scheme = {
-            base00 = "161616";
-            base01 = "262626";
-            base02 = "393939";
-            base03 = "525252";
-            base04 = "dde1e6";
-            base05 = "f2f4f8";
-            base06 = "ffffff";
-            base07 = "08bdba";
-            base08 = "3ddbd9";
-            base09 = "78a9ff";
-            base0A = "ee5396";
-            base0B = "33b1ff";
-            base0C = "ff7eb6";
-            base0D = "42be65";
-            base0E = "be95ff";
-            base0F = "82cfff";
-          };
-          font = {
-            name = "CodeNewRoman Nerd Font";
-            package = pkgs.nerd-fonts.code-new-roman;
-          };
-          # font = {
-          #   name = "Kirsch Nerd Font";
-          #   size = "22";
-          #   package = inputs.kirsch.packages.x86_64-linux.kirsch-nerd;
-          # };
-        };
-        # home.pointerCursor = {
-        #   package = pkgs.oreo-cursors-plus;
-        #   name = "oreo_spark_black_bordered_cursors";
-        #   size = 22;
-        # };
-        home.pointerCursor = {
-          package = pkgs.qogir-icon-theme;
-          name = "Qogir-Dark";
-          size = 22;
-        };
-      }
-    )
-    (
-      lib.mkIf config.aesthetics.targets.helix.enable {
-        aesthetics.targets.helix.theme = "oxocarbon";
-        home.file."helix-oxocarbon-theme" = {
-          target = ".config/helix/themes/oxocarbon.toml";
-          source = ./helix-theme.toml;
-        };
-      }
-    )
-  ];
-}
diff --git a/modules/user/aesthetics/themes/oxocarbon/helix-theme.toml b/modules/user/aesthetics/themes/oxocarbon/helix-theme.toml
deleted file mode 100644
index 8cf3c49..0000000
--- a/modules/user/aesthetics/themes/oxocarbon/helix-theme.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-# inherits = "fleet_dark"
-
-"attribute" = { fg = "#82cfff" }
-"type" = { fg = "#78a9ff" }
-"type.builtin" = { fg = "#dde1e6" }
-"constructor" = { fg = "#78a9ff" }
-"constant" = { fg = "#be95ff" }
-"constant.builtin" = { fg = "#08bdba" }
-"constant.builtin.character" = { fg = "#be95ff" }
-"constant.builtin.numeric" = { fg = "#82cfff" }
-"string" = { fg = "#be95ff" }
-"string.regexp" = { fg = "#08bdba" }
-"comment" = { fg = "#525252" }
-"variable" = { fg = "#dde1e6" }
-"label" = { fg = "#82cfff" }
-"punctuation" = { fg = "#3ddbd9" }
-"keyword" = { fg = "#78a9ff" }
-"keyword.control.exception" = { fg = "#82cfff" }
-"keyword.operator" = { fg = "#3ddbd9" }
-"keyword.function" = { fg = "#3ddbd9" }
-"operator" = { fg = "#78a9ff" }
-"function" = { fg = "#ff7eb6" }
-"function.builtin" = { fg = "#ff7eb6" }
-"function.method" = { fg = "#08bdba" }
-"function.macro" = { fg = "#08bdba" }
-"tag" = { fg = "#dde1e6" }
-"namespace" = { fg = "#dde1e6" }
-"diff.plus" = { fg = "#42be65", bg = "#393939" }
-"diff.minus" = { fg = "#78a9ff", bg = "#393939" }
-"diff.delta" = { fg = "#dde1e6", bg = "#262626" }
-
-"ui.background" = { fg= "#ffffff", bg = "#161616"}
-"ui.separator" = "#161616"
-"ui.selection" = { bg = "#393939"}
-"ui.text" = { fg = "#ffffff" }
-"ui.cursor" = { fg = "#161616", bg = "#dde1e6" }
-"ui.cursor.normal" = { fg = "#dde1e6", bg = "#161616" }
-"ui.linenr" = { fg = "#525252", bg = "#161616" }
-"ui.linenr.selected" = { fg = "#dde1e6" }
-"ui.statusline" = { fg = "#ffffff", bg = "#161616" }
-"ui.statusline.inactive" = { fg = "#525252"}
-"ui.statusline.normal" = { fg = "#ffffff", bg = "#161616" }
-"ui.statusline.insert" = { fg = "#ffffff", bg = "#ff7eb6" }
-"ui.popup" = { fg = "#ffffff", bg = "#262626" }
-"ui.window" = { fg = "#ffffff", bg = "#262626" }
-"ui.menu" = { fg = "#ffffff", bg = "#262626" }
-"ui.menu.selected" = { fg = "#ffffff", bg = "#525252" }
-"diagnostic.error" = { fg = "#b3b3b3", bg = "#262626", underline = { color = "#ff0000", style = "curl"} }
-"diagnostic.warning" = { fg = "#b3b3b3", bg = "#262626", underline = { color = "#ff6f00", style = "curl"} }
-"error" = { fg = "#ffffff", bg = "#262626" }
-"warning" = { fg = "#ffffff", bg = "#262626" }
diff --git a/modules/user/default-apps.nix b/modules/user/default-apps.nix
deleted file mode 100644
index 7ec2b16..0000000
--- a/modules/user/default-apps.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, lib, ... }: 
-let
-  cfg = config.default-applications;
-  mkCommand = name: lib.mkOption {
-    type = lib.types.str;
-    default = "";
-    description = "The default ${name}.";
-  };
-  mkDesktopFile = name: lib.mkOption {
-    type = lib.types.str;
-    default = "";
-    description = "The default ${name}'s .desktop file";
-  };
-in {
-  options.default-applications = {
-    web-browser = {
-      command = mkCommand "web browser";
-      desktop-file = mkDesktopFile "web browser";
-    };
-    text-editor = {
-      command = mkCommand "text editor";
-      desktop-file = mkDesktopFile "text editor";
-    };
-    image-viewer = {
-      command = mkCommand "image viewer";
-      desktop-file = mkDesktopFile "image viewer";
-    };
-    video-viewer = {
-      command = mkCommand "video viewer";
-      desktop-file = mkDesktopFile "video viewer";
-    };
-    terminal-emulator = {
-      command = mkCommand "terminal emulator";
-      runTuiCommand = mkCommand "terminal emulator run tui command";
-      runCliCommand = mkCommand "terminal emulator run cli command";
-      desktop-file = mkDesktopFile "terminal emulator";
-    };
-  };
-  config = {
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "text/plain" = [ cfg.text-editor.desktop-file ];
-        "text/html" = [ cfg.text-editor.desktop-file ];
-        "text/nix" = [ cfg.text-editor.desktop-file ];
-      };
-    };
-  };
-}
diff --git a/modules/user/default.nix b/modules/user/default.nix
deleted file mode 100644
index 104148e..0000000
--- a/modules/user/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./aesthetics
-    ./default-apps.nix
-  ];
-}