diff --git a/flake.lock b/flake.lock index f64c8cd..f6824db 100644 --- a/flake.lock +++ b/flake.lock @@ -83,7 +83,9 @@ }, "fenix": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { @@ -299,7 +301,7 @@ }, "nil": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1751341694, @@ -319,7 +321,7 @@ "inputs": { "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, @@ -402,16 +404,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", - "owner": "nixos", + "lastModified": 1749619289, + "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "f72be405a10668b8b00937b452f2145244103ebc", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -465,22 +467,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1749619289, - "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f72be405a10668b8b00937b452f2145244103ebc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -494,7 +480,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -524,7 +510,7 @@ "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "themes": "themes", "zen-browser": "zen-browser" } diff --git a/modules/common/packages.nix b/modules/common/packages.nix index e0f5931..befbd6a 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -45,6 +45,8 @@ in { pkgs.qbittorrent ] ++ optionals (config.isLinux && config.isDesktop) [ + pkgs.haruna + pkgs.thunderbird pkgs.whatsapp-for-linux @@ -61,5 +63,7 @@ in { pkgs.en_US pkgs.en_GB-ize + ] ++ optionals (config.isDarwin && config.isDesktop) [ + pkgs.iina ]; } diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 125044a..e5e7598 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -1,6 +1,5 @@ { homebrew.casks = [ - "vlc" "krita" ]; }