diff --git a/flake.lock b/flake.lock index 836eb9b..b306c58 100644 --- a/flake.lock +++ b/flake.lock @@ -382,6 +382,40 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "psysonic": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1782757213, + "narHash": "sha256-LbeKiFPK/hYnzkVkfDKNfc1k5d0FB+YeFrRby4PHhpU=", + "owner": "Psychotoxical", + "repo": "psysonic", + "rev": "e66b674937e0f0fe7c2fcdf2b1ae2a448b03c710", + "type": "github" + }, + "original": { + "owner": "Psychotoxical", + "repo": "psysonic", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", @@ -392,6 +426,7 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", + "psysonic": "psysonic", "try-cli": "try-cli", "voxtype": "voxtype", "walker": "walker" diff --git a/flake.nix b/flake.nix index 48df56a..1e86097 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,21 @@ { description = "Stationette nix config"; + nixConfig = { + extra-substituters = [ + "https://nix-gaming.cachix.org" + "https://walker.cachix.org" + "https://walker-git.cachix.org" + "https://psysonic.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM=" + "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" + "psysonic.cachix.org-1:M9cQyQ7tgvUWOQ5Pyt8ozlMoPLtOZir6MfRuTH9/VYA=" + ]; + }; + inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -17,7 +32,7 @@ }; psysonic = { url = "github:Psychotoxical/psysonic"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; # psysonic needs rustc 1.95+, nixos-25.11 only has 1.91 }; try-cli = { url = "github:tobi/try-cli"; @@ -126,17 +141,5 @@ }; }; - nix.settings = { - extra-substituters = [ - "https://walker.cachix.org" - "https://walker-git.cachix.org" - ]; - extra-trusted-public-keys = [ - "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM=" - "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" - ]; - substituters = ["https://nix-gaming.cachix.org"]; - trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="]; - }; }; } diff --git a/home/packages.nix b/home/packages.nix index 40d25d4..34ea9b6 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -25,6 +25,7 @@ in }; home.packages = with pkgs; [ pkgs-unstable.antigravity # Gemini AI coding assistant + pkgs-unstable.antigravity-cli # Gemini AI coding assistant bluetui # Bluetooth TUI enpass # Password manager enpass-cli # Enpass CLI tool diff --git a/result b/result new file mode 120000 index 0000000..e28b637 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/ldv0r3wrdz10h7q483hym4s5jajnmgs2-psysonic-1.50.0-dev \ No newline at end of file diff --git a/scratch/psysonic b/scratch/psysonic new file mode 160000 index 0000000..e66b674 --- /dev/null +++ b/scratch/psysonic @@ -0,0 +1 @@ +Subproject commit e66b674937e0f0fe7c2fcdf2b1ae2a448b03c710 diff --git a/system/packages.nix b/system/packages.nix index fdf83ca..184ac19 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -86,4 +86,19 @@ runGarbageCollection = true; }; }; + + nix.settings = { + extra-substituters = [ + "https://nix-gaming.cachix.org" + "https://walker.cachix.org" + "https://walker-git.cachix.org" + "https://psysonic.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" + "walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM=" + "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" + "psysonic.cachix.org-1:M9cQyQ7tgvUWOQ5Pyt8ozlMoPLtOZir6MfRuTH9/VYA=" + ]; + }; }