diff --git a/flake.lock b/flake.lock index 1a2a2b7..156351b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "copilot-cli": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1782432372, - "narHash": "sha256-Wke7c6W/MkJd94swpb5jCDd3hMu/KyAyswFJRh+P8iE=", - "owner": "scarisey", - "repo": "copilot-cli-flake", - "rev": "6c0159494d68a92281a0c99954a61cf1a3580bf0", - "type": "github" - }, - "original": { - "owner": "scarisey", - "repo": "copilot-cli-flake", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -25,11 +7,11 @@ ] }, "locked": { - "lastModified": 1782423922, - "narHash": "sha256-qPNd6lUohHP5gcJhqQ7rLV87RwIx0xYR2A4Frb9Zjc4=", + "lastModified": 1783024095, + "narHash": "sha256-oE+TNK98Pl7nHW4VU1oBvUKD5JR45U+py/NJmLoTNHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d320ab301cfaaca7d32514f13815d19d109f5f4", + "rev": "a4d410db95a6416d1008049330bd86b85b5db45a", "type": "github" }, "original": { @@ -62,27 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", "type": "github" }, "original": { @@ -94,10 +60,9 @@ }, "root": { "inputs": { - "copilot-cli": "copilot-cli", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 7d47f35..fec2274 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,9 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - copilot-cli.url = "github:scarisey/copilot-cli-flake"; }; - outputs = inputs @ { self, nixpkgs, nix-darwin, home-manager, copilot-cli }: + outputs = inputs @ { self, nixpkgs, nix-darwin, home-manager }: let system = "aarch64-darwin"; username = "trueberryless"; diff --git a/modules/apps.nix b/modules/apps.nix index 8b50ef8..94deedc 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -1,4 +1,4 @@ -{ pkgs, copilot-cli, system, ... }: +{ pkgs, ... }: let devShellPaths = [ ./shells/go.nix @@ -11,7 +11,6 @@ in { (with pkgs; [ aldente bitwarden-desktop - discord eza fastfetch git @@ -29,14 +28,17 @@ in { nixd oh-my-posh postman - podman raycast tmux tree zoxide ]) - ++ [ copilot-cli.packages.${system}.default ] ++ devShells; - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + allowUnfree = true; + permittedInsecurePackages = [ + "electron-39.8.10" + ]; + }; } diff --git a/modules/homebrew.nix b/modules/homebrew.nix index dab95de..695f439 100644 --- a/modules/homebrew.nix +++ b/modules/homebrew.nix @@ -16,12 +16,14 @@ # `brew install` brews = [ "gh" + "zizmor" ]; # `brew install --cask` casks = [ "beeper" "clipbook" + "discord" "firefox" "olympus" "spotify"