diff --git a/darwin/profiles/desktop/packages/homebrew.nix b/darwin/profiles/desktop/packages/_homebrew.nix similarity index 100% rename from darwin/profiles/desktop/packages/homebrew.nix rename to darwin/profiles/desktop/packages/_homebrew.nix diff --git a/darwin/profiles/desktop/packages/default.nix b/darwin/profiles/desktop/packages/default.nix index edeff4c..ee70bf9 100644 --- a/darwin/profiles/desktop/packages/default.nix +++ b/darwin/profiles/desktop/packages/default.nix @@ -1,7 +1,7 @@ {...}: { imports = [ ./fonts.nix - ./homebrew.nix + # ./homebrew.nix ./window-manager.nix ]; } diff --git a/flake.lock b/flake.lock index 94764ec..99cc9f1 100755 --- a/flake.lock +++ b/flake.lock @@ -277,6 +277,26 @@ "type": "github" } }, + "nixcasks": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1708897147, + "narHash": "sha256-IZthUAu/4qH8EtUbpREVue2E83x4ofHcBjxXSRfdj3s=", + "owner": "jacekszymanski", + "repo": "nixcasks", + "rev": "9351c986bb5cfb940485f57e2595186d1ab68e4a", + "type": "github" + }, + "original": { + "owner": "jacekszymanski", + "repo": "nixcasks", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1708594753, @@ -397,6 +417,7 @@ "neovim": "neovim", "nix-darwin": "nix-darwin", "nix-gaming": "nix-gaming", + "nixcasks": "nixcasks", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", @@ -405,8 +426,7 @@ "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "systems": "systems", - "systems-linux": "systems-linux" + "systems": "systems" } }, "rust-overlay": { @@ -492,21 +512,6 @@ "repo": "default", "type": "github" } - }, - "systems-linux": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cb9adcc..323cd62 100755 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,11 @@ inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks-nix"; inputs.rust-overlay.follows = "rust-overlay"; }; + neovim = { + url = "github:Guanran928/nvim"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; @@ -50,10 +55,10 @@ nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; - neovim = { - url = "github:Guanran928/nvim"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; + nixcasks = { + # contains unfree + url = "github:jacekszymanski/nixcasks"; + inputs.nixpkgs.follows = "nixpkgs-stable"; }; sops-nix = { url = "github:Mic92/sops-nix"; @@ -66,7 +71,6 @@ inputs.flake-utils.follows = "flake-utils"; }; systems.url = "github:nix-systems/default"; - systems-linux.url = "github:nix-systems/default-linux"; ### De-dupe crane = { diff --git a/home/applications/telegram-desktop/default.nix b/home/applications/telegram-desktop/default.nix index aa3d229..10a859e 100644 --- a/home/applications/telegram-desktop/default.nix +++ b/home/applications/telegram-desktop/default.nix @@ -1,3 +1,13 @@ -{pkgs, ...}: { - home.packages = [pkgs.telegram-desktop]; +{ + inputs, + pkgs, + ... +}: { + home.packages = [ + ( + if pkgs.stdenv.hostPlatform.isDarwin + then inputs.nixcasks.legacyPackages.${pkgs.stdenv.hostPlatform.system}.telegram + else pkgs.telegram-desktop + ) + ]; }