diff --git a/flake.lock b/flake.lock index d348088..1e89101 100644 --- a/flake.lock +++ b/flake.lock @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1714125531, - "narHash": "sha256-P95WwUjj4i2cCH86Yb9ES+3LDfemum+hToM1upyc6IE=", + "lastModified": 1715003183, + "narHash": "sha256-Klcbq9ncNG+ImmlL+gjXaHRX2hm2uGm0VO/bow/9KEE=", "owner": "ivandimitrov8080", "repo": "flake-ide", - "rev": "21fed8c35241b82fd8c14681b801d2f31285997c", + "rev": "a8a6cd023e1ef624315509fe0624fab2964a932a", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 02a382c..eeba8c9 100644 --- a/home/default.nix +++ b/home/default.nix @@ -29,14 +29,13 @@ let waybar zsh ]; - ivand-packages = with modules.home.packages; [ - dev - essential - ]; + ivand-packages = { + home.packages = with modules.home.packages; (dev ++ essential ++ random); + }; in { ivand = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./ivand nid.hmModules.nix-index ] ++ ivand-programs ++ ivand-packages ++ [ catppuccin.homeManagerModules.catppuccin ]; + modules = [ ./ivand nid.hmModules.nix-index ivand-packages ] ++ ivand-programs ++ [ catppuccin.homeManagerModules.catppuccin ]; }; } diff --git a/modules/default.nix b/modules/default.nix index 16a211e..aa3a07c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,7 +7,7 @@ wireguard = import ./nixos/wireguard; }; home = { - packages = import ./home/packages { inherit pkgs; }; + packages = import ./home/packages pkgs; programs = import ./home/programs { inherit system pkgs ide; }; }; } diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix index 1c3a7b3..3f68848 100644 --- a/modules/home/packages/default.nix +++ b/modules/home/packages/default.nix @@ -1,4 +1,16 @@ -{ pkgs, ... }: { - dev = import ./dev { inherit pkgs; }; - essential = import ./essential { inherit pkgs; }; +pkgs: with pkgs; { + dev = [ + openssh + procs + ripgrep + fswatch + ]; + essential = [ + gopass + ffmpeg + transmission + ]; + random = [ + telegram-desktop + ]; } diff --git a/modules/home/packages/dev/default.nix b/modules/home/packages/dev/default.nix deleted file mode 100644 index eeb1f0e..0000000 --- a/modules/home/packages/dev/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - openssh - procs - ripgrep - fswatch - ]; -} diff --git a/modules/home/packages/essential/default.nix b/modules/home/packages/essential/default.nix deleted file mode 100644 index ffa85b8..0000000 --- a/modules/home/packages/essential/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - gopass - ffmpeg - transmission - ]; -}