refactor

1 files changed, 49 insertions, 71 deletions

diff --git a/home/default.nix b/home/default.nix
index 8561236..4cdc894 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,11 +1,22 @@
 {
+  lib,
   config,
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  inherit (lib) optionals;
+  system = pkgs.stdenv.hostPlatform.system;
+in {
   imports = [
     inputs.home-manager.nixosModules.home-manager
+    ./neovim
+    ./ssh
+    ./tmux
+    ./zsh
+    ./git.nix
+    ./gpg.nix
+    ./starship.nix
   ];
 
   home-manager.users.${config.user} = {
@@ -15,76 +26,43 @@
     news.display = "silent";
     fonts.fontconfig.enable = true;
 
-    home.packages = with pkgs; [
-      # nix
-      home-manager
-      # c / c++
-      clang-tools
-      gcc
-      gdb
-      gnumake
-      nasm
-      pkg-config
-      # rust
-      rustc
-      rustfmt
-      rust-analyzer
-      cargo
-      clippy
-      # zig
-      zig
-      zls
-      # java/kotlin
-      gradle
-      jdk
-      jdt-language-server
-      kotlin
-      kotlin-language-server
-      maven
-      # gtk
-      adwaita-icon-theme
-      orchis-theme
-      # media
-      ffmpeg
-      libaacs
-      libavif
-      libbluray
-      libjxl
-      # wayland
-      cage
-      grimblast
-      wl-clipboard
-      wl-clip-persist
-      wl-mirror
-      # gaming
-      prismlauncher
-      # social
-      discord
-      element-desktop
-      gajim
-      # programs
-      blueman
-      brightnessctl
-      easyeffects
-      fd
-      filezilla
-      gimp
-      imagemagick
-      imv
-      jq
-      libnotify
-      mpv
-      pavucontrol
-      pfetch-rs
-      rsync
-      sassc
-      sl
-      starship
-      thunderbird-latest
-      vlc
-      yt-dlp
-      zathura
-    ];
+    home.packages =
+      (with pkgs; [
+        # nix
+        home-manager
+        # programs
+        fd
+        imagemagick
+        jq
+        pfetch-rs
+        rsync
+        sassc
+        sl
+        starship
+        yt-dlp
+      ])
+      ++ [
+        inputs.talc.packages.${system}.talc
+      ]
+      ++ (with pkgs;
+        optionals config.desktop.enable [
+          # social
+          discord
+          element-desktop
+          gajim
+          thunderbird-latest
+          # programs
+          blueman
+          brightnessctl
+          easyeffects
+          filezilla
+          gimp
+          imv
+          mpv
+          pavucontrol
+          vlc
+          zathura
+        ]);
 
     xdg.configFile = {
       "aacs/keydb.cfg" = {