From 68d03fe362b7e0df11662d8d6a1e01eac0bfae77 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Wed, 17 Sep 2025 22:07:16 -0400
Subject: refactor: remove modules folder, fully split home and system modules

---
 home/default.nix | 209 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 97 insertions(+), 112 deletions(-)

(limited to 'home/default.nix')

diff --git a/home/default.nix b/home/default.nix
index 1b4f909..6ea1b04 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,138 +3,123 @@
   config,
   pkgs,
   inputs,
-  system,
   ...
 }: let
   inherit (lib) optionals;
 in {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
+    ./apps
+    ./browsers
+    ./desktops
     ./gtk
     ./neovim
     ./ssh
     ./tmux
     ./zsh
+    ./development.nix
     ./git.nix
     ./gpg.nix
     ./starship.nix
   ];
 
-  # use system packages in home manager
-  home-manager.useGlobalPkgs = true;
-
-  # install user packages to /etc/profiles and not home directory
-  home-manager.useUserPackages = true;
-
-  home-manager.users.root = {
-    home.stateVersion = config.stateVersion;
-  };
-
-  home-manager.users.${config.user} = {
-    home.username = config.user;
-    home.homeDirectory = config.homePath;
-    home.stateVersion = config.stateVersion;
-
-    news.display = "silent";
-    fonts.fontconfig.enable = true;
-
-    home.packages =
-      (with pkgs; [
-        home-manager
-        pfetch-rs
-        yt-dlp
-      ])
-      ++ [
-        inputs.talc.packages.${system}.talc
-      ]
-      ++ (with pkgs;
-        optionals config.desktops.enable [
-          # social
-          discord
-          element-desktop
-          gajim
-          thunderbird-latest
-          # programs
-          brightnessctl
-          easyeffects
-          filezilla
-          gimp3
-          imv
-          mpv
-          pavucontrol
-          vlc
-          zathura
-          # media
-          ffmpeg
-          imagemagick
-        ]);
-
-    xdg.configFile = {
-      "aacs/keydb.cfg" = {
-        source = ../files/keys/bluray.cfg;
-      };
+  home.username = config.user;
+  home.homeDirectory = config.homePath;
+  home.stateVersion = config.stateVersion;
+
+  news.display = "silent";
+  fonts.fontconfig.enable = true;
+
+  home.packages =
+    (with pkgs; [
+      home-manager
+      pfetch-rs
+      yt-dlp
+    ])
+    ++ [
+      inputs.talc.packages.${pkgs.system}.talc
+    ]
+    ++ (with pkgs;
+      optionals config.desktops.enable [
+        # social
+        discord
+        element-desktop
+        gajim
+        thunderbird-latest
+        # programs
+        brightnessctl
+        easyeffects
+        filezilla
+        gimp3
+        imv
+        mpv
+        pavucontrol
+        vlc
+        zathura
+        # media
+        ffmpeg
+        imagemagick
+      ]);
+
+  xdg.configFile = {
+    "aacs/keydb.cfg" = {
+      source = ../files/keys/bluray.cfg;
     };
+  };
 
-    xdg.dataFile = {
-      fonts = {
-        source = ../files/fonts;
-        recursive = true;
-      };
-    };
-
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        # web
-        "text/html" = "firefox.desktop";
-        "x-scheme-handler/http" = "firefox.desktop";
-        "x-scheme-handler/https" = "firefox.desktop";
-        "x-scheme-handler/about" = "firefox.desktop";
-        "x-scheme-handler/unknown" = "firefox.desktop";
-
-        # images
-        "image/png" = "imv.desktop";
-        "image/jpeg" = "imv.desktop";
-        "image/webp" = "imv.desktop";
-        "image/tga" = "imv.desktop";
-        "image/bmp" = "imv.desktop";
-        "image/gif" = "imv.desktop";
-
-        # audio video
-        "video/mp4" = "mpv.desktop";
-        "video/x-msvideo" = "mpv.desktop";
-        "video/mkv" = "mpv.desktop";
-        "video/webm" = "mpv.desktop";
-        "audio/mp3" = "mpv.desktop";
-        "audio/wav" = "mpv.desktop";
-
-        # other
-        "application/pdf" = "org.pwmt.zathura.desktop";
-        "x-scheme-handler/mspa" = "unofficial-homestuck-collection.desktop";
-        "x-scheme-handler/discord" = "discord.desktop";
-        "x-scheme-handler/roblox-player" = "org.vinegarhq.Sober.desktop";
-      };
-    };
-
-    xdg.userDirs = {
-      enable = true;
-      createDirectories = false;
-
-      desktop = "${config.homePath}/desktop";
-      documents = "${config.homePath}/documents";
-      download = "${config.homePath}/downloads";
-      music = "${config.homePath}/music";
-      pictures = "${config.homePath}/pictures";
-      publicShare = "${config.homePath}";
-      templates = "${config.homePath}";
-      videos = "${config.homePath}/videos";
+  xdg.dataFile = {
+    fonts = {
+      source = ../files/fonts;
+      recursive = true;
     };
+  };
 
-    gtk = {
-      enable = true;
-      gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      # web
+      "text/html" = "firefox.desktop";
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/about" = "firefox.desktop";
+      "x-scheme-handler/unknown" = "firefox.desktop";
+
+      # images
+      "image/png" = "imv.desktop";
+      "image/jpeg" = "imv.desktop";
+      "image/webp" = "imv.desktop";
+      "image/tga" = "imv.desktop";
+      "image/bmp" = "imv.desktop";
+      "image/gif" = "imv.desktop";
+
+      # audio video
+      "video/mp4" = "mpv.desktop";
+      "video/x-msvideo" = "mpv.desktop";
+      "video/mkv" = "mpv.desktop";
+      "video/webm" = "mpv.desktop";
+      "audio/mp3" = "mpv.desktop";
+      "audio/wav" = "mpv.desktop";
+
+      # other
+      "application/pdf" = "org.pwmt.zathura.desktop";
+      "x-scheme-handler/mspa" = "unofficial-homestuck-collection.desktop";
+      "x-scheme-handler/discord" = "discord.desktop";
+      "x-scheme-handler/roblox-player" = "org.vinegarhq.Sober.desktop";
     };
+  };
 
-    programs.home-manager.enable = true;
+  xdg.userDirs = {
+    enable = true;
+    createDirectories = false;
+
+    desktop = "${config.homePath}/desktop";
+    documents = "${config.homePath}/documents";
+    download = "${config.homePath}/downloads";
+    music = "${config.homePath}/music";
+    pictures = "${config.homePath}/pictures";
+    publicShare = "${config.homePath}";
+    templates = "${config.homePath}";
+    videos = "${config.homePath}/videos";
   };
+
+  programs.home-manager.enable = true;
 }
-- 
cgit v1.2.3-freya