15 files changed, 63 insertions, 80 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" = {
diff --git a/programs/git/default.nix b/home/git.nix
index 5c6a73a..5c6a73a 100644
--- a/programs/git/default.nix
+++ b/home/git.nix
diff --git a/programs/gpg/default.nix b/home/gpg.nix
index 1aa145a..a2deed2 100644
--- a/programs/gpg/default.nix
+++ b/home/gpg.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  keysDir = ../../files/keys;
+  keysDir = ../files/keys;
   keys = lib.attrsets.mapAttrsToList (name: type: "${keysDir}/${name}") (builtins.readDir keysDir);
   gpgKeys = builtins.filter (path: lib.strings.hasSuffix "asc" path) keys;
 in {
@@ -28,12 +28,4 @@ in {
       pinentry.package = pkgs.pinentry-curses;
     };
   };
-
-  # yubikey support
-  services = {
-    pcscd.enable = true;
-    udev.packages = with pkgs; [
-      yubikey-personalization
-    ];
-  };
 }
diff --git a/programs/neovim/config.nix b/home/neovim/config.nix
index ae10243..ae10243 100644
--- a/programs/neovim/config.nix
+++ b/home/neovim/config.nix
diff --git a/programs/neovim/default.nix b/home/neovim/default.nix
index c1ed000..c1ed000 100644
--- a/programs/neovim/default.nix
+++ b/home/neovim/default.nix
diff --git a/programs/neovim/init.lua b/home/neovim/init.lua
index 2be7fee..2be7fee 100644
--- a/programs/neovim/init.lua
+++ b/home/neovim/init.lua
diff --git a/programs/ssh/config b/home/ssh/config
index 5ae97b6..5ae97b6 100644
--- a/programs/ssh/config
+++ b/home/ssh/config
diff --git a/home/ssh/default.nix b/home/ssh/default.nix
new file mode 100644
index 0000000..b34e23f
--- /dev/null
+++ b/home/ssh/default.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  # ssh config
+  home-manager.users.${config.user} = {
+    programs.ssh = {
+      enable = true;
+      extraConfig = lib.fileContents ./config;
+    };
+  };
+}
diff --git a/programs/starship/default.nix b/home/starship.nix
index 74fd28a..74fd28a 100644
--- a/programs/starship/default.nix
+++ b/home/starship.nix
diff --git a/programs/tmux/default.nix b/home/tmux/default.nix
index c7ce7db..c7ce7db 100644
--- a/programs/tmux/default.nix
+++ b/home/tmux/default.nix
diff --git a/programs/tmux/tmux.conf b/home/tmux/tmux.conf
index 31ac742..31ac742 100644
--- a/programs/tmux/tmux.conf
+++ b/home/tmux/tmux.conf
diff --git a/programs/tmux/tmux_window b/home/tmux/tmux_window
index 1cdacf0..1cdacf0 100755
--- a/programs/tmux/tmux_window
+++ b/home/tmux/tmux_window
diff --git a/programs/zsh/default.nix b/home/zsh/default.nix
index ce1820e..ce1820e 100644
--- a/programs/zsh/default.nix
+++ b/home/zsh/default.nix
diff --git a/programs/zsh/zprofile b/home/zsh/zprofile
index 4815b36..4815b36 100644
--- a/programs/zsh/zprofile
+++ b/home/zsh/zprofile
diff --git a/programs/zsh/zshrc b/home/zsh/zshrc
index b1c61a2..b1c61a2 100644
--- a/programs/zsh/zshrc
+++ b/home/zsh/zshrc