From 648d16affa07dd5fd5c10b1abfb320c358af5db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Jane=C5=BEi=C4=8D?= <janezic.mj@gmail.com>
Date: Sat, 7 Mar 2026 16:29:51 +0100
Subject: [PATCH] feat: refactor matej/homeManager.nix with new modules

---
 users/matej/home-manager.nix | 131 ++++-------------------------------
 1 file changed, 12 insertions(+), 119 deletions(-)

diff --git a/users/matej/home-manager.nix b/users/matej/home-manager.nix
index 949456e..1d11da1 100644
--- a/users/matej/home-manager.nix
+++ b/users/matej/home-manager.nix
@@ -1,132 +1,25 @@
 {
-  config,
-  lib,
   pkgs,
   inputs,
+  osConfig,
   ...
 }:
 
-let
-  packages = inputs.self.outputs.packages.${pkgs.stdenv.hostPlatform.system};
-in
-
 {
+  home.stateVersion = "24.11";
+
+  # always-on
+  shell.enable = true;
+  dev.enable = true;
+  neovim = {
+    enable = true;
+    package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
   claude = {
     enable = true;
     package = inputs.claude-code-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
   };
 
-  home.stateVersion = "24.11";
-
-  # TODO:(@janezicmatej) do i need this here?
-  services.dunst.enable = true;
-
-  home.packages = [
-    pkgs.bibata-cursors
-
-    pkgs.starship
-
-    # git and co
-    pkgs.git
-    packages.git-linearize
-    packages.ggman
-
-    # cli utils
-    packages.ahab
-    pkgs.fzf
-    pkgs.htop
-    pkgs.jc
-    pkgs.jq
-    pkgs.openssl
-    pkgs.pv
-    pkgs.python3
-    pkgs.ripgrep
-    pkgs.fd
-    pkgs.tmux
-    pkgs.osc
-    pkgs.just
-
-    # compilers, toolchains, ...
-    pkgs.go
-    # pkgs.gcc
-    # pkgs.clang
-
-    # need for gcp stuff
-    pkgs.google-cloud-sdk
-    pkgs.google-cloud-sql-proxy
-
-    # desktop apps
-    pkgs.vesktop
-    pkgs.rocketchat-desktop
-    pkgs.telegram-desktop
-    pkgs.slack
-    pkgs.ghostty
-    pkgs.google-chrome
-    pkgs.zathura
-    pkgs.pavucontrol
-    pkgs.jellyfin-media-player
-    pkgs.cider-2
-    pkgs.protonmail-bridge
-    pkgs.ledger-live-desktop
-    pkgs.bolt-launcher
-    pkgs.libnotify
-
-    # writing/docs
-    pkgs.mdbook
-    pkgs.marksman
-    pkgs.mdformat
-
-    # security
-    pkgs.gnupg
-    pkgs.pass
-  ];
-
-  home.file.".assets".source = inputs.assets;
-
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-
-  stylix.targets.neovim.enable = false;
-  programs.neovim = {
-    enable = true;
-    vimAlias = true;
-    defaultEditor = true;
-
-    package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-    extraPackages = with pkgs; [
-      # runtime deps
-      gcc
-      luajit
-      nodejs_22 # copilot
-
-      tree-sitter
-
-      # lua_fzf
-      fd
-      ripgrep
-      bat
-      gnumake
-      delta
-
-      pyright
-      typescript-language-server
-      lua-language-server
-      gopls
-      nil
-      nixd
-
-      nixpkgs-fmt
-      stylua
-    ];
-
-    extraWrapperArgs = [
-      "--suffix"
-      "LD_LIBRARY_PATH"
-      ":"
-      "${lib.makeLibraryPath [ pkgs.stdenv.cc.cc.lib ]}"
-    ];
-  };
+  # desktop-conditional
+  desktop.enable = osConfig.desktop.enable;
 }